1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-21 10:51:17 +00:00
Commit Graph

1082 Commits

Author SHA1 Message Date
Daniel Pan
978eb3973e Add grid view for dirView 2016-02-28 19:35:31 +08:00
Daniel Pan
229681560a Merge pull request #969 from haiwen/library-settings
Add repo operations
2016-02-23 21:59:08 +08:00
llj
3d27c05520 [lib setting] folder perm: modified ui 2016-02-20 14:20:50 +08:00
llj
9b4e4d0460 [lib setting] add 'folder perm' 2016-02-19 17:38:32 +08:00
llj
eaba92f544 [lib setting] added 'shared links' 2016-02-19 17:38:32 +08:00
llj
f6ed190d5b [lib settings] modification 2016-02-19 17:38:32 +08:00
Daniel Pan
adf9837337 Add setting library history 2016-02-19 17:38:32 +08:00
Daniel Pan
8d12ea22c7 Add repo operations 2016-02-19 17:38:31 +08:00
llj
4dd0015cba [group setting, group wiki] bugfix, modification 2016-02-19 17:01:31 +08:00
Daniel Pan
6a88d50b02 Turn on/off group Wiki 2016-01-30 16:23:52 +08:00
Daniel Pan
4e98fd2365 Update icon for group settings 2016-01-16 14:40:22 +08:00
lian
0e43a099ff [api] update search user api 2016-01-14 13:10:24 +08:00
llj
5f3c030a52 ['search user'] select2: enable 'directly enter email'
* the separator is 'Enter', i.e., clicking the Enter key
2016-01-14 11:42:28 +08:00
zhengxie
cf3d96b46a Merge branch '5.0'
Conflicts:
	media/css/sf_font2/seafile-font2.eot
	media/css/sf_font2/seafile-font2.ttf
	media/css/sf_font2/seafile-font2.woff
	requirements.txt
	seahub/api2/endpoints/dir_shared_items.py
	seahub/templates/js/templates.html
	seahub/views/ajax.py
	static/scripts/app/views/group-repo.js
2016-01-13 10:19:56 +08:00
llj
bf26f9c2a3 Merge pull request #983 from haiwen/repo-trash
batch load repo/dir trash
2016-01-12 17:44:50 +08:00
llj
198c563387 fix for 'trash view' & 'repo history view', modified 'view shared dir'
Conflicts:
	seahub/templates/repo_dir_recycle_view.html
2016-01-12 16:43:23 +08:00
lian
e75b1891e2 batch load repo/dir trash 2016-01-12 10:19:34 +08:00
llj
4624a3a1a1 [seafile-font2] update icon files 2016-01-11 15:20:10 +08:00
llj
e9150cf555 add 'group settings' 2016-01-06 16:46:25 +08:00
llj
03d27d516d [seafile-font2] update 'share' icon for windows, and updated 'delete' & 'download' 2015-12-23 14:45:23 +08:00
llj
d749a227e7 [groups] redesigned the UI 2015-12-17 14:58:50 +08:00
llj
03d075a00b [group members] redesigned it 2015-12-11 20:58:29 +08:00
llj
8469c3331a [group] modified icons 2015-12-08 16:00:34 +08:00
llj
2b9923c700 [groups] removed 'sideTips', use 'side nav' 2015-12-04 17:26:04 +08:00
llj
25c07a916e [side nav] modified 'group nav' 2015-12-04 16:33:51 +08:00
llj
fa42d59cc8 redesigned 'group top' 2015-12-04 16:33:51 +08:00
llj
4c0c8c10aa [side nav] modified 'group nav' 2015-12-04 16:33:51 +08:00
llj
e5c5c2b9e7 redesigned side nav; removed 'top group nav' 2015-12-04 16:33:51 +08:00
llj
93f98bce15 [nav] removed top nav; redesigned side nav for home_base 2015-12-04 16:27:26 +08:00
llj
a11cb6d32f [file access] modified UI 2015-12-03 11:56:43 +08:00
zhengxie
9d53430e4c Merge branch '4.4' into 5.0
Conflicts:
	media/css/seahub.css
	seahub/group/templates/group/group_manage.html
	seahub/utils/__init__.py
	seahub/views/repo.py
	tests/seahub/views/test_file.py
2015-12-02 17:37:50 +08:00
lian
577c27c9d2 [group] import members from csv file 2015-12-02 14:10:32 +08:00
llj
1c18e3e716 [groups] redesigned it. 2015-12-02 11:39:36 +08:00
lian
643d036942 new file access log page 2015-11-27 10:55:56 +08:00
llj
784e2f1a25 [sysadmin] rm icons in op btns; add datepicker files 2015-11-21 10:49:17 +08:00
llj
bb9f374e41 Merge pull request #894 from haiwen/markdown
Markdown
2015-11-11 15:50:08 +08:00
llj
a6f86b6ea9 [markdown edit] modification 2015-11-11 15:42:33 +08:00
llj
1055c9a557 [shared dir view] fix for lang popup 2015-11-10 17:33:09 +08:00
llj
b2313e1456 [markdown view/edit] use 'marked' for md/wiki view, use editormd for md edit 2015-11-10 10:26:55 +08:00
patrickgao
fc57ce8a84 add HD file icons for grid view 2015-11-05 13:26:25 +08:00
llj
40ddb4ea4b [view_shared_dir] added 'grid view' 2015-10-29 17:17:40 +08:00
llj
3fa2ab6a38 Merge pull request #859 from haiwen/license
[sys-admin] check seafile license expiration
2015-10-24 18:27:20 +08:00
llj
96cbd7debc [sys-admin] license expiration: modification 2015-10-24 18:14:58 +08:00
llj
ae9d0b296a [UI] modified 'share popup' & 'dir perm popup' 2015-10-22 16:17:41 +08:00
zhengxie
9af79be996 Refactor revert ops 2015-10-20 18:24:27 +08:00
zhengxie
8fd9bebf45 Merge branch '4.4'
Conflicts:
	seahub/auth/views.py
	seahub/templates/libraries.html
	seahub/templates/sysadmin/sys_admin_group_info.html
	seahub/templates/sysadmin/sys_publink_admin.html
	seahub/templates/sysadmin/userinfo.html
	seahub/urls.py
2015-10-20 10:27:27 +08:00
llj
0dc31715d4 use 'POST' instead of 'GET' for some requests, and modified 'share' in repo, file view 2015-10-19 15:04:37 +08:00
llj
edcd8358a6 [loading] use a new one 2015-10-14 11:12:50 +08:00
llj
ad2738b098 [loading] a new one 2015-10-13 14:53:11 +08:00
xiez
ba222a9665 Merge pull request #824 from haiwen/web-settings-2
Web settings 2
2015-10-10 10:39:56 +08:00