haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-14 23:46:49 +00:00
Code Issues Releases Wiki Activity
13,486 Commits 135 Branches 453 Tags 2.3 GiB
c06d51a596
Commit Graph

733 Commits

Author SHA1 Message Date
llj
fb6430b027 [fileupload] modified 'maxNumberOfFiles' 2016-09-14 17:35:42 +08:00
lian
94e91265cc add library pattern feature 2016-09-14 13:47:12 +08:00
llj
585d0163d0 [sort] fix, rewrote 2016-09-08 16:26:23 +08:00
lian
a11925b033 remember sort mode after sort repos/dirents 2016-09-07 10:03:21 +08:00
llj
f5042956ce [share/perm popup] fix 2016-08-22 15:19:44 +08:00
lian
fd917c0007 update user permission 
1. update user generate share/upload link permission
2. update user connect iso/android/desktop clients permission
 2016-08-22 11:20:48 +08:00
Daniel Pan
2836931021 Merge pull request #1320 from haiwen/side-nav-fix 
[side nav] group list: fix
 2016-08-19 18:09:18 +08:00
lian
7ce3001d67 fix bug when create an encrypted share link 2016-08-16 17:28:49 +08:00
Daniel Pan
16e9f6296e Merge pull request #1325 from haiwen/rename-improvement 
[lib/dirent] improved 'rename'
 2016-08-16 13:34:19 +08:00
llj
1e0d94b694 [share] fix 2016-08-16 10:20:05 +08:00
lian
5c59b81466 add new admin share api 2016-08-16 10:19:56 +08:00
llj
ab380bf361 [lib/dirent] improved 'rename' 2016-08-12 19:10:49 +08:00
llj
70b04525b2 [side nav] group list: fix 2016-08-10 14:22:04 +08:00
llj
a3b15e6f62 [system admin] repo share: fix 2016-08-10 10:21:19 +08:00
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
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
llj
e0e31faedf [font icon] modification 2015-09-17 18:10:41 +08:00
lian
8aee7bc8de show err msg detail when share dir to user/group 2015-09-15 12:00:29 +08:00
llj
75b0b4f39f Merge pull request #808 from haiwen/thumbnail-fix 
bugfix for 'get image thumbnail'
 2015-09-14 14:41:11 +08:00
llj
5aac9f5889 bugfix for 'get image thumbnail' 2015-09-14 14:34:33 +08:00
zhengxie
5fca43ef89 Merge branch '4.3' 
Conflicts:
	seahub/api2/views.py
 2015-09-14 13:43:39 +08:00
lian
a737ed58b8 allow rename/move/delete operation when file is locked 2015-09-11 10:05:35 +08:00
llj
1c1e9870a9 [common.js] modified ajaxErrorHandler 2015-09-07 17:55:35 +08:00
lian
acc2f75235 update api err msg and common.ajaxErrorHandler 2015-09-01 17:42:54 +08:00
llj
24bf53c980 [permission UI] modified 'permission' column width for languages like German 2015-08-26 15:56:29 +08:00
llj
eda7a6ef1c [i18n] add translation for some text 2015-08-22 15:26:13 +08:00
llj
dfd5316966 [select2] added translation 2015-08-19 17:59:59 +08:00
llj
d877f2aceb [share] modified 'expired' UI for download link 2015-08-19 17:56:45 +08:00
lian
fdafab3d5a show "Expired" when file share expired 2015-08-18 15:18:02 +08:00
llj
32249b1f78 [common.js] added translation for select2 2015-08-18 11:01:58 +08:00
patrickgao
806965fa0f add SHARE_LINK_PASSWORD_MIN_LENGTH 2015-08-12 15:20:12 +08:00
llj
2f2e1b7524 [fileupload] enable resumable fileupload for 'dir view' & 'upload link' 
'resumable' is only enabled for 'upload files',
not for 'add folder' & 'file update'
 2015-08-07 15:03:59 +08:00
llj
ba4f3e7eff [activity] bugfix & improvement 2015-07-29 20:18:28 +08:00
lian
d889f3bafe update activity page 2015-07-28 19:55:05 +08:00
lian
dfc7f1856f new activity page 2015-07-28 19:55:05 +08:00
lian
68b40743c7 update file lock check when update file 2015-07-24 12:16:57 +08:00
xiez
024a1deceb Merge pull request #706 from haiwen/file-lock 
file lock
 2015-07-23 10:40:40 +08:00
