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,888 Commits 148 Branches 463 Tags
122fbe9ef78eb4abffddb90c467180f58ac9924c
Commit Graph

5888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Pan
1d21776299 Merge pull request #1442 from haiwen/statistics 
update sysadmin page
 2017-01-07 10:28:19 +08:00
lian
38a06be960 update sysinfo page 2017-01-07 10:12:17 +08:00
Daniel Pan
19b79de5ce Merge pull request #1441 from haiwen/admin-set-quota 
format size when admin set user quota
 2017-01-07 10:07:43 +08:00
lian
072defd547 format size when admin set user quota 2017-01-06 18:50:14 +08:00
xiez
9a9b6eb9e1 Merge pull request #1429 from haiwen/useradmin 
Useradmin
 2017-01-06 14:01:59 +08:00
cuihaikuo
0f0c360f21 Use seafile_api to set/get org user quota 2017-01-06 11:26:53 +08:00
lian
9e97a425ab use "user" object when get account info 2017-01-06 11:25:19 +08:00
llj
7f77d7170c [sysadmin] userinfo: fix 2017-01-05 16:14:32 +08:00
zhengxie
49eb940004 Merge branch '6.0' 2017-01-05 15:43:45 +08:00
lian
625db696af use api to set user quota/profile 2017-01-05 13:33:12 +08:00
llj
7c4d32ac24 [dir view] fixed 'window scroll' related bugs 2017-01-04 17:32:42 +08:00
llj
f3b984f482 [mobile] dir view: modification 2017-01-04 17:19:57 +08:00
llj
90a5552a9d [my libs, dir view] improvement: enlarge clickable area, and etc. 2017-01-04 17:19:57 +08:00
llj
cffc0743d2 [mobile] favourites: redesigned it. 2017-01-04 17:19:57 +08:00
llj
f4eacae253 [mobile] dir view, group: modification 2017-01-04 17:19:57 +08:00
llj
2d7f5339c3 [mobile] dir view: redesigned it 2017-01-04 17:19:57 +08:00
llj
943804c00e [mobile] my libs: modified details 2017-01-04 17:19:57 +08:00
llj
591ab5e517 [mobile] redesigned big modal popups 2017-01-04 17:19:57 +08:00
llj
a0ff7afaf8 [mobile] redesigned 'libs list' UI for shared/org/groups/group 2017-01-04 17:19:57 +08:00
llj
7a9a89a7d1 [mobile] my libs: redesigned it 2017-01-04 17:19:57 +08:00
llj
214fd20fbb modified repo-create-form 2017-01-04 17:19:57 +08:00
llj
b2a8efe654 [mobile] modified side-nav for touch devices 2017-01-04 17:19:57 +08:00
llj
9d31f3c3b0 [mobile] modified 'viewport' 2017-01-04 17:19:57 +08:00
Daniel Pan
493e0093d6 Merge pull request #1438 from haiwen/drag-drop 
[dir view] drag & drop: highlight the dir item
 2017-01-04 14:01:30 +08:00
Daniel Pan
1273ffa83d Merge pull request #1423 from haiwen/new 
[dir view] redesigned 'new folder/file'
 2017-01-04 13:53:04 +08:00
llj
4d4762b1af [dir view] drag & drop: modified highlight effect 2017-01-04 13:51:38 +08:00
xiez
ce2c67bd83 Merge pull request #1439 from haiwen/quota 
check quota when copy/move file/dir
 2017-01-04 12:04:52 +08:00
lian
c7e1fc02d8 check quota when copy/move file/dir 2017-01-04 11:05:16 +08:00
llj
0075764bae [dir view] drag & drop: highlight the dir item 2017-01-03 18:39:14 +08:00
llj
49349c265a [sys useradmin] added 'set quota' for 'LDAP(imported)'; modified UI for 'LDAP' 2016-12-26 14:55:13 +08:00
Daniel Pan
65325da7de Merge pull request #1434 from haiwen/fix/group_wiki 
Fix group wiki for system admin
 2016-12-26 14:38:21 +08:00
zhengxie
d4e00402af Merge branch '6.0' 
Conflicts:
	media/css/seahub.css
 2016-12-26 14:22:35 +08:00
zhengxie
b92a370658 Fix group wiki for system admin 2016-12-26 14:18:29 +08:00
Daniel Pan
c28f684c22 Merge pull request #1428 from haiwen/enhancement/invitation 
[invitation] Check duplicated accepter and add blocklist for accepter
 2016-12-26 12:02:57 +08:00
zhengxie
11fdfe7299 [invitation] Check duplicated accepter and add blocklist for accepter 2016-12-26 11:49:45 +08:00
Daniel Pan
f5d17c3814 Merge pull request #1433 from jamietanna/virtualenv 
Add instructions for how to set up in a virtualenv
 2016-12-24 10:11:53 +08:00
Jamie Tanna
9b36b9ee07 Add instructions for how to set up in a virtualenv 
Using a virtualenv is much better than globally installing all of the
project's dependencies, as it doesn't pollute the global package space,
and allows us to work just within the project folder.
 2016-12-23 11:03:33 +00:00
Daniel Pan
3b9c5dcb54 Merge pull request #1410 from haiwen/admin-create-group 
admin create group
 2016-12-23 15:49:22 +08:00
Daniel Pan
93773f8f2f Merge pull request #1430 from haiwen/fileupload-fix 
[fileupload] ui fix
 2016-12-23 12:11:35 +08:00
llj
eb82d1a5f9 [fileupload] ui fix 2016-12-23 11:58:03 +08:00
llj
1785171a14 [sysadmin] groups: modification 2016-12-22 19:15:21 +08:00
llj
bb6e1d1419 [sys useradmin] enable 'set quota' for DB useradmin; modified 'set quota' in user info page 2016-12-21 18:24:22 +08:00
llj
d3ab1d76a3 [sys useradmin] enable add 'name, department' when add/import user; enable set 'name, department' in user info page 2016-12-21 11:41:32 +08:00
Daniel Pan
4a99ee32a0 Merge pull request #1427 from haiwen/export-user 
update sysadmin export user to excel
 2016-12-19 11:58:35 +08:00
lian
4d50810189 update sysadmin export user to excel 2016-12-19 11:05:37 +08:00
llj
91e0085acb Merge pull request #1426 from haiwen/settings-trans 
add trans for help-tip in settings page
 2016-12-17 11:35:58 +08:00
lian
da5bfc9d42 add trans for help-tip in settings page 2016-12-16 17:09:24 +08:00
zhengxie
c64c567f20 [i18n] Update fr locale 2016-12-16 15:19:19 +08:00
lian
d6e216dda5 admin add group 2016-12-16 15:02:21 +08:00
zhengxie
72ed078dc6 [i18n] Update fr locale 2016-12-16 14:00:08 +08:00