haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 02:48:51 +00:00
Code Issues Releases Wiki Activity
6,290 Commits 148 Branches 463 Tags
bd152ab841ddf73ae1d7b9346e7adc752425c61f
Commit Graph

6290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Daniel Pan
ba86d53b72 Merge pull request #1771 from haiwen/file-view-ui 
File view ui
 2017-08-31 12:12:55 +08:00
llj
2cfe5db0cf [file view] modified UI 2017-08-31 11:28:09 +08:00
Daniel Pan
834fc13d76 Merge pull request #1751 from haiwen/share-admin-permission 
[share] add admin permission
 2017-08-30 18:08:33 +08:00
llj
33266638ef [share] share repo with 'admin' perm: modification 2017-08-30 17:59:14 +08:00
xiez
c1a5998f40 Merge pull request #1783 from haiwen/client_platform 
update auth token platform field check
 2017-08-29 17:29:26 +08:00
lian
93d7b6e77c update auth token platform field check 2017-08-29 17:24:29 +08:00
xiez
bc609e89f7 Merge pull request #1765 from haiwen/admin-user-api 
add admin user api
 2017-08-28 16:09:30 +08:00
lian
2f3c7736f6 use 400 http code when user exists 2017-08-28 16:07:08 +08:00
lian
1266e1b237 add admin users api 2017-08-28 14:52:28 +08:00
Daniel Pan
4110908f6a Merge pull request #1782 from haiwen/org-search-user 
use ccnet_api.get_org_users_by_url_prefix()
 2017-08-28 14:33:13 +08:00
lian
1b243cf4e7 use ccnet_api.get_org_users_by_url_prefix() 2017-08-28 14:17:20 +08:00
zhengxie
318c7de424 [auth, api, shibboleth] Use primary id in login 2017-08-26 14:54:48 +08:00
Daniel Pan
b912c69c5a Merge pull request #1735 from haiwen/new-lib-icons 
[lib icons] use new lib icons
 2017-08-26 11:44:55 +08:00
llj
dcfdafcc43 [lib icons] modified some icons 2017-08-26 11:07:12 +08:00
llj
85bb89d1b9 [lib icons] use 2X icons for non-backbone pages 2017-08-26 11:07:12 +08:00
llj
ab5c066a74 [lib icons] use new lib icons 2017-08-26 11:07:12 +08:00
llj
df40bee1d5 Merge pull request #1773 from haiwen/login-bg-image 
background image of login page
 2017-08-26 10:51:31 +08:00
Daniel Pan
252fbc3261 Merge pull request #1780 from haiwen/search-user 
update search user in org mode
 2017-08-26 10:46:02 +08:00
zming
160e0b3027 [API] share to admin permission 2017-08-26 10:38:12 +08:00
lian
1bb1ef8033 update search user in org mode 2017-08-25 15:32:35 +08:00
llj
0f8ee85063 [system admin] settings: modified 'Login Background Image' 2017-08-25 12:05:14 +08:00