llj
83c0374cd8 [starred files] bugfix 2015-07-22 21:01:10 +08:00
llj
ebf1d7f8d0 [myhome side nav] bugfix for 'cur tab' 2015-07-22 11:59:50 +08:00
lian
2d34cb611a check file lock before update a file 2015-07-20 17:36:12 +08:00
llj
65c540a29d [lib/dir/file share] rewrote 'random password' 2015-07-20 16:36:07 +08:00
llj
2aa15a7d19 [file lock] show name instead of email 2015-07-20 13:50:42 +08:00
llj
97ebba6f2b [file lock] 'dir view' & 'file view': improvement & bugfix 2015-07-20 13:50:42 +08:00
lian
2c2bf4f98f file lock 2015-07-20 13:50:42 +08:00
patrickgao
7f5a1f012d generate a random password 2015-07-20 11:15:07 +08:00
llj
d3097a6acf [fileupload] UI fix for 'file replace confirm popup' 2015-07-17 15:48:00 +08:00
lian
14c264f22a update & return encoded thumbnail src to web 2015-07-16 13:09:52 +08:00
zhengxie
00f64782ad Merge branch 'dir-share-popup' 
Conflicts:
	seahub/api2/views.py
	static/scripts/app/views/share.js
	static/scripts/common.js
	tests/api/test_shares.py
 2015-07-15 15:06:56 +08:00
llj
eaa93960f0 [dir shared items] modification 2015-07-15 14:55:23 +08:00
llj
7e325c815a Merge pull request #720 from haiwen/sort 
Sort
 2015-07-14 14:49:07 +08:00
llj
285f1a6e04 [dir view] bugfix for 'sort by time' 2015-07-14 14:22:12 +08:00
llj
b29974901c [sort] new interaction for 'myhome shared libs' 2015-07-14 11:46:20 +08:00
llj
69101f41f6 [dir shared items] modified 'perm edit', bugfix & add 'error handle' for 'list/add/delete', clean up code 2015-07-14 11:03:59 +08:00
llj
0a13dd88bb [dir private share] dir shared items: modified 'list/add', add 'delete' 2015-07-14 11:03:58 +08:00
llj
6ff2efb597 [dir private share] split into user/group share 2015-07-14 11:03:05 +08:00
llj
1a406f9b26 [lib/dir/file sort] bugfix for new interaction 2015-07-11 14:51:26 +08:00
patrickgao
f9282585b8 file sorting alternation 2015-07-09 17:16:10 +08:00
Daniel Pan
03b82ce655 Merge pull request #695 from haiwen/IE8 
Ie8
 2015-07-09 11:13:14 +08:00
Daniel Pan
f5a465eb79 Merge pull request #697 from haiwen/rm_filePrivateShare 
remove 'file private share'
 2015-07-09 11:12:10 +08:00
llj
516779defb remove 'file private share' & 'private shared files' 2015-07-07 17:35:23 +08:00
zhengxie
6a5290866a [dist] Update locales and dist 2015-07-07 14:08:43 +08:00
Daniel Pan
7dcac275b8 Merge pull request #682 from haiwen/open-via-client 
only show open-via-client in pro version
 2015-07-07 13:49:17 +08:00
lian
20c7358ef9 fix bug when unstar a file 2015-07-06 14:43:45 +08:00
zhengxie
4c414b735c Update dist 2015-07-06 13:30:53 +08:00
zhengxie
8725d74029 [dist] Update 2015-07-03 14:45:03 +08:00
llj
63a975bf3d [dir.js] modified for IE8 2015-07-02 17:38:36 +08:00
llj
205f5486bb [common.js] modified for IE8 2015-07-02 17:14:31 +08:00
lian
7a7b21ef39 only show open-via-client in pro version 2015-07-01 15:54:01 +08:00
lian
803dcf8e6d [guest-user] update url of "libraries" and "my home" tab 2015-06-25 12:05:47 +08:00
lian
d7cac0d24c [guest-user] add permission for guest user 
disable generate shared link when user's role is GUEST
 2015-06-24 15:08:37 +08:00
Ubuntu
3ba9bbaa4c [dist] Update 2015-06-18 03:57:48 +00:00
Daniel Pan
f6a3b05f75 Merge pull request #650 from haiwen/select 
global addressbook
 2015-06-18 09:57:09 +08:00
