haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 13:24:52 +00:00
Code Issues Releases Wiki Activity
5,082 Commits 145 Branches 460 Tags
3fac2a79c2e2569c74c4b58d79d932e6f838ba3c
Commit Graph

5082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Pan
229681560a Merge pull request #969 from haiwen/library-settings 
Add repo operations
 2016-02-23 21:59:08 +08:00
llj
442753f96a [lib setting] added 'change password' for enc libs; removed original setting pages 2016-02-23 19:54:33 +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
xiez
eb8ebcaa88 Merge pull request #1026 from haiwen/fix-api2-client-version-header 
Fixed custom headers in api2 client version check.
 2016-02-23 15:20:07 +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
Shuai Lin
5b11641787 Fixed custom headers in api2 client version check. 2016-02-23 14:06:02 +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
llj
7413e36f0e [lib setting] folder perm: clean up 2016-02-23 12:46:00 +08:00
zhengxie
ebcd7ed44d [virus] Fix url error when records number more than 9 2016-02-23 11:53:16 +08:00
Daniel Pan
08813c6ee6 Merge pull request #1020 from haiwen/default-repo 
update admin repo view page
 2016-02-23 10:33:06 +08:00
lian
fe593accf7 [seafadmin] not show system default repo at "all" tab page 2016-02-22 16:16:50 +08:00
llj
262fae0590 [system repo view] bugfix & improvement; rm unused files 2016-02-22 15:44:23 +08:00
Daniel Pan
0c626cde0e Merge pull request #1023 from haiwen/user-intro 
rm user intro at admin-user-info/profile page
 2016-02-22 10:58:10 +08:00
lian
738bd52f7a rm user intro at admin-user-info/profile page 2016-02-20 17:54:22 +08:00
llj
3d27c05520 [lib setting] folder perm: modified ui 2016-02-20 14:20:50 +08:00
poetwang
c760c1a26d [api2] Add api to check missing blocks before uploading 2016-02-20 10:29:13 +08:00
llj
9b4e4d0460 [lib setting] add 'folder perm' 2016-02-19 17:38:32 +08:00
llj
a541bd5ed1 [lib setting] remove 'permissions' 2016-02-19 17:38:32 +08:00
llj
eaba92f544 [lib setting] added 'shared links' 2016-02-19 17:38:32 +08:00
llj
f6ed190d5b [lib settings] modification 2016-02-19 17:38:32 +08:00
Daniel Pan
adf9837337 Add setting library history 2016-02-19 17:38:32 +08:00
Daniel Pan
54a29bc743 Add library transfer 2016-02-19 17:38:32 +08:00
Daniel Pan
b0ccc76bee Finish rename repo 2016-02-19 17:38:32 +08:00
Daniel Pan
92044f6a34 Add share link admin dialog and permission settings dialog 2016-02-19 17:38:31 +08:00
Daniel Pan
8d12ea22c7 Add repo operations 2016-02-19 17:38:31 +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
llj
4dd0015cba [group setting, group wiki] bugfix, modification 2016-02-19 17:01:31 +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
a355d40135 [notice] Update logger level 2016-02-18 22:02:29 +08:00
Daniel Pan
f2e51ac488 Merge pull request #1022 from haiwen/5.0-settings 
[settings] Update pub repo creation and sync with folder
 2016-02-18 18:32:01 +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
zhengxie
602355381f [settings] Update pub repo creation and sync with folder 2016-02-17 16:00:53 +08:00
zhengxie
7ec15def66 [travis] Fix error 2016-02-17 15:40:25 +08:00
zhengxie
b29b543d62 [api2] Update group discussion error msg 2016-02-02 18:18:19 +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
Daniel Pan
f2b4cdad3d Merge pull request #1016 from haiwen/5.0-default_repo 
Fix default repo re-creation bug when web login after desktop
 2016-02-01 14:10:29 +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
5f462a5f63 Merge pull request #1013 from haiwen/sub-repo 
not show sub repo at some page
 2016-02-01 11:47:00 +08:00
Daniel Pan
d1912a6d4d Merge pull request #1012 from haiwen/revert-file-dir 
refresh current page when revert file/dir
 2016-02-01 11:45:53 +08:00
lian
905c81a57b not show sub-repo at web front page 2016-02-01 11:21:05 +08:00