1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-28 03:31:23 +00:00
Commit Graph

438 Commits

Author SHA1 Message Date
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
llj
c8f5d4ed5d [dir view] '.repo-op' UI: bugfix 2017-02-17 13:26:43 +08:00
xiez
6fd822f45f Merge pull request #1457 from haiwen/admin-group
udpate admin groups page
2017-02-09 18:11:09 +08:00
llj
f85d9e8e67 [dir view] bugfix for img view with magnificPopup 2017-02-09 16:00:36 +08:00
lian
718bdbb59b update admin manage group page 2017-02-09 14:59:49 +08:00
lian
7c1c1e2977 update rm ajax 2017-02-07 16:03:46 +08:00
lian
7a8eb038e2 update get file uploaded bytes 2017-01-19 14:40:49 +08:00
lian
06bc49d17b rm ajax get file op url 2017-01-19 14:40:49 +08:00
lian
6d577d83e3 rm repo change password 2017-01-19 14:40:49 +08:00
lian
a862fad836 rm set repo user/group perm 2017-01-19 14:40:49 +08:00
lian
18c60fd306 update cp/mv file/dir 2017-01-19 14:40:49 +08:00
lian
734263b76e update cancel_cp 2017-01-19 14:40:49 +08:00
lian
4a120b5aa5 update cp_progress 2017-01-19 14:40:49 +08:00
lian
d05f72b7a0 update user personal wiki module 2017-01-19 14:40:49 +08:00
lian
86f948aaa8 update set_notice_seen_by_id 2017-01-19 14:40:49 +08:00
lian
5a700d5f00 update set_notices_seen 2017-01-19 14:40:49 +08:00
lian
8d62d3786e update get unseen notifications count 2017-01-19 14:40:49 +08:00
Daniel Pan
86e9eb5fbc Merge pull request #1435 from haiwen/mobile
Mobile
2017-01-16 14:31:14 +08:00
llj
01fb83c9b2 [mobile] added 'updateDirOpBarUI' 2017-01-12 11:39:21 +08:00
llj
5f4935f6ce fix 2017-01-09 14:17:22 +08:00
llj
38226256cd Merge pull request #1444 from haiwen/download-dir
update zip download dir
2017-01-07 17:58:38 +08:00
llj
fd4df3792c [dir view] modification 2017-01-07 17:55:16 +08:00
llj
6c65d06b3e [dir view] mv/cp multi: fix 2017-01-07 15:06:49 +08:00
lian
77fa8c0c7a update zip download dir 2017-01-07 14:18:57 +08:00
llj
7c4d32ac24 [dir view] fixed 'window scroll' related bugs 2017-01-04 17:32:42 +08:00
llj
90a5552a9d [my libs, dir view] improvement: enlarge clickable area, and etc. 2017-01-04 17:19:57 +08:00
llj
cffc0743d2 [mobile] favourites: redesigned it. 2017-01-04 17:19:57 +08:00
llj
f4eacae253 [mobile] dir view, group: modification 2017-01-04 17:19:57 +08:00
llj
2d7f5339c3 [mobile] dir view: redesigned it 2017-01-04 17:19:57 +08:00
llj
943804c00e [mobile] my libs: modified details 2017-01-04 17:19:57 +08:00
llj
591ab5e517 [mobile] redesigned big modal popups 2017-01-04 17:19:57 +08:00
llj
a0ff7afaf8 [mobile] redesigned 'libs list' UI for shared/org/groups/group 2017-01-04 17:19:57 +08:00
llj
7a9a89a7d1 [mobile] my libs: redesigned it 2017-01-04 17:19:57 +08:00
llj
b2a8efe654 [mobile] modified side-nav for touch devices 2017-01-04 17:19:57 +08:00
Daniel Pan
493e0093d6 Merge pull request #1438 from haiwen/drag-drop
[dir view] drag & drop: highlight the dir item
2017-01-04 14:01:30 +08:00
Daniel Pan
1273ffa83d Merge pull request #1423 from haiwen/new
[dir view] redesigned 'new folder/file'
2017-01-04 13:53:04 +08:00
llj
4d4762b1af [dir view] drag & drop: modified highlight effect 2017-01-04 13:51:38 +08:00
llj
0075764bae [dir view] drag & drop: highlight the dir item 2017-01-03 18:39:14 +08:00
zhengxie
d4e00402af Merge branch '6.0'
Conflicts:
	media/css/seahub.css
2016-12-26 14:22:35 +08:00
llj
13fac0efa0 [dir view] redesigned 'new folder/file' 2016-12-15 12:12:30 +08:00
Daniel Pan
92e9d6cb9a Merge pull request #1402 from haiwen/show-logout
Show logout
2016-12-06 10:20:32 +08:00
llj
81bbaace7a [repo-folder-perm-admin] fix 2016-12-03 14:12:04 +08:00
llj
3534b5836e [fileupload] fix for Firefox 50 2016-11-25 16:59:21 +08:00
llj
a076a934f9 [dir view] added 'move dirents by drag & drop' 2016-11-18 12:21:11 +08:00
llj
dbd104e7d0 show log-out message 2016-11-18 11:56:11 +08:00
Daniel Pan
8b54e37d1f Merge pull request #1400 from haiwen/share
[share.js] show error msg
2016-11-18 11:36:24 +08:00
Daniel Pan
625573a669 Merge pull request #1361 from haiwen/fileupload
Fileupload
2016-11-18 11:29:52 +08:00
Daniel Pan
2c6070085a Merge pull request #1337 from haiwen/jstree-update
[jstree] updated jstree to the latest v3.3.2, rewrote/modified relate…
2016-11-18 11:27:11 +08:00
llj
9ba72b4b47 [UI] top-bar: bugfix & improvement 2016-11-17 17:51:27 +08:00
llj
2d26c57a66 [share.js] show error msg 2016-11-17 11:53:43 +08:00