haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 00:00:00 +00:00
Code Issues Releases Wiki Activity
5,134 Commits 145 Branches 460 Tags
7dc7034de4ba0ab0437a6ca4ff65b1abe8ea01ab
Commit Graph

126 Commits

Author SHA1 Message Date
bit4beats
361f8e9767 Implemented the group removal API, delete function of Group view. 
Adjusted also the urls file.
 2014-06-20 10:13:19 +02:00
lins05
c625ca3a77 [api] added repo_history_changes api 
Also include commit_id in events api
 2014-06-10 10:14:17 +08:00
poetwang
0cf6994d29 [api2] Improve api for user avatar and add for group avatar 2014-04-13 11:17:46 +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
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
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
Patrick McAndrew
d2c6a045bc add api call to set/unset repo public 2014-04-02 12:26:09 +01:00
Patrick McAndrew
28dc34f450 add api call to get details for private file share 2014-03-18 09:24:43 +00:00
Patrick McAndrew
1601db4f2d add api calls for office conversion 2014-03-13 14:53:59 +00:00
Patrick McAndrew
03f86bfee2 api call to get file token details 2014-03-13 14:48:11 +00:00
Patrick McAndrew
3f6f4a27e5 add repo owner api call for admins 2014-03-13 14:26:41 +00:00
Patrick McAndrew
8f5f444924 Add File Detail Api Call 2014-03-03 13:12:28 +00:00
poetwang
04b6cacdd5 [api2] Add apis for messages, optimize coding 2014-03-03 18:34:37 +08:00
Patrick McAndrew
9bc8bfb477 add apis calls DownloadPrivateSharedFileView & DownloadSharedFileView 2014-02-03 14:31:06 +00:00
Patrick McAndrew
8027407a69 api calls to add/remove group members 2014-01-23 15:45:03 +00:00
poetwang
8b72fd5846 [api] Make api semantic consistent 2014-01-18 15:51:08 +08:00
poetwang
a8beff8dfc [api2] Add apis for contacts and user messages 2014-01-17 23:27:45 +08:00
zhengxie
c3f08f11b8 [api2] Comment out regdevice 2014-01-10 11:36:27 +08:00
zhengxie
dcf48cda77 Merge branch '2.0' 
Conflicts:
	seahub/api2/views.py
 2014-01-10 11:26:43 +08:00
zhengxie
112cb87db4 Merge branch 'SharedFiles' of git://github.com/urg/seahub into urg-SharedFiles 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
 2014-01-10 11:12:28 +08:00
zhengxie
50ed2d4f27 Merge branch 'VirtualRepos' of git://github.com/urg/seahub into urg-VirtualRepos 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
 2014-01-10 11:08:54 +08:00
zhengxie
711f70ad07 Merge branch 'DirDownload' of git://github.com/urg/seahub into urg-DirDownload 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
 2014-01-10 11:05:42 +08:00
zhengxie
a9f1275206 Merge branch 'DirShare' of git://github.com/urg/seahub into urg-DirShare 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
 2014-01-10 11:02:17 +08:00
zhengxie
59640c3c69 Merge branch 'FileRevert' of git://github.com/urg/seahub into urg-FileRevert 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
 2014-01-10 10:56:42 +08:00
zhengxie
214dd67146 Merge branch 'FileRevision' of git://github.com/urg/seahub into urg-FileRevision 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
 2014-01-10 10:53:52 +08:00
zhengxie
3d672841c5 Merge branch '2.0' 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
 2014-01-10 10:49:12 +08:00
xiez
29426c7038 Merge pull request #128 from urg/SubRepo 
Add Dir SubRepo api call
 2014-01-09 18:41:32 -08:00
xiez
0594794d89 Merge pull request #126 from urg/SharedLinks 
Add Shared Links api call
 2014-01-09 18:40:20 -08:00
xiez
bcd4b78dff Merge pull request #120 from urg/ViewFileHistory 
Add View File History api call
 2014-01-09 18:32:52 -08:00
poetwang
6b1144d7a4 [api2] Add api for ios device register push notification 2014-01-05 22:27:40 +08:00
Patrick McAndrew
fa1955a73a Add Dir Share api call 2014-01-02 11:15:01 +00:00
Patrick McAndrew
934e2d8c97 Add Dir SubRepo api call 2013-12-31 14:52:41 +00:00
Patrick McAndrew
c2b23ceeaa Add Virtual Repos api call 2013-12-31 14:46:10 +00:00
Patrick McAndrew
34c8ccbf82 Add Shared Links api call 2013-12-31 14:41:27 +00:00
Patrick McAndrew
87028272a3 Add Shared Files api call 2013-12-31 13:10:26 +00:00
Patrick McAndrew
95fdb3090a Download dir api call 2013-12-31 12:55:15 +00:00
Patrick McAndrew
25bfce5ef5 Add File Revert api call 2013-12-31 12:46:06 +00:00
Patrick McAndrew
4ac938d776 File Revision 2013-12-31 12:07:17 +00:00
Patrick McAndrew
22edccc47b View File History 2013-12-31 11:55:46 +00:00
Patrick McAndrew
26ee0bcb39 View Repo History 2013-12-31 11:30:29 +00:00
lins05
5e2128f692 [api] update api to access default library 2013-12-18 14:13:08 +08:00
poetwang
3b65effbad Merge branch 'master' of github.com:haiwen/seahub 2013-12-11 09:45:35 +08:00
zhengxie
288ee5cf16 Merge branch 'events' 2013-12-09 10:50:56 +08:00