1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-06-30 00:42:53 +00:00
Commit Graph

29 Commits

Author SHA1 Message Date
lian
ee8e4135ea Revert "[select2] upgraded it to v4.0"
This reverts commit 62c3519e85.
2018-08-03 16:08:29 +08:00
llj
151857e92d [ajax] fixup for error msg (#2183) 2018-07-31 18:15:44 +08:00
llj
62c3519e85 [select2] upgraded it to v4.0 2018-07-26 18:28:17 +08:00
llj
c0c449db48 [group] removed arrows in 'group setting' & 'group members' popups 2018-05-09 11:24:08 +08:00
zhengxie
8d10466ce9 Merge branch '6.2'
Conflicts:
	media/css/seahub.css
	seahub/notifications/management/commands/send_notices.py
	seahub/notifications/models.py
	seahub/templates/js/templates.html
	seahub/views/__init__.py
	seahub/views/file.py
	tests/seahub/notifications/management/commands/test_send_notices.py
	tests/seahub/notifications/test_models.py
2018-04-27 11:00:43 +08:00
llj
b383846e87 [group discussion] fixup for 'enable' option 2018-04-18 16:39:20 +08:00
llj
88478dee1d [upgrade jquery] modifications, & cleaned up code & files 2018-02-05 16:47:56 +08:00
llj
07dea7eca4 new design 2017-12-05 17:53:45 +08:00
llj
fbbfebe09a [group] fix 2017-11-13 14:28:21 +08:00
zhengxie
d82df5fb52 Merge branch '6.0'
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
2017-02-17 17:11:33 +08:00
lian
718bdbb59b update admin manage group page 2017-02-09 14:59:49 +08:00
llj
f4eacae253 [mobile] dir view, group: modification 2017-01-04 17:19:57 +08:00
Daniel Pan
ee99d7aad8 Merge branch '5.1'
Conflicts:
	seahub/group/templates/group/group_base.html
	seahub/templates/home_base.html
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/js/templates.html
	seahub/templates/libraries.html
	seahub/templates/pub_base.html
	static/scripts/app/views/group-discussions.js
2016-05-21 13:42:04 +08:00
Daniel Pan
804695bbe2 Fix group transfer 2016-05-06 14:48:48 +08:00
llj
f466979760 accessibility improvement; bugfix & clean up 2016-05-04 11:51:56 +08:00
Daniel Pan
5749c0784f Fix popover 2016-04-28 20:30:00 +08:00
Daniel Pan
fb439f1aef Merge pull request #1148 from haiwen/popover
Improve popovers
2016-04-23 13:34:52 +08:00
Daniel Pan
3909d14983 Improve group popovers 2016-04-23 13:25:41 +08:00
Daniel Pan
1322ce99e9 Fix group rename 2016-04-23 11:59:39 +08:00
Daniel Pan
131b9e4f55 fixes 2016-04-05 17:51:44 +08:00
Daniel Pan
900b06e349 Rewrite group disccussions/member/settings with popover view 2016-04-01 15:22:28 +08:00
Daniel Pan
45a7ba13e7 Restructure views
Conflicts:
	seahub/templates/libraries.html
	static/scripts/app/router.js
	static/scripts/app/views/group.js
	static/scripts/app/views/organization.js
2016-04-01 10:39:11 +08:00
llj
63f30b3657 [group discussion] bugfix & improvement 2016-03-25 14:55:09 +08:00
llj
6fce263e42 [details] modified 'grid view', 'share popup', 'repo folder perm', 'select2' & etc. 2016-03-10 13:56:00 +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
llj
0c86fb539c [group settings] complete 'import members' 2016-01-09 16:50:46 +08:00
llj
ec6679e448 add 'updateGroups' for side-nav, and other improvement 2016-01-09 14:35:16 +08:00
llj
e9150cf555 add 'group settings' 2016-01-06 16:46:25 +08:00