zhengxie
|
131b28ddc4
|
[i18n] Update source fils to 4.4
|
2015-09-14 15:03:43 +08:00 |
|
llj
|
75b0b4f39f
|
Merge pull request #808 from haiwen/thumbnail-fix
bugfix for 'get image thumbnail'
|
2015-09-14 14:41:11 +08:00 |
|
llj
|
5aac9f5889
|
bugfix for 'get image thumbnail'
|
2015-09-14 14:34:33 +08:00 |
|
zhengxie
|
b19e9fcb2b
|
[api2] Fix bug in new dir
|
2015-09-14 13:46:57 +08:00 |
|
zhengxie
|
5fca43ef89
|
Merge branch '4.3'
Conflicts:
seahub/api2/views.py
|
2015-09-14 13:43:39 +08:00 |
|
xiez
|
a226cb2be7
|
Merge pull request #807 from haiwen/group-name
[web/api] update group name validation check
|
2015-09-14 13:37:12 +08:00 |
|
lian
|
152aeea19c
|
[web/api] update group name validation check
can only contain letters, numbers, blank, hyphen or underscore
|
2015-09-14 12:17:12 +08:00 |
|
llj
|
5fde126c16
|
[pdf file view] modified handling of 'doc convertion failed'
|
2015-09-14 11:13:47 +08:00 |
|
zhengxie
|
3b7fab00d6
|
[tests] Fix star files
|
2015-09-12 12:13:16 +08:00 |
|
Shuai Lin
|
d64e733001
|
Merge pull request #789 from haiwen/client-side-keygen
create repo api: accept magic and random_key generated on client side
|
2015-09-12 11:44:45 +08:00 |
|
zhengxie
|
7745598ac7
|
[i18n] Update po files
|
2015-09-12 11:39:57 +08:00 |
|
Shuai Lin
|
7532ed394a
|
client side keygen: update create repo api
|
2015-09-12 11:38:30 +08:00 |
|
Shuai Lin
|
981db6618f
|
client side keygen: add tests
|
2015-09-12 11:38:30 +08:00 |
|
xiez
|
70971ee787
|
Merge pull request #786 from haiwen/file-star-api
[file-star-api] update file star api
|
2015-09-12 11:36:14 +08:00 |
|
lian
|
580767efa6
|
[file-star-api] update file star api
check permission and file id before star/unstar a file
|
2015-09-12 11:07:26 +08:00 |
|
Shuai Lin
|
8254aa65f9
|
Merge pull request #804 from haiwen/api-mkdir-with-parents
add api to create a dir with parents
|
2015-09-12 10:51:09 +08:00 |
|
zhengxie
|
e02099899d
|
[i18n] Update sources
|
2015-09-12 10:33:41 +08:00 |
|
Shuai Lin
|
3287f4448a
|
add api to create a dir with parents
|
2015-09-12 10:33:38 +08:00 |
|
llj
|
f43a5bda7a
|
[spreadsheet file view] improvement
|
2015-09-11 16:12:08 +08:00 |
|
Daniel Pan
|
d7238d3933
|
Merge pull request #803 from haiwen/lock-file
allow rename/move/delete operation when file is locked
|
2015-09-11 11:31:58 +08:00 |
|
llj
|
0f5472bdee
|
add option 'SHOW_TRAFFIC'
|
2015-09-11 11:00:54 +08:00 |
|
lian
|
a737ed58b8
|
allow rename/move/delete operation when file is locked
|
2015-09-11 10:05:35 +08:00 |
|
llj
|
3b00b7cf83
|
[pdf file view] modified 'page loading'
|
2015-09-10 17:20:32 +08:00 |
|
llj
|
9357cb3202
|
[pdf file view] modified 'zoom in/out'
|
2015-09-10 16:53:19 +08:00 |
|
Daniel Pan
|
9c542cba3e
|
Merge pull request #800 from haiwen/active-users
show active users count at sys info page
|
2015-09-09 11:04:46 +08:00 |
|
Daniel Pan
|
b75d4ef5cc
|
Merge pull request #801 from haiwen/update-user
add error check when update user status and add user
|
2015-09-09 11:02:47 +08:00 |
|
lian
|
fa5e4dfb60
|
add error check when update user status and add user
|
2015-09-09 10:48:06 +08:00 |
|
xiez
|
70e548cf14
|
Merge pull request #795 from haiwen/folder-permission
update permission check
|
2015-09-09 10:38:59 +08:00 |
|
lian
|
fdbe188f48
|
show active users count at sys info page
|
2015-09-08 16:52:10 +08:00 |
|
Daniel Pan
|
384aaf2f0b
|
Merge pull request #799 from haiwen/sysadmin-repos
[sysadmin] add icon/remove desc when list repos
|
2015-09-08 14:50:36 +08:00 |
|
lian
|
d64b66c300
|
[sysadmin] add icon/remove desc when list repos
|
2015-09-08 13:33:30 +08:00 |
|
lian
|
cf6d21c455
|
update file/dir api & view file page
check folder permission instead of repo permission
|
2015-09-08 10:11:03 +08:00 |
|
llj
|
dde4e08de2
|
Merge pull request #788 from haiwen/api-error-msg
Improved api error msgs and show them on web pages when necessary
|
2015-09-07 18:12:01 +08:00 |
|
llj
|
1c1e9870a9
|
[common.js] modified ajaxErrorHandler
|
2015-09-07 17:55:35 +08:00 |
|
zhengxie
|
82ff4b3f2a
|
[sysadmin] Refactor and fix tests
|
2015-09-02 11:14:54 +08:00 |
|
xiez
|
9fc6db2894
|
Merge pull request #794 from haiwen/thumbnail
add obj id check when get thumbnail via src
|
2015-09-01 20:20:13 +08:00 |
|
lian
|
acc2f75235
|
update api err msg and common.ajaxErrorHandler
|
2015-09-01 17:42:54 +08:00 |
|
lian
|
8009175c16
|
add obj id check when get thumbnail via src
|
2015-09-01 10:23:50 +08:00 |
|
llj
|
c6c215e86d
|
Merge pull request #792 from haiwen/useradmin
Useradmin
|
2015-08-31 14:50:49 +08:00 |
|
llj
|
3f46441c44
|
[js] added 'form post' option to 'addConfirmTo'
|
2015-08-31 14:36:02 +08:00 |
|
Daniel Pan
|
fdf050ab36
|
Merge pull request #791 from haiwen/ldap_pwd
Hide change password for ldap user
|
2015-08-31 14:09:32 +08:00 |
|
llj
|
bc4afa5947
|
Merge pull request #776 from haiwen/random-password-when-adding-users
[add user] add 'random password' function
|
2015-08-31 11:19:07 +08:00 |
|
llj
|
9bef6d408d
|
[add user] modification
|
2015-08-31 11:14:57 +08:00 |
|
patrickgao
|
231fc63b39
|
update
|
2015-08-30 20:47:43 +08:00 |
|
zhengxie
|
3ed28dd26f
|
Hide change password for ldap user
|
2015-08-28 17:51:42 +08:00 |
|
zhengxie
|
73e2d97f26
|
[sysadmin] Update some user operations
|
2015-08-27 17:02:13 +08:00 |
|
llj
|
ab6014748b
|
Merge pull request #784 from haiwen/remove-action
remove text 'operation' in devices.html
|
2015-08-26 17:23:26 +08:00 |
|
llj
|
24bf53c980
|
[permission UI] modified 'permission' column width for languages like German
|
2015-08-26 15:56:29 +08:00 |
|
llj
|
55b9e37c50
|
Merge pull request #782 from haiwen/permission-more-space
[share popup] give 'permission' more space
|
2015-08-26 12:13:17 +08:00 |
|
patrickgao
|
d1c531ae1c
|
give permission more space
|
2015-08-26 10:53:21 +08:00 |
|