1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-06 03:36:46 +00:00
Commit Graph

226 Commits

Author SHA1 Message Date
Daniel Pan
8d12ea22c7 Add repo operations 2016-02-19 17:38:31 +08:00
zhengxie
cc5af51dec Merge branch '5.0'
Conflicts:
	seahub/templates/base_for_backbone.html
	seahub/templates/libraries.html
	seahub/templates/myhome_base.html
2016-02-02 12:19:46 +08:00
llj
243e28abbf [fileupload] show error msg instead of 'errorThrown' 2016-01-27 16:41:05 +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
Daniel Pan
35bec4b59f Merge pull request #995 from haiwen/group_fix
show group name in path for 'group dir view'; fix updateGroups in sid…
2016-01-13 16:24:22 +08:00
llj
53fddee277 [group dir view] modification 2016-01-13 16:04:04 +08:00
llj
13ea3fcb6a show group name in path for 'group dir view'; fix updateGroups in side-nav.js 2016-01-13 14:54:46 +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
Daniel Pan
6592cfa747 Clean getUrl() in common.js 2016-01-11 16:12:30 +08:00
llj
0c86fb539c [group settings] complete 'import members' 2016-01-09 16:50:46 +08:00
lian
a7458622b7 check if audit enabled 2016-01-09 16:40:39 +08:00
llj
ec6679e448 add 'updateGroups' for side-nav, and other improvement 2016-01-09 14:35:16 +08:00
llj
bda85406ca [group settings] manage members: added 'add multi members once' and other improvement 2016-01-08 12:18:33 +08:00
llj
e9150cf555 add 'group settings' 2016-01-06 16:46:25 +08:00
llj
800856e305 [backbone] remove unused code and files 2015-12-19 13:51:38 +08:00
llj
13486afe57 [add group] fix: modified param name according to the api 2015-12-19 10:29:05 +08:00
llj
f7e8dcef72 [dir view] enable multi dirents in read-only, non-encrypted libs to be copied into other libs 2015-12-18 11:30:24 +08:00
llj
1d78ec4c4e [dir view] enable read-only dirents in non-encrypted libs to be copied into other libs 2015-12-17 19:02:10 +08:00
llj
d749a227e7 [groups] redesigned the UI 2015-12-17 14:58:50 +08:00
llj
de63d7284c [group members] removed some spaces 2015-12-15 11:33:07 +08:00
llj
1f15e38752 [group members] use double size for member avatars 2015-12-15 10:59:44 +08:00
llj
03d075a00b [group members] redesigned it 2015-12-11 20:58:29 +08:00
llj
4c3e5ab067 [group] dir view: bugfix for side nav 2015-12-09 15:13:33 +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
385b32154d [hd] modified mine/shared/org ...pages 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
bd72a97c85 [groups] show error msg for 'add new group' 2015-12-03 17:35:13 +08:00
llj
51b44c40a3 [groups] use new collection url 2015-12-02 11:39:36 +08:00
llj
1c18e3e716 [groups] redesigned it. 2015-12-02 11:39:36 +08:00
zhengxie
e2b7e88094 Merge branch '4.4' 2015-11-05 16:33:13 +08:00
llj
5d2600c8c0 [backbone] added 'Search files in this library' 2015-11-03 11:06:24 +08:00
llj
d070a4d7d3 [add-repo] bugfix 2015-11-02 17:11:11 +08:00
llj
216bea2b4b [share.js] modified 'delete link' 2015-10-30 16:27:16 +08:00
llj
0e6de3b4e9 [share.js] modified 'delete link' 2015-10-21 15:34:09 +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
b1577770b1 use 'POST' to delete libraries 2015-10-10 14:31:20 +08:00
lian
1de4cb2608 change ENABLE_ENCRYPT_LIBRARY to ENABLE_ENCRYPTED_LIBRARY 2015-10-09 15:40:54 +08:00
llj
8f8170fc3f [add repo] bugfix & improvement 2015-10-08 20:42:08 +08:00
llj
8dff8a8b2d modified js for IE 2015-10-08 18:43:39 +08:00
llj
1dfcfc58c1 [simplemodal] updated simplemodal.js to fix IE problems 2015-10-08 17:26:33 +08:00
lian
668fdb7215 add ENBALE_ENCRYPT_LIBRARY setting 2015-09-24 17:20:45 +08:00
llj
805b73ea3b [rename] bugfix for 'cancelRename', improved 'click doc to hide form' 2015-09-18 10:18:37 +08:00
llj
3ba435b1d6 Improved 'hide .hidden-op' 2015-09-18 10:18:36 +08:00
llj
d76b0d7065 [rename] click outside the form to hide the form 2015-09-18 10:18:36 +08:00
llj
f986bfa5cd [rename] redesigned it 2015-09-18 10:18:36 +08:00