haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-05 00:43:53 +00:00
Code Issues Releases Wiki Activity
12,389 Commits 144 Branches 460 Tags
625116cccb15e2779c3d47146ad7b40f3b71861f
Commit Graph

12389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhengxie
910eb2ccd4 Add sigle sign on feature 2014-04-04 14:36:27 +08:00
zhengxie
cac95f4c41 [api2] Fix code style 2014-04-04 10:48:03 +08:00
xiez
c592d747bd Merge pull request #173 from imwhatiam/admin 
Admin
 2014-04-03 17:48:24 +08:00
imwhatiam
2307cb865d admin v2 2014-04-03 17:31:43 +08:00
zhengxie
e59c402c19 Merge branch '2.1' 2014-04-03 15:34:14 +08:00
zhengxie
846b8c8fbd Merge branch 'AddRepoPublicApi' of git://github.com/urg/seahub into urg-AddRepoPublicApi 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
 2014-04-03 15:30:36 +08:00
imwhatiam
02a9b795e0 add 'add-admin' to sys/useradmin/ 2014-04-03 15:19:09 +08:00
zhengxie
e3b1097491 Merge branch '2.1' 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
 2014-04-03 13:56:40 +08:00
zhengxie
7ac9f88cf0 Merge branch 'AddFileTokenDetails' of git://github.com/urg/seahub into urg-AddFileTokenDetails 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
 2014-04-03 13:46:44 +08:00
xiez
57157e4949 Merge pull request #162 from urg/AddFileDetailApi 
Add File Detail Api Call
 2014-04-03 13:37:37 +08:00
xiez
0c4e9373eb Merge pull request #168 from urg/AddPrivateFileShareApi 
add api call to get details for private file share
 2014-04-03 13:33:31 +08:00
xiez
ad82688cf5 Merge pull request #167 from urg/ApiOfficeConvert 
add api calls for office conversion
 2014-04-03 13:32:27 +08:00
xiez
082622273c Merge pull request #165 from urg/ApiRepoOwner 
add repo owner api call for admins
 2014-04-03 13:28:52 +08:00
llj
30ce3bb441 [jstree] list dir first, and sort dir/files 2014-04-03 12:48:10 +08:00
zhengxie
6065ba9be0 Merge branch '2.0' 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
 2014-04-03 12:07:09 +08:00
zhengxie
544b29f5b2 Merge branch '23-ApiDownloadSharedFiles' of git://github.com/urg/seahub into urg-23-ApiDownloadSharedFiles 
Conflicts:
	seahub/api2/views.py
 2014-04-03 11:50:29 +08:00
zhengxie
892d8f2043 Merge branch 'GroupAddMember' of git://github.com/urg/seahub into urg-GroupAddMember 
Conflicts:
	seahub/api2/views.py
 2014-04-03 11:39:50 +08:00
zhengxie
7107b180aa Merge branch 'AddGroup' of git://github.com/urg/seahub into urg-AddGroup 
Conflicts:
	seahub/api2/views.py
 2014-04-03 11:27:22 +08:00
xiez
3adb54230d Merge pull request #139 from urg/UserProfile 
add api call to add user profile
 2014-04-03 11:22:53 +08:00
xiez
46d761029d Merge pull request #138 from urg/RenameRepo 
api call to rename repo
 2014-04-03 11:18:45 +08:00
Patrick McAndrew
d2c6a045bc add api call to set/unset repo public 2014-04-02 12:26:09 +01:00
llj
13a54d1e6e [lib setting] added 'back to lib' & modified input width 2014-04-01 17:55:06 +08:00
lins05
febf5ea091 [api] fixed rpc arguments in seahub.api2.views 2014-04-01 15:48:42 +08:00
llj
cdb0cf300e [sysadmin] added 'go-back' for user-info page 2014-04-01 15:13:07 +08:00
llj
16b148b6d1 [sysadmin nav] add icon for 'Logs' 2014-04-01 12:14:14 +08:00
llj
bd283fd3fb [msg/discuss] modified details 2014-04-01 11:18:59 +08:00
llj
bf101ec8d6 [discuss, msg] modified ui of discussion/msg, improved 'add file' 2014-04-01 10:40:13 +08:00
llj
de580f515d [grp discuss] add 'add files' func 2014-03-31 16:01:15 +08:00
llj
5fa6ec5696 [i18n] handled 'sinle quote' problem for languages like Catalan 2014-03-28 18:26:20 +08:00
llj
fcb4f2fedf [fileupload] fixed bug for 'upload fail', handled 'fail' like '413' 2014-03-28 15:32:57 +08:00
zhengxie
1022f996d6 Fixed repo history settings bug 2014-03-28 10:57:30 +08:00
zhengxie
b3014364cf Fixed activity bug 2014-03-28 10:33:59 +08:00
lins05
81df836b32 fixed a typo 2014-03-27 18:47:54 +08:00
llj
dc45cc963f use seahub.min.css; small bug fix and improvement for org 2014-03-27 18:30:06 +08:00
lins05
1f97485eec fixed for python 2.6 
objects of datetime.timedelta has no "total_seconds"
method on python 2.6
 2014-03-27 17:55:07 +08:00
zhengxie
d9e5ae95b6 Remove unused imports 2014-03-27 17:01:42 +08:00
zhengxie
c152af5d6c Prefetch avatars in repo & file page 2014-03-27 15:49:32 +08:00
llj
8526a7f688 [table] modified css for 'op-icon', improved ui 2014-03-27 15:37:58 +08:00
zhengxie
a1e0b63e23 Improve performance of repo page 2014-03-27 13:54:23 +08:00
llj
f25ed7a6bc [lib list] modified lib icons 2014-03-27 13:48:42 +08:00
llj
0cd855af8d [device management] improvement 2014-03-27 12:11:17 +08:00
zhengxie
0fe49c1fda Do not copy files to default library 2014-03-26 16:21:23 +08:00
zhengxie
64853ae0d0 Temporarily remove share link password and expiration 2014-03-26 16:08:44 +08:00
zhengxie
58cc63684b Merge branch 'data-format' 2014-03-26 10:45:02 +08:00
zhengxie
c7fb3ef014 Add user mods check to devices 2014-03-25 16:21:50 +08:00
zhengxie
7981b3aa72 Merge branch 'device-token' 2014-03-25 16:13:32 +08:00
zhengxie
00afe0badf Temporarily hide share link password and expiration 2014-03-25 11:24:04 +08:00
lins05
28bd1f9d85 [api] use device specific token 2014-03-25 11:23:31 +08:00
zhengxie
d56c070c7c Fixed head commit bug in repo page 2014-03-24 17:41:08 +08:00
zhengxie
bbdfa51e49 Merge branch '3.0' 2014-03-24 16:54:49 +08:00