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

1280 Commits

Author SHA1 Message Date
llj
8bf23d9e88 [address book] added 'rename', 'set perm', 'details' for group owned library, and etc.
* added feedback for invalid quota input
    * modified empty tips for group
    * added 'New Department Library'
    * [group owned repo] added 'rename', 'set permission', 'details'
2018-05-18 12:12:01 +08:00
llj
8ae359afbe [address book] fixup & improvement 2018-05-18 12:12:01 +08:00
llj
4a761aac0f added 'invite people' link to 'share' & 'group manage members' popup 2018-05-08 16:12:04 +08:00
llj
d31be081b0 [user panel] group: modified color of address book group icon 2018-05-08 10:37:03 +08:00
llj
bed8636724 [address book] modification for UI 2018-05-07 19:55:41 +08:00
zhengxie
8d10466ce9 Merge branch '6.2'
Conflicts:
	media/css/seahub.css
	seahub/notifications/management/commands/send_notices.py
	seahub/notifications/models.py
	seahub/templates/js/templates.html
	seahub/views/__init__.py
	seahub/views/file.py
	tests/seahub/notifications/management/commands/test_send_notices.py
	tests/seahub/notifications/test_models.py
2018-04-27 11:00:43 +08:00
llj
0ed1dd4c58
Merge pull request #1973 from haiwen/address-book
Address book
2018-04-25 16:26:12 +08:00
llj
b383846e87 [group discussion] fixup for 'enable' option 2018-04-18 16:39:20 +08:00
Daniel Pan
d3e47f46f8
Merge pull request #2072 from haiwen/wiki
[wiki] modification
2018-04-18 10:06:12 +08:00
llj
9306c4762f [wiki] modification 2018-04-17 16:57:59 +08:00
xiez
326eac4a44
Merge pull request #2061 from haiwen/custom-css
custom css
2018-04-17 11:29:27 +08:00
llj
5627db0d23 [info bar] fix 2018-04-16 18:39:19 +08:00
llj
366d56dc89 [system admin] settings: fixup & improvement for 'custom CSS' 2018-04-16 16:13:01 +08:00
ilearnit
a3e9dd23b4 custom css 2018-04-10 12:39:23 +08:00
llj
52ec5f5488 [wiki] redesigned UI 2018-03-26 13:31:41 +08:00
llj
cd0c7a1170 [wiki] added 'wiki list' and 'wiki' pages
Conflicts:
	seahub/wiki/urls.py
	static/scripts/app/views/side-nav.js
2018-03-26 13:31:41 +08:00
llj
8d6e0ce5fd [file view] pdf: enable text selection 2018-03-17 14:26:51 +08:00
llj
1182a80989 Merge branch '6.2' 2018-03-15 11:26:02 +08:00
llj
6d4000fc20 [fileupload] show error message when failed to get upload url 2018-03-02 16:11:27 +08:00
Daniel Pan
eb4d8c9899
Merge pull request #1994 from haiwen/svg-view
[file view] added online view for SVG files
2018-02-08 15:41:54 +08:00
llj
bb1eab360f [home_base.html] side-nav: fix 2018-02-06 15:25:18 +08:00
llj
55e5bc734d [file view] added online view for SVG files 2018-01-25 12:23:40 +08:00
llj
2d98cc405d
Merge pull request #1976 from haiwen/file-view
[file view] current/history/shared file view: bugfix & improvement
2018-01-10 10:11:19 +08:00
llj
d8a5e73390 [file view] current/history/shared file view: bugfix & improvement 2018-01-08 16:10:32 +08:00
llj
30f098a5c0 [mobile] top bar: modified styles of icons 2018-01-05 14:00:41 +08:00
llj
5d2aa8af05 [system admin] added 'address book' 2018-01-04 18:06:05 +08:00
zhengxie
d37144ef75 Merge branch '6.2'
Conflicts:
	seahub/templates/base.html
	static/scripts/app/views/dir.js
	static/scripts/common.js
