1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-31 22:57:47 +00:00
Commit Graph

569 Commits

Author SHA1 Message Date
lian
92df1ef8d2 admin manage repo share 2016-08-10 10:21:19 +08:00
llj
1bd1aaef91 modified compare of strings which have digits in them 2016-08-09 17:16:06 +08:00
llj
a62dc674d3 [dir view] fixed 'loading more' 2016-08-05 14:21:28 +08:00
lian
c7acdce7de update admin transfer group 2016-08-04 18:01:44 +08:00
llj
271eacabd0 [zip download] modified progress 2016-08-02 11:35:05 +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
d9ac225f87 [system admin] groups: bugfix & improvement 2016-07-21 15:13:48 +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
lian
744efb2322 new admin groups page 2016-07-20 17:23:07 +08:00
lian
782fbb38ed add ENABLE_GUEST_INVITATION setting 2016-07-20 15:45:38 +08:00
llj
e5b0d1ee31 [invitations] bugfix & improvment 2016-07-20 15:45:05 +08:00
lian
6688dc760b new invitation page 2016-07-20 15:40:58 +08:00
llj
2f5cf202d9 [misc] fix 2016-07-20 14:20:19 +08:00
lian
b5d9ece164 rm synced repos at devices page (#1285) 2016-07-14 13:54:17 +08:00
llj
c39b0b5ff3 rm unused files 2016-07-11 17:03:58 +08:00
llj
8bd80118b2 [contact_email] modified 'share popup' & 'user profile' 2016-07-05 16:02:33 +08:00
llj
f9500c4f61 [download zip] improvement, bugfix 2016-07-04 15:40:11 +08:00
lian
6dca56e9d5 update download dir/multi 2016-07-04 15:31:55 +08:00
lian
c4fa072dc7 new share admin page (#1233) 2016-06-30 15:06:43 +08:00
Daniel Pan
e7aaae4363 Merge pull request #1251 from haiwen/trash-pagination
[system admin] trash repos: list by page
2016-06-27 11:01:44 +08:00
llj
b2cda939aa UI fix (#1257) 2016-06-23 16:48:29 +08:00
Daniel Pan
cf1017513a Code clean (#1217)
* Use API to create file/folder instead of Ajax
* Remove sub_repo AJAX api
* Remove repo delete AJAX function
* Remove get_group_basic_info
* Add comment for get_unenc_group_repos
* Remove ajax_repo_change_basic_info and ajax_repo_transfer_owner
* Remove ajax_unset_inner_pub_repe and RepoPublic
* Remove ajax star/unstar a file
* update be shared repo api
* update test public repo
* Remove ajax_repo_remove_share
2016-06-20 18:34:30 +08:00
llj
18a800cb5d [system admin] trash repos: list by page 2016-06-20 15:47:26 +08:00
Daniel Pan
ca96fc1db9 Merge pull request #1243 from haiwen/admin-devices
[sysadmin] devices: fix & improvement
2016-06-16 10:51:29 +08:00
llj
8c0707c647 [sysadmin] devices: fix & improvement 2016-06-16 10:44:16 +08:00
llj
341d029b9f [dropdown widget] improved menu position 2016-06-15 17:20:21 +08:00
llj
1bee4c4afb [dir view] mv/del multi items: bugfix 2016-06-14 16:39:31 +08:00
llj
2758713cea [system repo admin] modification 2016-06-14 14:47:44 +08:00
llj
8c2e16ca36 [system repo admin] fix, improvement, supplement, clean 2016-06-14 14:47:44 +08:00
lian
a767aeb3d8 update 2016-06-14 14:47:02 +08:00
lian
72f4297934 new admin libraries page 2016-06-14 14:46:13 +08:00
Daniel Pan
37f6648a12 Merge pull request #1237 from haiwen/repo_del
[repo del] rewrote it with simplemodal
2016-06-14 11:14:30 +08:00
llj
2091d20e4b [repo del] rewrote it with simplemodal 2016-06-14 11:06:20 +08:00
Daniel Pan
b567379c2c Merge branch '5.1'
Conflicts:
	seahub/templates/registration/password_change_form.html
	seahub/templates/sysadmin/base.html
	seahub/templates/sysadmin/sysadmin_backbone.html
2016-06-13 18:25:20 +08:00
lian
bec227de26 update dir page
when visit a invalid repo dir page, error msg will show.
but then visit a valid repo, error msg still there and no dir page show.
2016-06-04 10:24:08 +08:00
Daniel Pan
6561269301 Fix sometimes dirents duplicated in Firefox 2016-06-01 17:22:10 +08:00
lian
0274f42ec0 update remote wipe 2016-05-27 16:01:07 +08:00
lian
400bcde5ce only show extra msg in pro edition when unlink a device 2016-05-27 14:19:53 +08:00
lian
2258067cd8 update device remote wipe 2016-05-27 13:59:12 +08:00
Shuai Lin
7dc7034de4 Added remote wipe option when unlinking a device. 2016-05-27 13:57:25 +08:00
Shuai Lin
7514c587d5 Added a helper function "showConfirmWithExtraOption". 2016-05-27 13:54:21 +08:00
Shuai Lin
bdd1fc2054 Added back confirmation before unlinking a device. 2016-05-27 13:54:20 +08:00
llj
f67865ea62 [file view] add 'discussion' 2016-05-24 17:53:29 +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
llj
b1909735a8 fix 2016-05-20 15:25:40 +08:00
llj
9f23d16b37 [side nav] fix 2016-05-20 10:56:39 +08:00
Daniel Pan
eff99890a2 Improve nav 2016-05-19 17:46:08 +08:00
llj
d15fb971f9 [side nav] improvement 2016-05-18 14:48:23 +08:00
lian
ca1a817dbd add account view to sysadmin app router 2016-05-17 14:09:24 +08:00
Daniel Pan
0c6e50818e Add about dialog 2016-05-13 20:11:20 +08:00
Daniel Pan
134cef775a Add nav footer 2016-05-13 20:11:20 +08:00
llj
c9c673d832 [dir view] improved details 2016-05-11 18:29:01 +08:00
llj
d5bc279ffc UI fix 2016-05-09 14:34:09 +08:00
lian
6665908bca rm console log 2016-05-06 15:27:55 +08:00
Daniel Pan
804695bbe2 Fix group transfer 2016-05-06 14:48:48 +08:00
Daniel Pan
376422c935 Rewrite group discussion as side panel 2016-05-05 13:47:50 +08:00
Daniel Pan
34e5709c16 Improve side nav show/hide on window resize 2016-05-04 21:31:45 +08:00
llj
c3900f0e62 [accessibility] dialog: added 'dialogTitle', modified label/input, improved 'share.js', bugfix 2016-05-04 11:58:26 +08:00
llj
f466979760 accessibility improvement; bugfix & clean up 2016-05-04 11:51:56 +08:00
Daniel Pan
ef980da1ec Add accessiblity support to simplemodal 2016-05-04 11:51:56 +08:00
Daniel Pan
374edec89b Use breadcrumb, update path-bar style and fix close button in popover 2016-05-02 21:59:20 +08:00
lian
65dc2ff54b add admin clean device errors api 2016-04-29 15:32:57 +08:00
Daniel Pan
092950f802 Fix system admin 2016-04-29 13:22:12 +08:00
Daniel Pan
76f479d3c9 Add side nav toggle function for small screen 2016-04-28 20:30:01 +08:00
Daniel Pan
5749c0784f Fix popover 2016-04-28 20:30:00 +08:00
Daniel Pan
08200845d1 fix dropdown for dir entry 2016-04-28 20:30:00 +08:00
Daniel Pan
ffabf2353c fix conflict of dropdown 2016-04-28 20:29:58 +08:00
lian
419645fdc2 add download multi dirents api 2016-04-28 15:16:58 +08:00
lian
29293fab3a fix bug when show device error at admin page 2016-04-27 11:21:01 +08:00
Daniel Pan
3308a450ad Merge pull request #1149 from haiwen/remember-group-expanded
Remember group expended status
2016-04-25 12:14:09 +08:00
llj
d73561b639 [side nav] 'group_expanded': modification 2016-04-25 11:51:59 +08:00
lian
bc2828969d new admin devices page; 2016-04-23 18:07:09 +08:00
lian
b3911c5081 [admin-api] update sysinfo.js & add admin info test 2016-04-23 17:14:01 +08:00
Daniel Pan
bcc4e42142 Implement Sysinfo 2016-04-23 17:14:01 +08:00
Daniel Pan
899f5241d4 Reimplement sysadmin with backbone 2016-04-23 17:13:32 +08:00
Daniel Pan
f06b03edf2 Remember group expended status 2016-04-23 13:56:46 +08:00
Daniel Pan
fb439f1aef Merge pull request #1148 from haiwen/popover
Improve popovers
2016-04-23 13:34:52 +08:00
llj
59d4689e73 [notice, account] modification 2016-04-23 13:27:56 +08:00
Daniel Pan
2fd36afd01 Rewrite account info popup and clean css 2016-04-23 13:27:17 +08:00
Daniel Pan
6b0f05bd34 Rewrite notifications with popover class 2016-04-23 13:27:17 +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
llj
88a73c4323 Merge pull request #1139 from haiwen/fileupload2
Fileupload
2016-04-21 16:07:05 +08:00
llj
6e98536793 [fileupload] fix 2016-04-21 15:43:13 +08:00
Daniel Pan
bc0fe0e93b Improve file upload menu 2016-04-20 18:00:38 +08:00
Daniel Pan
bc96ab7448 Merge pull request #1129 from haiwen/keyboard-dropdown
Add keyboard up/down handler for dropdown
2016-04-20 09:53:23 +08:00
Daniel Pan
8bb44749eb Make table sort operations focusable (#1128) 2016-04-19 14:41:17 +08:00
llj
0a725c7e8f [fileupload] move 'setFileInput' into dir.js 2016-04-18 15:02:22 +08:00
llj
32375abcb6 [fileupload] use dropdown 2016-04-18 11:57:55 +08:00
Daniel Pan
3591ba3292 Add keyboard up/down handler for dropdown 2016-04-17 14:38:13 +08:00
Daniel Pan
18d1e894a1 Merge pull request #1126 from haiwen/accessbility
Accessibility improvement
2016-04-15 14:32:34 +08:00
Daniel Pan
bb8786c5da Use dropdown and HLItemView for dirent (#1120)
* Use dropdown and HLItemView for dirent

* [dir view] add some function back for 'rename'

* Remove dirent highlight after close rename form
2016-04-14 17:17:01 +08:00
Daniel Pan
4c670b13c1 Add aria label to repo operations 2016-04-14 15:01:13 +08:00
Daniel Pan
69d3215660 Add focus handling for HLItemView 2016-04-14 11:43:11 +08:00
Daniel Pan
9cea2733ca Add ESC handle for popover and dropdown (#1119)
* Add ESC handle for popover and dropdown
2016-04-13 20:16:29 +08:00
Daniel Pan
0320d2e4b2 Improve Accessibility (#1113)
* Add role
* Add aria-hidden to decoration icons
* Add sr-only css and add column header
2016-04-13 20:10:30 +08:00
llj
d4f5bc4817 [icons] modification 2016-04-12 15:53:51 +08:00
llj
3f23a1685e [icons] modification 2016-04-12 11:22:04 +08:00
llj
9b97c8bf59 [group] fixed wiki url 2016-04-11 18:08:56 +08:00
llj
77aac3d811 redesigned all checkbox; bugfix & improvement; removed unused code & file 2016-04-07 11:06:48 +08:00
Daniel Pan
131b9e4f55 fixes 2016-04-05 17:51:44 +08:00
Daniel Pan
eadb9d374e Remove .click() in myhome-repos.js 2016-04-01 16:10:03 +08:00
Daniel Pan
36b141a83c Fixes 2016-04-01 15:57:42 +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
Daniel Pan
dd906d7f68 Improve dropdown 2016-03-31 21:39:12 +08:00
Daniel Pan
b9ba54f635 use dropdown for publib create button 2016-03-31 21:11:19 +08:00
Daniel Pan
d5e9e7a7b0 Merge pull request #1080 from haiwen/HLItemView
HL item view
2016-03-31 13:37:46 +08:00
Daniel Pan
0c1e37cc02 Fixes 2016-03-31 13:19:13 +08:00
Daniel Pan
d66dc30179 remove _hideDropdown() in dropdown view 2016-03-30 17:10:25 +08:00
Daniel Pan
3665084ec9 Merge pull request #1053 from haiwen/discussion
Add group discussion
2016-03-29 17:46:49 +08:00
llj
5d3d135f5d [group discuss] improved 'load more' & bugfix 2016-03-29 15:46:53 +08:00
llj
8763a32af8 [group discuss] bugfix 2016-03-28 18:12:25 +08:00
lian
fe6dbcbb63 use new v2.1 file api when rename/lock/unlock/del file 2016-03-28 17:53:58 +08:00
llj
025af00900 [group discussion] added 'load more' 2016-03-25 17:54:53 +08:00
llj
63f30b3657 [group discussion] bugfix & improvement 2016-03-25 14:55:09 +08:00
Daniel Pan
dc373c956d Improve group discussion 2016-03-25 14:55:09 +08:00
Daniel Pan
13ee24aa8f Add reply action 2016-03-25 14:55:09 +08:00
Daniel Pan
26d25c6448 Add group discussion delete 2016-03-25 14:55:09 +08:00
Daniel Pan
077a2627f0 Update group discussion 2016-03-25 14:55:09 +08:00
Daniel Pan
4aa500203d Add group discussion 2016-03-25 14:37:58 +08:00
Daniel Pan
f5498dd835 Remove log 2016-03-23 10:47:35 +08:00
Daniel Pan
0f335a8aa3 Rewrite repo.js with DropdownView 2016-03-22 18:32:42 +08:00
Daniel Pan
cb02bca661 Clean code and fix bugs 2016-03-22 16:09:40 +08:00
llj
e2f2067a2a [dir view] modified op btns for selected item(s) 2016-03-22 15:03:50 +08:00
Daniel Pan
2e5ced905f Rewrite repo with HLItemView 2016-03-22 11:47:52 +08:00
llj
c2b1b0bf8d [dir view] hide some buttons(ops on current dir) when item(s) selected 2016-03-22 11:46:42 +08:00
Daniel Pan
6254417be8 Add hl-item-view and dropdown 2016-03-21 21:29:14 +08:00
llj
05f3d353bf [lib decrypt] bugfix, improvement 2016-03-21 17:16:57 +08:00
lian
69cbd56064 add new api & update code
1. add new repo set password api
2. update repo url related code
2016-03-21 15:38:22 +08:00
Daniel Pan
6483dc2a39 Fix problem in devices code 2016-03-21 13:36:51 +08:00
lian
cca0f52a9d fix repo create error 2016-03-19 10:36:18 +08:00
Daniel Pan
0654cdab0a Merge pull request #1064 from haiwen/remember-sort
update sort dirents
2016-03-17 13:24:58 +08:00
lian
317477fc28 update sort dirents
remember sort mode when view different folder
2016-03-17 11:26:49 +08:00
Daniel Pan
2ac6a8859c Improve Moment related code 2016-03-17 11:15:28 +08:00
Daniel Pan
99e8c1c99d Merge pull request #1062 from haiwen/devices
new devices page
2016-03-17 10:24:55 +08:00
lian
50711071a6 improve devices page 2016-03-16 15:47:33 +08:00
Daniel Pan
49ac5b9ec2 Merge pull request #1061 from haiwen/render-dirents
update render dirents
2016-03-15 18:19:12 +08:00
lian
a43b3f969e new devices page 2016-03-15 18:19:12 +08:00
lian
e4a468eb8f update render dirents 2016-03-15 12:04:31 +08:00
llj
585b48e3c4 Merge pull request #1056 from haiwen/code-clean
clean code and icons
2016-03-14 19:57:08 +08:00
llj
b51dab76eb [code clean] clean & fix 2016-03-14 19:51:09 +08:00
llj
6cc1aa7d94 Merge pull request #1059 from haiwen/lib-icon
Improve library icon
2016-03-14 12:18:14 +08:00
llj
6f0fcd6cb1 [lib list] modification about 'icon_title' 2016-03-14 12:15:28 +08:00
llj
37ed9678c3 [details] improved UI details, cleaned up CSS 2016-03-11 14:42:03 +08:00
Daniel Pan
0931bd0103 Improve library icon 2016-03-11 13:41:51 +08:00
llj
d6dffbab73 [lib setting] 'folder perm', 'share link': add 'min-height' 2016-03-10 18:02:32 +08:00
llj
91c3f75251 [lib setting] folder perm: open the jstree 2016-03-10 15:11:21 +08:00
llj
6fce263e42 [details] modified 'grid view', 'share popup', 'repo folder perm', 'select2' & etc. 2016-03-10 13:56:00 +08:00
Daniel Pan
1f7af8b68a clean sub-library related code 2016-03-09 21:28:05 +08:00
Daniel Pan
f0e40d9120 Clean public library related code 2016-03-09 20:54:33 +08:00
Daniel Pan
b75e8e8d9c clean code and icons 2016-03-09 15:12:53 +08:00
zhengxie
72d30b2495 Merge branch '5.0'
Conflicts:
	seahub/api2/endpoints/dir_shared_items.py
	seahub/api2/urls.py
	seahub/templates/repo.html
	seahub/utils/http.py
	seahub/views/__init__.py
	seahub/views/ajax.py
	seahub/views/repo.py
	tests/seahub/views/test_libraries.py
2016-03-07 16:04:36 +08:00
llj
dafa52668f Merge pull request #1046 from haiwen/fileicon
Show 24px file icon for low DPI screen
2016-03-07 11:52:46 +08:00
Daniel Pan
cdf4454137 Merge pull request #1048 from haiwen/grid-view
Grid view
2016-03-05 20:58:03 +08:00
llj
cefd38b98d [dir view] grid view: bugfix & improvement 2016-03-05 16:41:26 +08:00
llj
eaf51187c0 [dir view] grid view: show 'name' tip, added magnificPopup preview for images, & etc. 2016-03-05 11:19:19 +08:00
Daniel Pan
24e2870831 Show 24px file icon for low DPI screen 2016-03-04 18:29:12 +08:00
Daniel Pan
f04e152e41 Merge pull request #1034 from haiwen/grid-view
Grid view
2016-03-03 19:09:35 +08:00
llj
abec40b07c [dir view] clean up views/dirent.js, views/dirent-grid.js 2016-03-03 17:47:36 +08:00
llj
9a89536ae5 [dir view] enable 'thumbnail' for grid view 2016-03-03 16:37:18 +08:00
llj
80d51d4464 [dir view] bugfix for 'decrypt lib', position of grid item's op menu, and etc. 2016-03-03 11:12:44 +08:00
Daniel Pan
7449608a0f Merge pull request #1040 from haiwen/library-settings
[lib setting] folder perm: add 'add folder', bugfix & etc.
2016-03-02 18:33:36 +08:00
Daniel Pan
707346ce7d Add permission setting dialog 2016-03-01 21:24:48 +08:00
Daniel Pan
1fa7c8fd5e Add lock/unlock function and fix a bug in DirentGridView menu event binding 2016-03-01 17:32:30 +08:00
llj
b90c3d5bf7 [lib setting] folder perm: add 'add folder', bugfix & etc. 2016-02-29 17:01:12 +08:00
Daniel Pan
463b48c788 Make open-via-client in community edition and clean code for file/dir icons 2016-02-29 15:29:29 +08:00
Daniel Pan
003838b8f1 Fix CSS problems 2016-02-28 22:17:08 +08:00
Daniel Pan
3de67a1f15 Add rename 2016-02-28 19:35:33 +08:00
Daniel Pan
43a5861ea4 Add mv/cp to grid view 2016-02-28 19:35:33 +08:00
Daniel Pan
3a4ad38ea5 Add share dialog 2016-02-28 19:35:33 +08:00
Daniel Pan
e5766ec06e Update dirent del function 2016-02-28 19:35:32 +08:00
Daniel Pan
f49547bbfe Clean dirent-grid.js 2016-02-28 19:35:32 +08:00
Daniel Pan
23e3d2d088 Add right click context menu 2016-02-28 19:35:32 +08:00
Daniel Pan
3caeee4c54 Add create file/folder in grid view 2016-02-28 19:35:32 +08:00
Daniel Pan
5873f1af95 Remember view mode in cookie 2016-02-28 19:35:32 +08:00
Daniel Pan
978eb3973e Add grid view for dirView 2016-02-28 19:35:31 +08:00
llj
51f47662d6 [share] show error msg for every failed item 2016-02-24 16:11:45 +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
442753f96a [lib setting] added 'change password' for enc libs; removed original setting pages 2016-02-23 19:54:33 +08:00
llj
7413e36f0e [lib setting] folder perm: clean up 2016-02-23 12:46:00 +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
a541bd5ed1 [lib setting] remove 'permissions' 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
54a29bc743 Add library transfer 2016-02-19 17:38:32 +08:00
Daniel Pan
b0ccc76bee Finish rename repo 2016-02-19 17:38:32 +08:00
Daniel Pan
92044f6a34 Add share link admin dialog and permission settings dialog 2016-02-19 17:38:31 +08:00
Daniel Pan
8d12ea22c7 Add repo operations 2016-02-19 17:38:31 +08:00
Daniel Pan
4179a13c4c Merge pull request #1014 from haiwen/turn-group-wiki
Turn on/off group Wiki
2016-02-19 17:29:41 +08:00
llj
4dd0015cba [group setting, group wiki] bugfix, modification 2016-02-19 17:01: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
Daniel Pan
6a88d50b02 Turn on/off group Wiki 2016-01-30 16:23:52 +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