haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 07:27:04 +00:00
Code Issues Releases Wiki Activity
13,486 Commits 145 Branches 460 Tags
c06d51a596fc21d4a442d35ba5b642f081c20f27
Commit Graph

862 Commits

Author SHA1 Message Date
lian
b4bdbd01a3 remove urlquote when reverse 2016-03-19 15:04:00 +08:00
zhengxie
3d5d98ffb8 Update nickname cache invalidation 2016-03-18 16:23:39 +08:00
Daniel Pan
99e8c1c99d Merge pull request #1062 from haiwen/devices 
new devices page
 2016-03-17 10:24:55 +08:00
Daniel Pan
49ac5b9ec2 Merge pull request #1061 from haiwen/render-dirents 
update render dirents
 2016-03-15 18:19:12 +08:00
lian
a43b3f969e new devices page 2016-03-15 18:19:12 +08:00
lian
e4a468eb8f update render dirents 2016-03-15 12:04:31 +08:00
zhengxie
eb799b516e [tests] Add password change test 2016-03-14 16:45:41 +08:00
Daniel Pan
8f368f3231 Merge pull request #1036 from haiwen/restore-file-dir-api 
add dir revert api & update file revert api
 2016-03-10 10:36:24 +08:00
lian
49ed1fd386 [api-v2.1] add new file/dir api according to old file/dir api 2016-03-09 10:12:16 +08:00
zhengxie
e844735cc2 [tests] Update tests 2016-03-08 10:59:46 +08:00
zhengxie
56ad0d3f04 Fix travis config, and send share link api 2016-03-07 16:41:26 +08:00
zhengxie
72d30b2495 Merge branch '5.0' 
Conflicts:
	seahub/api2/endpoints/dir_shared_items.py
	seahub/api2/urls.py
	seahub/templates/repo.html
	seahub/utils/http.py
	seahub/views/__init__.py
	seahub/views/ajax.py
	seahub/views/repo.py
	tests/seahub/views/test_libraries.py
 2016-03-07 16:04:36 +08:00
lian
7823d500e5 add dir revert api & update file revert api 2016-03-07 15:30:28 +08:00
lian
0f311f0c4e [api2] add send share/upload link api 2016-03-07 13:23:11 +08:00
zhengxie
4d0ac16a47 [utils] Update is_safe_url 2016-03-04 16:17:47 +08:00
lian
1992912ce1 [api-v2.1] add file share/upload links api 2016-02-26 17:59:05 +08:00
lian
8b4e78484e rm unused test 2016-02-26 15:52:53 +08:00
lian
62979d9af6 add err msg detail when share repo/folder failed 2016-02-24 15:02:01 +08:00
zhengxie
acb1a5e51e Use GB instead of GiB in filesizeformat and quota calculation 2016-02-24 11:53:32 +08:00
Daniel Pan
b8f6d61d4e Merge pull request #1019 from haiwen/grp-discus-api 
[api2] Add list/post/delete group discussions
 2016-02-23 22:08:50 +08:00
Daniel Pan
fa24c0c5d1 Merge pull request #1028 from haiwen/5.0-shib-nickname 
[shib] Use display_name in shib_meta as nickname, fallback to givenna…
 2016-02-23 16:11:33 +08:00
Daniel Pan
eb0f749b82 Merge pull request #1029 from haiwen/5.0-email2nickname 
[seahub tags] Handle empty nickname in email2nickname
 2016-02-23 16:10:26 +08:00
zhengxie
d01c21a9cc [test] Update shib test 2016-02-23 15:23:45 +08:00
zhengxie
f98b97b60b [seahub tags] Handle empty nickname in email2nickname 2016-02-23 15:13:12 +08:00
zhengxie
11e645cae0 [shib] Use display_name in shib_meta as nickname, fallback to givenname + surname if missing 2016-02-23 14:26:10 +08:00
Daniel Pan
663a00e8ab Merge pull request #1025 from haiwen/5.0-virus-fix 
5.0 virus fix
 2016-02-23 13:49:55 +08:00
zhengxie
a5f262b1a6 [test] Workaround for virus scan test 2016-02-23 13:38:22 +08:00
zhengxie
ebcd7ed44d [virus] Fix url error when records number more than 9 2016-02-23 11:53:16 +08:00
Daniel Pan
4179a13c4c Merge pull request #1014 from haiwen/turn-group-wiki 
Turn on/off group Wiki
 2016-02-19 17:29:41 +08:00
lian
8124fa4a79 update admin default repo view page & rm unused code 2016-02-19 15:47:04 +08:00
Daniel Pan
a5056c7a67 Merge pull request #1021 from haiwen/5.0-notice 
[notice] Fix notification email bug
 2016-02-18 23:04:22 +08:00
zhengxie
7e81ad7356 [tests] Fix tests 2016-02-17 16:17:00 +08:00
zhengxie
ae1c8f0a0a [notice] Fix notification email bug 2016-02-17 16:01:54 +08:00
Daniel Pan
a7eecaeff4 Merge pull request #1018 from haiwen/repo-folder-perm 
update args of repo user/group perm api
 2016-02-02 18:08:51 +08:00
lian
413738f66e update args of repo user/group perm api 2016-02-02 15:27:39 +08:00
zhengxie
56f533c300 [api2] Add list/post/delete group discussions 2016-02-02 15:01:13 +08:00
zhengxie
dc6420a440 [tests] Fix pub repo tests 2016-02-02 13:32:12 +08:00
zhengxie
cc5af51dec Merge branch '5.0' 
Conflicts:
	seahub/templates/base_for_backbone.html
	seahub/templates/libraries.html
	seahub/templates/myhome_base.html
 2016-02-02 12:19:46 +08:00
zhengxie
52b661147e Fix default repo re-creation bug when web login after desktop 2016-02-01 11:54:02 +08:00
Daniel Pan
735563e26d Fix group api tests 2016-01-30 17:32:13 +08:00
zhengxie
a988e52153 [tests] add seahub uts 2016-01-28 15:38:25 +08:00
lian
93f13e7358 add test for web-api use new seafile api 2016-01-27 18:05:29 +08:00
lian
3d09dd9953 update seahub according to new seafile api 2016-01-27 15:52:33 +08:00
lian
08f929eb35 [api] add repo user/group folder perm api 2016-01-27 09:58:20 +08:00
zhengxie
df1e082e8c Update function name and error msg 2016-01-26 10:38:19 +08:00
Daniel Pan
d8a4b16a5b Merge pull request #1000 from haiwen/repo-share-link-api 
[api] add repo share link api
 2016-01-23 13:20:20 +08:00
zhengxie
c4d743b134 Add setting to enable/disable organization repo creation 2016-01-21 13:55:52 +08:00
lian
a84c603168 [api] add repo share link api 2016-01-20 16:29:46 +08:00
lian
fd01c06802 [api2] update repo history limit 
still can get limit days if history limit setting not enabled
 2016-01-20 11:46:17 +08:00
Daniel Pan
cac889406a Merge pull request #996 from haiwen/repo-history-limit-api 
[api] add repo history limit api
 2016-01-16 14:57:57 +08:00