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
5,353 Commits 148 Branches 463 Tags
b74bc6fd2af37f8771a4b8583fdeca166b287654
Commit Graph

5353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lian
b74bc6fd2a [syadmin] add "Name" and "Contact Email" when export users to excel 2016-08-09 11:17:38 +08:00
zhengxie
e48ae64576 [inst] Update user table 2016-08-08 18:19:54 +08:00
lian
06022c3109 [sysadmin] update user admin page 2016-08-08 14:03:07 +08:00
Daniel Pan
0ba90fb72a Merge pull request #1314 from haiwen/dirView-fix 
[dir view] fixed 'loading more'
 2016-08-05 15:58:13 +08:00
llj
a62dc674d3 [dir view] fixed 'loading more' 2016-08-05 14:21:28 +08:00
Daniel Pan
14883e4715 Merge pull request #1310 from haiwen/print 
[file view] added css for print
 2016-08-05 11:24:17 +08:00
Daniel Pan
2f1eb4e7f7 Merge pull request #1308 from haiwen/fix/institutions 
Fix to adapt fullscreen
 2016-08-05 10:53:07 +08:00
Daniel Pan
363fad32b4 Merge pull request #1313 from haiwen/admin-grp 
update admin transfer group
 2016-08-05 10:48:41 +08:00
lian
c7acdce7de update admin transfer group 2016-08-04 18:01:44 +08:00
llj
374c404d50 [file view] doc/pdf: add css for print 2016-08-04 17:52:25 +08:00
Daniel Pan
72efe4f8ea Merge pull request #1312 from haiwen/accounts 
add `LDAPImport` scope when get accounts
 2016-08-04 14:52:03 +08:00
lian
3fff8e64c4 add LDAPImport scope when get accounts 2016-08-04 13:58:49 +08:00
zhengxie
8cf9d9a9c3 Fix to adapt fullscreen 2016-08-03 15:17:58 +08:00
llj
9b135f57c4 [file view] markdown: added css for print 2016-08-03 15:12:19 +08:00
zhengxie
15d082a8c5 Fix locale strings 2016-08-03 11:57:25 +08:00
zhengxie
f3235d970a [i18n] Update source files 2016-08-02 16:27:24 +08:00
zhengxie
922148a1b0 Add terms&conditions config 2016-08-02 15:03:19 +08:00
zhengxie
a0c3b15c75 [sql] Add missing tables 2016-08-02 14:49:25 +08:00
zhengxie
f4152fbec6 Merge branch '5.1' 2016-08-02 13:36:17 +08:00
zhengxie
c585d99be5 [sql] Update to 6.0 2016-08-02 11:57:49 +08:00
Daniel Pan
d893a920a8 Merge pull request #1307 from haiwen/zip-progress 
[zip download] modified progress
 2016-08-02 11:57:34 +08:00
llj
271eacabd0 [zip download] modified progress 2016-08-02 11:35:05 +08:00
xiez
507bf0a99a Merge pull request #1306 from haiwen/update-seafile-api 
Update seafile api
 2016-08-01 14:49:22 +08:00
lian
d142f2ddc1 update usage of seafile_api & test 2016-08-01 14:38:54 +08:00
lian
7e2585d7e8 update device code 2016-08-01 13:50:31 +08:00
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
xiez
92d4ae9a2b Merge pull request #1300 from haiwen/update-search-user 
update import CLOUD_MODE setting
 2016-07-23 14:43:42 +08:00
lian
bc16591ebc update import CLOUD_MODE setting 2016-07-23 14:34:44 +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