haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-23 04:18:21 +00:00
Code Issues Releases Wiki Activity
5,310 Commits 143 Branches 464 Tags
527449d7abd848aa388b75c63168d0a80cbcb49c
Commit Graph

5310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
lian
fcd3e836e3 [api] return licensed to info when get sysinfo 2016-07-13 16:31:05 +08:00
Daniel Pan
9ca09845ad Merge pull request #1282 from haiwen/org 
Org
 2016-07-13 15:31:07 +08:00
llj
8c4df36598 rm unused files 2016-07-13 15:19:27 +08:00
llj
aa2e77e191 [org] bugfix 2016-07-13 15:04:43 +08:00
Daniel Pan
756fee89da Merge pull request #1280 from haiwen/admin-search-user 
[sysadmin] add search user by name & contact email
 2016-07-13 11:46:15 +08:00
lian
70adf6d552 [sysadmin] add search user by name & contact email 2016-07-13 11:22:36 +08:00
Daniel Pan
b518955a28 Merge pull request #1278 from haiwen/search-user 
[api2] update search user api
 2016-07-12 15:16:55 +08:00
lian
8f1dbb7ea3 update search user api 2016-07-12 15:04:36 +08:00
Daniel Pan
fa629da91a Merge pull request #1277 from haiwen/pdf_view 
[pdf file view] fix for view with pdf2html
 2016-07-12 12:13:30 +08:00
llj
dcb47532fc [pdf file view] fix for view with pdf2html 2016-07-12 11:42:46 +08:00
Daniel Pan
9d57572b47 Merge pull request #1276 from haiwen/rm 
rm unused files
 2016-07-11 17:12:50 +08:00
llj
c39b0b5ff3 rm unused files 2016-07-11 17:03:58 +08:00
xiez
6dee46f7d1 Merge pull request #1275 from haiwen/license-info 
update license info
 2016-07-11 14:15:05 +08:00
lian
4f43f31468 [api] update license info 2016-07-11 12:08:44 +08:00
xiez
7bf6ed0d5d Merge pull request #1272 from haiwen/dir-sub-repo 
update create dir sub repo api
 2016-07-08 15:40:22 +08:00
lian
d89c3bd906 update create dir sub repo api 2016-07-08 10:15:13 +08:00