lian
be00d946d8 Do not show contacts tab 2015-06-17 18:20:32 +08:00
llj
945648de4c [select2] modification for long name/email 2015-06-17 14:26:31 +08:00
llj
8d8f2e3a39 [select2] modified 'placeholder' text 2015-06-16 19:15:56 +08:00
Daniel Pan
1e396ac7a2 Merge pull request #646 from haiwen/ie_tip 
Ie tip
 2015-06-16 14:11:49 +08:00
llj
dbbfd393bb [contact] bugfix, improvement 2015-06-13 18:43:45 +08:00
lian
6c74c14da4 [global-addressbook] 
show contacts tab when is-cloud-mode AND not enabel global addressbook
 2015-06-12 17:50:15 +08:00
lian
747b477a1f add cloud address book function 2015-06-12 16:16:49 +08:00
llj
8d2054dafd [js] bugfix for object 2015-06-10 13:43:41 +08:00
lian
ffb31e5cb0 [starred-file] fix bug when generate file view url 2015-06-09 11:54:18 +08:00
llj
ee816216ea add 'top tip' for IE 2015-06-05 17:49:09 +08:00
zhengxie
2e532be421 [dist] Update locales and static files 2015-05-28 18:29:40 +08:00
xiez
d2a075df68 Merge pull request #620 from haiwen/add_org_lib 
[org view] modified 'add library'
 2015-05-28 17:43:19 +08:00
llj
cb3d7cb6e7 [org view] modified 'add lib' UI 2015-05-28 16:08:30 +08:00
llj
cb4e0d7493 [org view] modified 'add library' 2015-05-28 13:57:00 +08:00
xiez
17301682de Merge pull request #617 from haiwen/lib_share_fix 
[share] bugfix for newly created library
 2015-05-27 18:04:06 +08:00
llj
0fb3d1037c [share] bugfix for newly created library 2015-05-27 17:58:21 +08:00
llj
46334b8118 [sub lib] bugfix for 'create' & 'dir op bar' 2015-05-27 17:09:29 +08:00
zhengxie
f16a44c1aa [dist] Update 2015-05-27 15:32:40 +08:00
llj
be238d44c4 [share] bugfix for 'download link' 2015-05-27 15:10:50 +08:00
llj
f354630506 [dir view] bugfix for 'new file/dir', fileupload, dirent js & template 2015-05-27 14:16:07 +08:00
Daniel Pan
fe94d09542 Merge pull request #608 from haiwen/lib_transfer_and_desc 
Lib transfer and desc
 2015-05-26 16:49:25 +08:00
zhengxie
51ade2d834 Update styles of share popup 2015-05-26 14:36:31 +08:00
zhengxie
8993da33d7 Add direct link for shared file, refactor share link download 2015-05-26 14:36:30 +08:00
llj
5a94089ce8 [lib setting] modified 'lib transfer success' 2015-05-26 12:04:29 +08:00
llj
6630cade24 [repo setting] bugfix for transfer 2015-05-22 15:01:38 +08:00
llj
02ab013dd6 [lib create] bugfix for 'group lib create' 2015-05-20 16:19:35 +08:00
lian
0528bfe85c [del-dirents] update perm check 2015-05-15 17:19:08 +08:00
lian
ecb4fa1796 [folder-perm] update perm check 
when operate a dir/file, use their own perm instead of repo perm
 2015-05-15 14:59:51 +08:00
lian
903b29aea4 add public repo 2015-05-14 11:28:12 +08:00
llj
f32227b3a8 [share] only enable 'private share' for encrypted lib 2015-05-13 17:40:39 +08:00
llj
4fd4bd27b1 [common.js] bugfix for 'showConfirm' 2015-05-13 11:06:57 +08:00
zhengxie
0c77e03c9a Fix for default library 2015-05-12 18:54:10 +08:00
xiez
2e72af2c0f Merge pull request #587 from haiwen/del_fix 
bugfix for 'dirent delete'
 2015-05-12 17:47:40 +08:00
llj
56e1375407 bugfix for 'dirent delete' 2015-05-12 17:36:13 +08:00
zhengxie
09d4778f6a [dist] Update version, assets 2015-05-12 17:05:50 +08:00
llj
2dc00204df enable 'show error' for 'fetch libs' 
Conflicts:
	static/scripts/app/views/group.js
	static/scripts/app/views/myhome-repos.js
	static/scripts/app/views/myhome-shared-repos.js
	static/scripts/app/views/organization.js
 2015-05-12 16:56:24 +08:00
lian
f725506262 upate render repo table thead 2015-05-11 18:39:21 +08:00