haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-27 19:05:16 +00:00
Code Issues Releases Wiki Activity
5,326 Commits 128 Branches 443 Tags 1.4 GiB
4f2d1f1dcc
Commit Graph

5326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Pan
4f2d1f1dcc Improve license declaration 2016-07-30 11:09:19 +08:00
xiez
c1c0ddd425 Merge pull request #1303 from haiwen/update-sysadmin 
update sysadmin code
 2016-07-28 15:59:07 +08:00
lian
334e99add6 update sysadmin code 2016-07-28 15:54:56 +08:00
Daniel Pan
26d2a4d774 Merge pull request #1299 from haiwen/terms 
Terms
 2016-07-27 13:54:04 +08:00
Daniel Pan
9dcd6cdc7f Merge pull request #1298 from haiwen/file-view 
[file view] use icons for operations
 2016-07-27 13:53:02 +08:00
llj
b0876bef53 [file view] use icons for operations 2016-07-27 13:32:36 +08:00
Daniel Pan
02a8ae394b Merge pull request #1290 from haiwen/admin-groups 
new admin groups page
 2016-07-26 15:52:42 +08:00
llj
94e9e358c5 [Terms] modified UI 2016-07-26 15:47:06 +08:00
llj
de81823121 [Terms] fix & improvement 2016-07-26 15:03:15 +08:00
Daniel Pan
21a7aa3560 Merge pull request #1302 from haiwen/copyright 
Add copyright header
 2016-07-26 10:57:24 +08:00
zhengxie
5a2af77d44 Add copyright header 2016-07-26 10:51:29 +08:00
Daniel Pan
527449d7ab Merge pull request #1301 from haiwen/lic 
Add licenses
 2016-07-25 12:08:01 +08:00
zhengxie
c675497336 Add licenses 2016-07-25 11:12:40 +08:00
zhengxie
0f73921205 Update T&C 
Conflicts:
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/sysadmin/base.html
	seahub/urls.py
	seahub/views/sysadmin.py
 2016-07-22 16:39:05 +08:00
zhengxie
41f9a3950c Add ToC 2016-07-22 16:34:09 +08:00
llj
d9ac225f87 [system admin] groups: bugfix & improvement 2016-07-21 15:13:48 +08:00
xiez
126da528b5 Merge pull request #1295 from haiwen/fix/api2 
[api2] Add "created at" field in token V2
 2016-07-21 13:23:17 +08:00
lian
18749080da rm sys_info code 2016-07-21 10:57:04 +08:00
zhengxie
57cc2b4aba Merge branch '5.1' 
Conflicts:
	seahub/base/accounts.py
	seahub/share/views.py
	seahub/views/sysadmin.py
	tests/seahub/base/test_accounts.py
	tests/seahub/share/views/test_ajax_get_download_link.py
	tests/seahub/share/views/test_ajax_get_upload_link.py
 2016-07-21 10:55:50 +08:00
Daniel Pan
8536d20eda Merge pull request #1296 from haiwen/admin-org 
fix bug when admin remove org group
 2016-07-20 18:24:26 +08:00
lian
82ef2ebddc fix bug when admin remove org group 2016-07-20 17:55:39 +08:00
lian
6338e0dc05 filter out org groups from admin groups 2016-07-20 17:23:07 +08:00
lian
744efb2322 new admin groups page 2016-07-20 17:23:07 +08:00
Daniel Pan
a0ab79f26b Merge pull request #1281 from haiwen/feature/invite_guest 
Feature/invite guest
 2016-07-20 16:48:37 +08:00
zhengxie
f1aaea96f1 [api2] Add "created at" field in token V2 2016-07-20 16:02:17 +08:00
lian
782fbb38ed add ENABLE_GUEST_INVITATION setting 2016-07-20 15:45:38 +08:00
llj
e5b0d1ee31 [invitations] bugfix & improvment 2016-07-20 15:45:05 +08:00
lian
6688dc760b new invitation page 2016-07-20 15:40:58 +08:00
zhengxie
7452c0cfc2 [api] Add guest invite feature 2016-07-20 15:38:15 +08:00
Daniel Pan
f29855a3c1 Merge pull request #1294 from haiwen/misc-fix 
[misc] fix
 2016-07-20 14:50:10 +08:00
llj
2f5cf202d9 [misc] fix 2016-07-20 14:20:19 +08:00
Daniel Pan
603f88c6ab Merge pull request #1292 from haiwen/path 
modified 'path-bar'
 2016-07-19 17:39:48 +08:00
llj
6793cf8107 modified 'path-bar' 2016-07-19 17:26:45 +08:00
Daniel Pan
bd39318160 Merge pull request #1291 from haiwen/wiki 
[wiki] modification
 2016-07-19 16:20:57 +08:00
llj
7184b6502f [wiki] modification 2016-07-19 15:52:16 +08:00
Daniel Pan
1375898a86 Merge pull request #1289 from haiwen/add-thirdparty-license 
Include licences for all third party python libs.
 2016-07-19 13:53:51 +08:00
Shuai Lin
54280ff9dd Capitalize seafile in the license file. 2016-07-19 13:50:11 +08:00
Shuai Lin
ede40e1c1c Include licenses for all third party python libs. 2016-07-19 00:06:18 +08:00
Daniel Pan
c40b67b297 Merge pull request #1253 from haiwen/improve-nav 
Improve navigation and tips
 2016-07-18 22:08:42 +08:00
llj
b2a9291fc3 improved nav 2016-07-18 19:08:48 +08:00
Daniel Pan
7b171b9903 Improve navigation and tips 2016-07-18 19:06:06 +08:00
lian
efdc55ffd3 rm joined groups from middleware (#1287) 
* rm joined groups from middleware

* rm "base_template" code from context_processors.py

* clean unused group add code
 2016-07-18 18:30:50 +08:00
xiez
5c2616ed30 Merge pull request #1284 from haiwen/rm-org-user 
[sysadmin] update rm org user
 2016-07-15 18:13:45 +08:00
xiez
59ac32c652 Merge pull request #1286 from haiwen/two-factor-auth 
update two factor auth code
 2016-07-15 18:13:21 +08:00
lian
eabca58996 update two factor auth code 2016-07-15 18:03:27 +08:00
llj
3af253401d [two factor auth] modified UI (#1273) 
* [two factor auth] modified UI

* [2fa] login: modified UI

* WIP: update two-factor auth

* [2fa] improvement
 2016-07-15 14:39:23 +08:00
lian
b5d9ece164 rm synced repos at devices page (#1285) 2016-07-14 13:54:17 +08:00
lian
12fd7a93d9 [sysadmin] update rm org user 2016-07-13 18:08:28 +08:00
lian
fe236eca03 [api] rm virtual repo related code (#1279) 2016-07-13 17:34:16 +08:00
Daniel Pan
8b8f374693 Merge pull request #1283 from haiwen/license-user 
[api] return licensed to info when get sysinfo
 2016-07-13 16:43:39 +08:00