2017-12-28 15:47:18 +08:00
llj
472e421fe8 [2fa] login: improved UI 2017-12-27 12:01:56 +08:00
llj
2aba574cb6 [mobile] topbar: modified icon styles 2017-12-25 10:55:04 +08:00
llj
c061c60522 [mobile] topbar: replaced icons 2017-12-23 14:09:40 +08:00
llj
352f20a0bb [search result] fixed UI for mobile 2017-12-15 11:44:54 +08:00
llj
025ace5f55 [system admin] UI: modified library/user/group/link search 2017-12-13 18:18:22 +08:00
Daniel Pan
0dac3d38ca
Merge pull request #1941 from haiwen/feedback
added transition to show/hide of feedback messages
2017-12-13 18:15:47 +08:00
llj
b16a829ead added transition to show/hide of feedback messages 2017-12-12 17:13:01 +08:00
zming
3ec7684d46 search link 2017-12-11 16:29:38 +08:00
llj
07dea7eca4 new design 2017-12-05 17:53:45 +08:00
llj
3142684afd [misc] modification 2017-11-25 15:10:57 +08:00
llj
17d2e2f9c7 [misc] fix 2017-11-24 15:49:06 +08:00
llj
9ac06c5365
Merge pull request #1902 from haiwen/nav-fix
[sysadmin] fixed 'nav jumps in IE10' problem
2017-11-14 16:12:25 +08:00
llj
ba084afb2a [sysadmin] fixed 'nav jumps in IE10' problem 2017-11-14 16:02:36 +08:00
llj
ac18d5ee85 [share.js] download/upload link: added 'click to select' feature 2017-11-13 13:45:40 +08:00
llj
beb2a8c8b8 [seahub.css] small fix 2017-09-26 16:25:30 +08:00
Daniel Pan
5c095ee516 Merge pull request #1842 from haiwen/file-comment
[dir view] added 'file comment'
2017-09-26 02:06:09 -05:00
llj
c70d028367 [dir view] file comment: modification 2017-09-26 13:37:16 +08:00
llj
b55446551b [dir view] added 'file comment' 2017-09-26 10:35:16 +08:00
llj
71b089f9b3 [passwd change form] fix 2017-09-25 14:46:29 +08:00
llj
371bf8e05b [dir view] modified op menu 2017-09-20 14:29:18 +08:00
llj
33d657d024 [dir view] split items in the file/dir op menu 2017-09-19 17:31:30 +08:00
lian
bc492b9010 add admin role/log feature 2017-09-09 15:27:04 +08:00
llj
211d527e5a [home side nav] modified 'share admin' 2017-08-31 17:26:52 +08:00
Daniel Pan
ba86d53b72 Merge pull request #1771 from haiwen/file-view-ui
File view ui
2017-08-31 12:12:55 +08:00
llj
4f7ffb74f1 [file view] redesigned UI 2017-08-17 17:31:45 +08:00
llj
cb0aacd89d [UI] modified some 'file upload' buttons 2017-08-15 15:43:37 +08:00
Daniel Pan
f937dbe0b7 Merge pull request #1758 from haiwen/system-settings
[system admin] settings: fix & improvement
2017-08-12 19:50:12 +08:00
llj
cca91db5fc [system admin] settings: fix & improvement 2017-08-12 17:58:21 +08:00
lian
3e7275ec80 Merge branch '6.1' 2017-08-12 14:34:11 +08:00
llj
dd95460024 Statistic (#1749)
* [system admin] added statistic for file operation

* [statistic] improvement

* [system admin] added statistic for 'total storage' & 'active users'

* [statistic] file: modification
2017-08-10 10:16:03 +08:00
llj
073e4b5d28 [header] added 'log out' icon 2017-08-07 13:56:25 +08:00
llj
11ddefb508 [repo snapshot labels] added 'label current state' for my libs; show labels in 'repo history' page 2017-08-02 15:07:44 +08:00
Daniel Pan
8a853b3061 Merge pull request #1670 from haiwen/file-tag
file tag
2017-07-16 16:16:49 +08:00
Daniel Pan
80e483c5c0 Merge pull request #1666 from haiwen/new-login
[UI] new login
2017-07-16 16:13:35 +08:00
xiez
64832adc03 Merge pull request #1674 from haiwen/license
license
2017-07-15 15:37:06 +08:00
llj
0cd68a9a64 [login] modified UI 2017-07-15 14:16:21 +08:00
llj
8be017e917 [dirent details] add 'tags' 2017-07-12 10:47:52 +08:00
llj
3905f7b3ef [dirent details] improvement 2017-07-05 12:17:11 +08:00
llj
5d48dac96c [dirent details] improvement; show more info for folders 2017-07-04 17:49:36 +08:00
llj
76d58cb025 [dir view] added 'details' for dirent 2017-07-04 14:28:40 +08:00
llj
0015a9a6c8 [system admin] enable user to upload a license file 2017-07-04 10:39:11 +08:00
llj
60ce1a6bd8 [UI] new login 2017-06-29 17:24:46 +08:00
llj
067a17b106 [my libraries] added 'repo details' 2017-06-27 18:35:24 +08:00
llj
9215defff4 [system admin] side nav: modified icon for 'Info' 2017-06-22 16:40:41 +08:00
llj
f92fc53178 modified favicon; modified system logo/favicon setting 2017-05-27 14:18:51 +08:00
llj
59c494f419 [sysadmin] logo/favicon: improvement 2017-05-26 15:38:56 +08:00
llj
34811779bc [group discussion, info-bar] fix 2017-05-10 12:09:12 +08:00
zhengxie
194f219a3c Merge branch '6.0' 2017-05-09 13:13:36 +08:00
llj
45d9d5dbf8 [top info] UI: fix 2017-05-06 17:37:29 +08:00
llj
9d407c4cab [language selector] improvement 2017-05-04 15:06:45 +08:00
llj
41e2f7738c [system admin] side nav: modified icon for 'admin logs' 2017-04-11 10:56:10 +08:00
llj
59ff3fb180 [UI] top-bar: bugfix & improvement 2017-03-30 12:12:41 +08:00
llj
b697f7258a [file view] improvement 2017-03-11 11:12:07 +08:00
llj
e2282716da [history/snapshot/shared/trash file view] modified 'view-hd' 2017-02-22 17:52:35 +08:00
llj
65f591b431 [file view] modification 2017-02-21 18:23:14 +08:00
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
45fd5aa1b2 [UI] modified <input> ui of set-quota-form 2017-02-17 13:59:45 +08:00
llj
8dde793b60 [file view] Image: redesigned it 2017-02-16 17:37:12 +08:00
lian
bd054efe7f Merge pull request #1464 from haiwen/search-group
admin search group by name
2017-02-06 10:29:59 +08:00
lian
d43a2e5eb3 admin search group by name 2017-01-19 18:21:04 +08:00
llj
6346dc5ec0 [trash] use ajax to fetch the first batch of trash item 2017-01-19 18:06:34 +08:00
llj
01fb83c9b2 [mobile] added 'updateDirOpBarUI' 2017-01-12 11:39:21 +08:00
llj
f3b984f482 [mobile] dir view: modification 2017-01-04 17:19:57 +08:00
llj
90a5552a9d [my libs, dir view] improvement: enlarge clickable area, and etc. 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
7a9a89a7d1 [mobile] my libs: redesigned it 2017-01-04 17:19:57 +08:00
llj
214fd20fbb modified repo-create-form 2017-01-04 17:19:57 +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
zhengxie
d4e00402af Merge branch '6.0'
Conflicts:
	media/css/seahub.css
2016-12-26 14:22:35 +08:00
llj
eb82d1a5f9 [fileupload] ui fix 2016-12-23 11:58:03 +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
b53ca50a0f [about] fix 2016-11-21 11:03:24 +08:00
llj
a076a934f9 [dir view] added 'move dirents by drag & drop' 2016-11-18 12:21:11 +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
9e48df9ca9 [video file view] use videojs 2016-11-10 17:21:26 +08:00
llj
0128cc25ad [jstree] updated jstree to the latest v3.3.2, rewrote/modified related code, & bugfix 2016-10-25 11:39:52 +08:00
llj
353d3b77ea [magnificPopup] handle 'small images with long names' problem 2016-10-14 12:05:25 +08:00
llj
405e6b7e2c [user profile] modified UI 2016-09-20 13:19:09 +08:00
llj
7ecf62d970 [fileupload] upgrade fileupload plugin to the latest version 2016-09-19 20:41:54 +08:00
llj
3834245dce [library templates] fix 2016-09-19 11:13:01 +08:00
Daniel Pan
799640cc0a Merge pull request #1334 from haiwen/misc
clean CSS
2016-08-22 16:02:01 +08:00
llj
f5042956ce [share/perm popup] fix 2016-08-22 15:19:44 +08:00
llj
69caa19832 clean CSS 2016-08-20 10:16:02 +08:00
llj
992c094d55 [T&C] show the content in markdown 2016-08-11 11:32:18 +08:00
zhengxie
1cc7a258ab [2fa] Update input 2016-08-08 13:59:25 +08:00
llj
177913c806 [2fa] modified UI for 'token input' 2016-08-08 11:44:17 +08:00
llj
374c404d50 [file view] doc/pdf: add css for print 2016-08-04 17:52:25 +08:00
llj
9b135f57c4 [file view] markdown: added css for print 2016-08-03 15:12:19 +08:00
Daniel Pan
26d2a4d774 Merge pull request #1299 from haiwen/terms
Terms
2016-07-27 13:54:04 +08:00
llj
b0876bef53 [file view] use icons for operations 2016-07-27 13:32:36 +08:00
llj
94e9e358c5 [Terms] modified UI 2016-07-26 15:47:06 +08:00
llj
de81823121 [Terms] fix & improvement 2016-07-26 15:03:15 +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
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
Daniel Pan
603f88c6ab Merge pull request #1292 from haiwen/path
modified 'path-bar'
2016-07-19 17:39:48 +08:00
llj
6793cf8107 modified 'path-bar' 2016-07-19 17:26:45 +08:00
llj
7184b6502f [wiki] modification 2016-07-19 15:52:16 +08:00
llj
3af253401d [two factor auth] modified UI (#1273)
* [two factor auth] modified UI

* [2fa] login: modified UI

* WIP: update two-factor auth

* [2fa] improvement
2016-07-15 14:39:23 +08:00
llj
aa2e77e191 [org] bugfix 2016-07-13 15:04:43 +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
lian
c4fa072dc7 new share admin page (#1233) 2016-06-30 15:06:43 +08:00
llj
b2cda939aa UI fix (#1257) 2016-06-23 16:48:29 +08:00
llj
1a2cfee678 For mobile (#1255)
* [UI] bugfix; modified 'file view'

* [for mobile] modified shared/history file view

* modified 'header', 'dir view' for mobile
2016-06-22 16:51:03 +08:00
llj
9e2617e77b [help] new help 2016-06-17 15:29:15 +08:00
llj
8c2e16ca36 [system repo admin] fix, improvement, supplement, clean 2016-06-14 14:47:44 +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
llj
f635d6f125 [repo del confirm] fix 2016-06-13 17:41:36 +08:00
llj
51547a83c7 [info bar] fix 2016-06-13 17:16:36 +08:00
llj
dd32561be5 [passwd change] improvement & clean css 2016-06-03 12:38:57 +08:00
Daniel Pan
ae2152548c Improve Web UI for password change 2016-06-03 12:00:12 +08:00
Daniel Pan
fb58b29dad Split path-bar from button bar because in IE it doesn't display well 2016-05-27 16:47:19 +08:00
Daniel Pan
2877dc481e Merge pull request #1207 from haiwen/feature/file_comment
Feature/file comment
2016-05-25 18:15:03 +08:00
llj
eb25765ebd [file view] changed 'discuss' to 'comment' and etc. 2016-05-25 18:06:17 +08:00
llj
f028564881 Merge pull request #1205 from haiwen/css-improve
UI Improvement
2016-05-25 10:48:48 +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
Daniel Pan
ac436d44ae Improve about dialog 2016-05-20 15:42:59 +08:00
llj
b1909735a8 fix 2016-05-20 15:25:40 +08:00
Daniel Pan
4e4b6d07ba small UI improvement 2016-05-20 15:02:29 +08:00
llj
d15fb971f9 [side nav] improvement 2016-05-18 14:48:23 +08:00
Daniel Pan
702077bd0e Merge pull request #1189 from haiwen/improve-nav-description
Improve nav description
2016-05-17 12:20:10 +08:00
llj
566c19654e modified 'side nav'; clean css 2016-05-17 12:05:54 +08:00
llj
7eb1e1d132 [CSS] modified 'table', removed backbone.css 2016-05-16 17:08:21 +08:00
Daniel Pan
83a537edf6 clean css 2016-05-15 19:25:54 +08:00
llj
5a0e8f315d fixed 'help'; rm footer.html 2016-05-13 20:13:49 +08:00
llj
72a4cde6f7 fixed 'side-nav' for pages; fixed 'help' 2016-05-13 20:13:49 +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
fde0bdb9d9 [full screen] shared dir/file view, sysadmin: fix 2016-05-13 16:10:05 +08:00
llj
b421783eab [side nav] improvement 2016-05-12 10:18:22 +08:00
llj
d0e86965fc fix ui detail 2016-05-11 16:55:41 +08:00
llj
1c68ac92ff fix .btn-link 2016-05-10 18:05:51 +08:00
llj
d5bc279ffc UI fix 2016-05-09 14:34:09 +08:00
Daniel Pan
804695bbe2 Fix group transfer 2016-05-06 14:48:48 +08:00
Daniel Pan
c70cdcc2d4 Improve style of side nav 2016-05-05 15:00:32 +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
d8b7778ccd [accessibility] 'folder perm': ui fix 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
374edec89b Use breadcrumb, update path-bar style and fix close button in popover 2016-05-02 21:59:20 +08:00
Daniel Pan
55da80b237 Fix profile page and height of input 2016-05-02 00:04:54 +08:00
Daniel Pan
092950f802 Fix system admin 2016-04-29 13:22:12 +08:00
Daniel Pan
8108965cf5 Fix dt 2016-04-28 20:30:01 +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
86df7ee836 Refactor html templates 2016-04-28 20:30:00 +08:00
Daniel Pan
fce62e5781 fullscreen: initial implementation 2016-04-28 20:29:59 +08:00
Daniel Pan
260ac309a0 Small clean 2016-04-28 20:29:59 +08:00
Daniel Pan
1293dd78ad a few small fixes 2016-04-28 20:29:59 +08:00
Daniel Pan
d34bb3196f fix box-sizing problems 2016-04-28 20:29:58 +08:00
Daniel Pan
ffabf2353c fix conflict of dropdown 2016-04-28 20:29:58 +08:00
Daniel Pan
5a52ad7168 Merge pull request #1145 from haiwen/share_link_audit
Add share link audit
2016-04-27 13:27:15 +08:00
llj
94c96751cc [accessibility] modified 'file view', 'file edit', 'shared link' 2016-04-26 18:16:41 +08:00
llj
b38d4b671d [share link audit] fix & improvement 2016-04-25 21:00:25 +08:00
Daniel Pan
a8d9e32328 fix header bar h3 2016-04-23 19:20:41 +08:00
Daniel Pan
ae00156cdb Improve UI 2016-04-23 18:06:26 +08:00
Daniel Pan
bcc4e42142 Implement Sysinfo 2016-04-23 17:14:01 +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
llj
88a73c4323 Merge pull request #1139 from haiwen/fileupload2
Fileupload
2016-04-21 16:07:05 +08:00
llj
fe5b82b6e1 [search] css fix 2016-04-21 11:30:24 +08:00
llj
294224d382 [search] add 'focus' for input 2016-04-20 21:26:39 +08:00
Daniel Pan
bc0fe0e93b Improve file upload menu 2016-04-20 18:00:38 +08:00
Daniel Pan
8bb44749eb Make table sort operations focusable (#1128) 2016-04-19 14:41:17 +08:00
llj
32375abcb6 [fileupload] use dropdown 2016-04-18 11:57:55 +08:00
Daniel Pan
1fc7386d1e add underline when focus and hover for repo/dir op icon 2016-04-14 14:51:06 +08:00
llj
fb802a54b0 [css] modified 'focus' (#1124) 2016-04-14 14:34:31 +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
ce65a157d0 [icons] rm '.non-text-link' 2016-04-12 17:15:20 +08:00
llj
3f23a1685e [icons] modification 2016-04-12 11:22:04 +08:00
llj
798df91484 add 'focus' effect for checkbox, button, select 2016-04-07 16:39:11 +08:00
llj
77aac3d811 redesigned all checkbox; bugfix & improvement; removed unused code & file 2016-04-07 11:06:48 +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
d07e7be840 Improve devices page to support focus 2016-03-31 19:56:36 +08:00
Daniel Pan
00566e24bc Improve login page 2016-03-31 19:55:14 +08:00
Daniel Pan
919ea35081 Clean simplemodal 2016-03-31 13:42:48 +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
3665084ec9 Merge pull request #1053 from haiwen/discussion
Add group discussion
2016-03-29 17:46:49 +08:00
zhengxie
ec9be6975d Merge branch '5.0'
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
	seahub/group/templates/group/group_discuss.html
	seahub/options/models.py
	seahub/templates/repo_folder_perm.html
	seahub/templates/repo_share_manage.html
	seahub/templates/snippets/shared_link_js.html
	seahub/test_utils.py
2016-03-28 12:16:30 +08:00
llj
025af00900 [group discussion] added 'load more' 2016-03-25 17:54:53 +08:00
llj
fdeec88eb3 [group discussion] added 'reply' icon 2016-03-25 15:03:55 +08:00
llj
63f30b3657 [group discussion] bugfix & improvement 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
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
05cac32228 Remove unused css 2016-03-21 20:38:17 +08:00
Daniel Pan
a8060db6ed Remove #sf 2016-03-21 20:38:17 +08:00
Daniel Pan
e4c8852a94 Remove .home-profile, clean profile settings page 2016-03-21 20:38:17 +08:00
Daniel Pan
d1559c829e Clean .hidden-op 2016-03-21 20:38:17 +08:00
llj
4ebf0d79ce [non backbone] upgrade jquery.js, bugfix for some pages 2016-03-18 17:05:36 +08:00
lian
50711071a6 improve devices page 2016-03-16 15:47:33 +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
Daniel Pan
e00f0054c2 Merge pull request #1058 from haiwen/details
Details
2016-03-11 21:07:03 +08:00
llj
2e1d8facdc [lib setting] folder perm: replaced 'plus' icon 2016-03-11 15:18:19 +08:00
llj
37ed9678c3 [details] improved UI details, cleaned up CSS 2016-03-11 14:42:03 +08:00
llj
d6dffbab73 [lib setting] 'folder perm', 'share link': add 'min-height' 2016-03-10 18:02:32 +08:00
llj
b741ef8b60 [clean] removed 'seafile-font' & etc. 2016-03-10 15:55:00 +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
ca2bef6e73 Improve icon for grid/list mode switch in folder share link 2016-03-09 14:05:01 +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
Daniel Pan
f04e152e41 Merge pull request #1034 from haiwen/grid-view
Grid view
2016-03-03 19:09:35 +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
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
003838b8f1 Fix CSS problems 2016-02-28 22:17:08 +08:00
Daniel Pan
f49547bbfe Clean dirent-grid.js 2016-02-28 19:35:32 +08:00
Daniel Pan
0a1600a26d Add grid/list view icon font 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
978eb3973e Add grid view for dirView 2016-02-28 19:35:31 +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
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
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
8d12ea22c7 Add repo operations 2016-02-19 17:38:31 +08:00
llj
4dd0015cba [group setting, group wiki] bugfix, modification 2016-02-19 17:01:31 +08:00
Daniel Pan
6a88d50b02 Turn on/off group Wiki 2016-01-30 16:23:52 +08:00
Daniel Pan
4e98fd2365 Update icon for group settings 2016-01-16 14:40:22 +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
bf26f9c2a3 Merge pull request #983 from haiwen/repo-trash
batch load repo/dir trash
2016-01-12 17:44:50 +08:00
llj
198c563387 fix for 'trash view' & 'repo history view', modified 'view shared dir'
Conflicts:
	seahub/templates/repo_dir_recycle_view.html
2016-01-12 16:43:23 +08:00
lian
e75b1891e2 batch load repo/dir trash 2016-01-12 10:19:34 +08:00
llj
4624a3a1a1 [seafile-font2] update icon files 2016-01-11 15:20:10 +08:00
llj
e9150cf555 add 'group settings' 2016-01-06 16:46:25 +08:00
llj
03d27d516d [seafile-font2] update 'share' icon for windows, and updated 'delete' & 'download' 2015-12-23 14:45:23 +08:00
llj
d749a227e7 [groups] redesigned the UI 2015-12-17 14:58:50 +08:00
llj
03d075a00b [group members] redesigned it 2015-12-11 20:58:29 +08:00
llj
8469c3331a [group] modified icons 2015-12-08 16:00:34 +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
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
93f98bce15 [nav] removed top nav; redesigned side nav for home_base 2015-12-04 16:27:26 +08:00
llj
a11cb6d32f [file access] modified UI 2015-12-03 11:56:43 +08:00
zhengxie
9d53430e4c Merge branch '4.4' into 5.0
Conflicts:
	media/css/seahub.css
	seahub/group/templates/group/group_manage.html
	seahub/utils/__init__.py
	seahub/views/repo.py
	tests/seahub/views/test_file.py
2015-12-02 17:37:50 +08:00
lian
577c27c9d2 [group] import members from csv file 2015-12-02 14:10:32 +08:00
llj
1c18e3e716 [groups] redesigned it. 2015-12-02 11:39:36 +08:00
lian
643d036942 new file access log page 2015-11-27 10:55:56 +08:00
llj
784e2f1a25 [sysadmin] rm icons in op btns; add datepicker files 2015-11-21 10:49:17 +08:00
llj
bb9f374e41 Merge pull request #894 from haiwen/markdown
Markdown
2015-11-11 15:50:08 +08:00
llj
1055c9a557 [shared dir view] fix for lang popup 2015-11-10 17:33:09 +08:00
llj
b2313e1456 [markdown view/edit] use 'marked' for md/wiki view, use editormd for md edit 2015-11-10 10:26:55 +08:00
llj
40ddb4ea4b [view_shared_dir] added 'grid view' 2015-10-29 17:17:40 +08:00
llj
3fa2ab6a38 Merge pull request #859 from haiwen/license
[sys-admin] check seafile license expiration
2015-10-24 18:27:20 +08:00
llj
96cbd7debc [sys-admin] license expiration: modification 2015-10-24 18:14:58 +08:00
llj
ae9d0b296a [UI] modified 'share popup' & 'dir perm popup' 2015-10-22 16:17:41 +08:00
llj
edcd8358a6 [loading] use a new one 2015-10-14 11:12:50 +08:00
llj
ad2738b098 [loading] a new one 2015-10-13 14:53:11 +08:00
xiez
ba222a9665 Merge pull request #824 from haiwen/web-settings-2
Web settings 2
2015-10-10 10:39:56 +08:00
llj
e3df7b561e [web setting] bugfix & improvement 2015-09-29 12:04:41 +08:00
llj
efbab73191 removed some unused code & file 2015-09-23 20:07:44 +08:00
llj
e4e08ddba1 modified 'view_shared_dir' UI, modified 'obv-btn' & 'big-obv-btn' 2015-09-23 16:48:41 +08:00
llj
aa30802fcf redesigned 'repo snapshot' top, deleted 'repo_view_snapshot'(repo snapshot list) 2015-09-23 11:59:58 +08:00