1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 08:16:07 +00:00
Commit Graph

4180 Commits

Author SHA1 Message Date
zhengxie
b64a55c490 [share] Sort share links 2015-09-25 16:16:43 +08:00
zhengxie
75eabf7583 [api2] Refactor account api, and add migrate accout endpoint 2015-09-25 15:50:39 +08:00
zhengxie
75aa42d8b2 [i18n] Update .po files 2015-09-24 10:51:44 +08:00
xiez
563052f93e Merge pull request #823 from haiwen/dir-api
Dir api
2015-09-22 13:38:14 +08:00
lian
652639ef7e [dir-api] get recursive dir
add 'recursive' argument to control if return recursive dir list
2015-09-22 11:56:18 +08:00
xiez
dc9e31ea2c Merge pull request #822 from haiwen/reuse-access-token
[web-api] update download file api
2015-09-22 11:46:24 +08:00
zhengxie
4993e43497 Fix set lang code bug when user profile is empty. 2015-09-21 16:06:15 +08:00
zhengxie
8fb5cbe5cb [sysadmin] Handle error when list paid users/org 2015-09-21 12:05:06 +08:00
lian
68276cbe52 [web-api] update download file api
add 'reuse' argument to control if reuse fileserver access token
2015-09-21 11:02:50 +08:00
lian
8f688faaee [dir-api] update get dirents api
add 't' argument to control if only return file or dir list
2015-09-21 10:38:56 +08:00
zhengxie
c0b8f2df0c [i18n] Update .po files 2015-09-18 14:56:37 +08:00
xiez
74a15b211a Merge pull request #818 from haiwen/org
Org system admin
2015-09-18 13:21:12 +08:00
zhengxie
8b1193368b [sysadmin] Enable delete an org 2015-09-17 16:14:09 +08:00
zhengxie
8c1a64a702 [sysadmin] List paid users and orgs 2015-09-16 18:40:14 +08:00
llj
1a6e41617f Merge pull request #816 from haiwen/share-err-msg
show err msg detail when share dir to user/group
2015-09-16 10:45:12 +08:00
Daniel Pan
07e13f84e0 Merge pull request #815 from haiwen/org-repos
[sysadmin] update user info page
2015-09-16 10:32:48 +08:00
lian
32019aab01 [sysadmin] update user info page
show owned/shared-in repos at org user's info page
2015-09-15 17:58:36 +08:00
zhengxie
73b818a986 [sysadmin] Show org expiration date and search org 2015-09-15 17:34:30 +08:00
Shuai Lin
7602d94b75 Merge pull request #813 from haiwen/custom-logo-and-name
include customization settings in server-info api
2015-09-15 12:02:33 +08:00
lian
8aee7bc8de show err msg detail when share dir to user/group 2015-09-15 12:00:29 +08:00
Shuai Lin
43406e8109 include customization settings in server-info api 2015-09-15 10:09:58 +08:00
zhengxie
1155777cf8 [I18N] Update .po files and version 2015-09-14 15:53:20 +08:00
zhengxie
77e5b8fdee [i18n] Update source files to 4.4 2015-09-14 15:39:35 +08:00
xiez
7a81b7396e Merge pull request #809 from haiwen/update-trans
change "Operation" to "Operations"
2015-09-14 15:38:22 +08:00
lian
eb2b95a83a change "Operation" to "Operations" 2015-09-14 15:37:00 +08:00
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