haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 08:16:07 +00:00
Code Issues Releases Wiki Activity
6,461 Commits 146 Branches 461 Tags
42cae42380c53e4290672bed3e8b4773c8acfcea
Commit Graph

6461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhengxie
d3491fad0b [i18n] Update source files 2017-09-12 13:38:14 +08:00
xiez
5326efa741 Merge pull request #1804 from haiwen/two_factor 
[two factor] update translation
 2017-09-12 13:35:28 +08:00
xiez
3968201731 Merge pull request #1806 from haiwen/email-regex 
update Regular Expression of email in admin user url
 2017-09-12 10:39:19 +08:00
Daniel Pan
4fb8fa2abf Merge pull request #1808 from haiwen/address-book 
change tips for `list-in-address-book`
 2017-09-11 15:41:40 +08:00
lian
d45a15c283 change tips for list-in-address-book 2017-09-11 15:18:35 +08:00
lian
222ffc8121 update test of user permission 2017-09-11 14:48:14 +08:00
lian
f19389b9f7 update Regular Expression of email in admin user url 2017-09-11 14:34:07 +08:00
xiez
f6b7dd6e48 Merge pull request #1685 from haiwen/address-book 
add ENABLE_ADDRESSBOOK_OPT_IN setting
 2017-09-11 13:22:46 +08:00
zhengxie
dfe6dea1ff [i18n] Update source files 2017-09-11 11:55:02 +08:00
llj
5dd6d84038 [home side nav] fixed text 2017-09-11 11:47:55 +08:00
zhengxie
71cf67e749 [two factor] update translation 2017-09-11 11:47:53 +08:00
llj
466bfb3527 Merge pull request #1803 from haiwen/daily_admin 
[system admin] 'admin role': daily_admin can't manage admins
 2017-09-11 11:25:37 +08:00
llj
8c8ce7e815 [system admin] 'admin role': daily_admin can't manage admins 2017-09-11 11:21:54 +08:00
lian
9bdbb1671a Add ENABLE_ADDRESSBOOK_OPT_IN setting 
Enable user to choose if show himself in global address book
 2017-09-11 11:13:59 +08:00
zhengxie
4cae20f376 [locale] Update source file 2017-09-09 18:15:56 +08:00
xiez
4fbc07f4ab Merge pull request #1802 from haiwen/ReferenceID 
add unique reference and test
 2017-09-09 18:13:11 +08:00
zming
74673d92b1 add unique reference and test 2017-09-09 18:00:22 +08:00
xiez
95e1a94ee4 Merge pull request #1801 from haiwen/dir-share-item-trans 
update trans string
 2017-09-09 17:59:24 +08:00
lian
47ef40fe9f update trans string 2017-09-09 17:36:08 +08:00
xiez
bd152ab841 Merge pull request #1800 from haiwen/file-tag-trans 
optimization translation
 2017-09-09 17:15:20 +08:00
zming
b7c0abf819 optimization translation 2017-09-09 17:00:33 +08:00
xiez
91cbaea984 Merge pull request #1798 from haiwen/change_email 
[auth, api, shibboleth] Use primary id in login
 2017-09-09 16:21:05 +08:00
llj
45fb407368 Merge pull request #1784 from haiwen/admin-role-log 
add admin role/login feature
 2017-09-09 16:19:38 +08:00
llj
6c04e9ec25 [system admin] users: modified table UI 2017-09-09 15:35:12 +08:00
lian
bc492b9010 add admin role/log feature 2017-09-09 15:27:04 +08:00
zMingGit
f9c16e95e1 performance, funciton name (#1795) 
* performance, funciton name

* middle

* depend with_repos, modify test
 2017-09-09 11:10:34 +08:00
xiez
0b973d854d Merge pull request #1789 from haiwen/ReferenceID 
[API] add user reference id
 2017-09-07 17:49:43 +08:00
zming
669beb936e add unique reference and test 2017-09-07 17:38:41 +08:00
xiez
aacd84d634 Merge pull request #1797 from haiwen/admin-user 
add `email` parameter to `update_user_info` func
 2017-09-07 15:52:45 +08:00
llj
8acffd3fc4 [system admin] userinfo: rm 'email' in 'data' of requests 2017-09-07 15:49:23 +08:00
llj
e8f39a0d55 [system admin] userinfo: fix & improvement, mainly for 'reference id' 2017-09-07 15:36:55 +08:00
zming
1044f11aea [API] add user reference id 2017-09-07 15:22:15 +08:00
lian
a006e202c6 add user parameter to update_user_info func. 2017-09-07 14:44:10 +08:00
xiez
91dc4238c6 Merge pull request #1787 from haiwen/share-admin-permission-to-groups 
Share admin permission to groups
 2017-09-06 16:22:50 +08:00
llj
dafedd5f7f modified 'group-repo' 2017-09-06 16:14:27 +08:00
llj
667afb6a59 [share] share repo to group with 'admin' perm: fix 2017-09-06 16:02:12 +08:00
zming
dd7f5d5417 [API] share to groups, add test 2017-09-06 16:02:12 +08:00
zMingGit
24232c85f7 Profile default (#1793) 
* profile -> institution test

* fix
 2017-09-06 15:35:23 +08:00
zhengxie
6d48dee854 [settings] Update logging rotating 2017-09-05 16:21:20 +08:00
Daniel Pan
e5e5826412 Merge pull request #1790 from haiwen/custom-search-user 
add institution hook function when search user
 2017-09-05 12:09:06 +08:00
zming
4a9b657680 [two-factor-auth]modify variable name 2017-09-04 18:17:13 +08:00
zhengxie
c004100a8a Merge branch '6.1' 
Conflicts:
	seahub/urls.py
 2017-09-04 17:07:02 +08:00
lian
8a2c2eef58 seahub custom functions 
allow user to write his own custom search user function
 2017-09-04 15:20:54 +08:00
xiez
e851d031af Merge pull request #1785 from haiwen/custom-logo 
use custom logo when send email
 2017-09-01 18:11:16 +08:00
Daniel Pan
ecc79fb9c2 Merge pull request #1786 from haiwen/history-setting-trans 
update trans string of libary history settings
 2017-09-01 06:19:07 +08:00
Daniel Pan
75db0b6875 Merge pull request #1788 from haiwen/UI 
Ui
 2017-08-31 17:35:59 +08:00
llj
211d527e5a [home side nav] modified 'share admin' 2017-08-31 17:26:52 +08:00
llj
62f049bcc9 [home pages] don't use 'bold' style for text links 2017-08-31 15:14:41 +08:00
lian
cbf0b09ce0 update trans string of libary history settings 2017-08-31 14:58:20 +08:00
lian
6ebbce5b76 use custom logo when send email 2017-08-31 14:43:25 +08:00