haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-09 10:50:24 +00:00
Code Issues Releases Wiki Activity
12,694 Commits 142 Branches 460 Tags
f947eca8b51f9a7ce94eaa4e255b457b96985fa8
Commit Graph

840 Commits

Author SHA1 Message Date
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
zhengxie
6d1e5e9884 Fix tokenv2 error when platform_version is empty 2016-01-15 12:27:38 +08:00
lian
0e43a099ff [api] update search user api 2016-01-14 13:10:24 +08:00
lian
267798b3f1 [api] add repo history limit api 2016-01-14 11:35:15 +08:00
lian
3c21b354be [api] add transfer repo api 2016-01-13 17:58:59 +08:00
zhengxie
cf3d96b46a Merge branch '5.0' 
Conflicts:
	media/css/sf_font2/seafile-font2.eot
	media/css/sf_font2/seafile-font2.ttf
	media/css/sf_font2/seafile-font2.woff
	requirements.txt
	seahub/api2/endpoints/dir_shared_items.py
	seahub/templates/js/templates.html
	seahub/views/ajax.py
	static/scripts/app/views/group-repo.js
 2016-01-13 10:19:56 +08:00
lian
115bcfb54c [api] remove more unused group/user messages code 2016-01-11 18:23:44 +08:00
Daniel Pan
af0ab3e221 Remove unused APIs 
Group messages and personal messages related API is no longer used
 2016-01-11 00:02:17 +08:00
Daniel Pan
c9fc63ae02 Merge pull request #986 from haiwen/check-audit-conf 
check if audit enabled
 2016-01-09 17:02:05 +08:00
lian
a7458622b7 check if audit enabled 2016-01-09 16:40:39 +08:00
lian
0d1bff5f0a update share link access check 2016-01-08 14:38:50 +08:00
lian
00444eee9e update insensitive search user test 2016-01-07 11:14:09 +08:00
lian
44d176a45c update group api test 2016-01-06 19:12:24 +08:00
zhengxie
c0d3d02341 Merge branch '4.4' into 5.0 2015-12-28 10:47:34 +08:00
zhengxie
042956c5a5 Merge branch '4.4' into 5.0 2015-12-28 10:36:30 +08:00
lian
a722448548 [api2] search user insensitive 2015-12-25 17:35:05 +08:00
lian
58550e3e59 [api2] fix share type info in "be shared" repos api 2015-12-24 14:53:29 +08:00
lian
bbb9e8664e [api] add delete be shared repo api 2015-12-23 18:53:12 +08:00
zhengxie
1672bbd5ff [api2] Add list shared upload links 2015-12-23 17:31:07 +08:00
Daniel Pan
098415212f Merge pull request #929 from haiwen/force_pwd 
[sysadmin] Force passwd change when add/reset user
 2015-12-20 11:19:24 +08:00
Daniel Pan
9e855459eb Merge pull request #930 from haiwen/post_office 
Add post_office app, and send async email to imported csv users
 2015-12-20 11:17:41 +08:00
zhengxie
3b0f3d475b Merge branch '4.4' into 5.0 
Conflicts:
	seahub/templates/share_access_validation.html
 2015-12-17 15:50:50 +08:00
lian
c809bd0390 update test shard dir 2015-12-16 19:24:51 +08:00