haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-24 21:07:17 +00:00
Code Issues Releases Wiki Activity
2,553 Commits 146 Branches 464 Tags
a8beff8dfcee4e5272b99d3025cdbd4b9cf40ea6
Commit Graph

2553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
poetwang
a8beff8dfc [api2] Add apis for contacts and user messages 2014-01-17 23:27:45 +08:00
zhengxie
26557ab2e6 Update source language file 2014-01-11 13:49:28 +08:00
zhengxie
d477951816 [api2] Remove inappropriate asserts v2.1.3-server v2.1.3-server-testing v2.1.3-testing 2014-01-10 15:35:28 +08:00
zhengxie
537c1fdc97 Fixed bug in message replies 2014-01-10 14:23:37 +08:00
zhengxie
91db55caaa Update translation and version 2014-01-10 14:20:25 +08:00
zhengxie
d74fb09e1f Show error when anonymous user posting a reply. 2014-01-10 14:07:46 +08:00
zhengxie
c3f08f11b8 [api2] Comment out regdevice 2014-01-10 11:36:27 +08:00
zhengxie
63f4229f53 Merge branch '2.1' 
Conflicts:
	seahub/api2/views.py
 2014-01-10 11:33:20 +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
xiez
684b17a802 Merge pull request #119 from urg/ViewRepoHistory 
Add View Repo History api call
 2014-01-09 18:27:14 -08:00
xiez
4bb238b31d Merge pull request #129 from urg/FixValidTokenWithoutUser 
Fix for if token is valid format, but user with that token does not exist
 2014-01-09 18:25:12 -08:00
zhengxie
f82af2aaa1 Modified login form 2014-01-09 15:42:22 +08:00
lins05
0b249ee310 [api] include virtual repos when listing repos 2014-01-09 14:08:13 +08:00
zhengxie
805e44e6a1 Fixed a few typos 2014-01-09 13:53:02 +08:00
zhengxie
2e793eb34a Modified account delete 2014-01-09 11:13:20 +08:00
zhengxie
4cbbaa93ca Added username validation 2014-01-08 18:24:16 +08:00
llj
5b9cb34e92 [xss] added tag_whitelist for wiki/md 2014-01-08 17:16:56 +08:00
xiez
9141675ea7 Merge pull request #113 from EliotBerriot/master 
Replace download <button> by <a>
 2014-01-06 23:59:39 -08:00
llj
56fa8f1687 [clients unsync] improved interaction 2014-01-07 15:38:12 +08:00
llj
5ef51d955f [repo del] improved interaction 2014-01-07 15:19:10 +08:00
llj
94843f10dc [file view] handled 'file size is 0' for odf; cleaned up code for text/md 2014-01-07 11:21:11 +08:00
llj
03add04c86 [odf view] improvement: fixed bugs, improved ui, rm unused files 2014-01-07 11:21:11 +08:00
seafile
78fd222e81 Disable svg previewing (accidentally removed) 2014-01-07 11:21:10 +08:00
seafile
b824724555 Incorporate Viewer.js to display opendocument formats 2014-01-07 11:21:10 +08:00
llj
f0c45de8c2 fixed bug for op-confirm popup like repo-del v2.1.1-server-testing 2014-01-07 10:20:22 +08:00
llj
195e4ab447 fixed bug for op-confirm popup like repo-del 2014-01-06 15:21:30 +08:00
poetwang
6b1144d7a4 [api2] Add api for ios device register push notification 2014-01-05 22:27:40 +08:00
zhengxie
0fc70cf27a Update timestamp and version 2014-01-04 16:54:03 +08:00
llj
c0f36ccfe0 [repo] improved select of dirents 2014-01-04 14:21:03 +08:00
llj
795d60b014 [login] added 'tabindex' 2014-01-03 18:33:33 +08:00
zhengxie
15d707b0df Update Chinese translation 2014-01-03 17:42:11 +08:00
llj
591dbbee2d [client download] improvement 2014-01-03 17:27:17 +08:00
zhengxie
2d3c0e5ec7 Update de/fr/hu translations 2014-01-03 17:20:35 +08:00
llj
86f17ab441 [upload/download] fixed url pattern bug; improved file upload 2014-01-03 17:04:36 +08:00
zhengxie
7edf8b5c39 Update group join request message 2014-01-03 17:01:38 +08:00
zhengxie
4239b4d0ce Merge branch '2.1' 2014-01-03 15:40:45 +08:00
zhengxie
8ad22cb82e Rewrite group join request 2014-01-03 14:54:51 +08:00
llj
58397768a0 [logo custom] added logo_width, logo_height 2014-01-03 14:12:50 +08:00
llj
94433acf9f [msg] use ajax to send msg; show 'back to top' in user_msg_list 2014-01-03 11:37:05 +08:00
zhengxie
01ab26a167 Merge branch 'login' into 2.1 2014-01-03 11:35:19 +08:00