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

326 Commits

Author SHA1 Message Date
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
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
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
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