1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-01 15:23:05 +00:00
Commit Graph

1150 Commits

Author SHA1 Message Date
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
llj
e2f704277e [repo trash] modified UI, path, gc 2015-09-22 17:24:01 +08:00
llj
9497b0d61a [library history] redesigned UI of 'modification history' & 'snapshot' pages 2015-09-22 13:59:34 +08:00
llj
e41645345f [file history] modified UI. 2015-09-21 16:42:45 +08:00
lian
4baf74926b add seahub web settings page 2015-09-21 11:48:07 +08:00
llj
6c577c04e0 [font icon] modified sf2-icon-x2 2015-09-18 12:17:50 +08:00
llj
3065404a16 [rename] modified font icons in rename form 2015-09-18 10:58:30 +08:00
llj
f986bfa5cd [rename] redesigned it 2015-09-18 10:18:36 +08:00
llj
f38bb82101 [font icon] improved icon class names 2015-09-17 18:10:42 +08:00
llj
8ec0abfb05 [font icon] replaced 'del.png' in base/base_for_backbone.html 2015-09-17 18:10:42 +08:00
llj
f1ebf6624a [font icon] replaced icons in 'file upload' popup 2015-09-17 18:10:42 +08:00
llj
f0916fe99e [font icon] modified 'more-op' icon & 'enable-mods' icon 2015-09-17 18:10:42 +08:00
llj
1fe0c4675a [font icon] modified 'edit icon' 2015-09-17 18:10:42 +08:00
patrickgao
193bdcafa6 replace enable-modules icon 2015-09-17 18:10:42 +08:00
patrickgao
622c19e4fa replace more_op icon 2015-09-17 18:10:42 +08:00
patrickgao
5619c46352 replace edit icon 2015-09-17 18:10:41 +08:00
llj
ad450d6df9 add 'virus scan' icon to sidenav, modified 'repo setting/history/trash' ui code 2015-09-17 18:10:41 +08:00
patrickgao
fcc556836c add some new icons 2015-09-17 18:10:41 +08:00
llj
e0e31faedf [font icon] modification 2015-09-17 18:10:41 +08:00
patrickgao
72f023cd6d font icon 2015-09-17 18:02:27 +08:00
llj
f43a5bda7a [spreadsheet file view] improvement 2015-09-11 16:12:08 +08:00
llj
3b00b7cf83 [pdf file view] modified 'page loading' 2015-09-10 17:20:32 +08:00
llj
9357cb3202 [pdf file view] modified 'zoom in/out' 2015-09-10 16:53:19 +08:00
llj
bc4afa5947 Merge pull request #776 from haiwen/random-password-when-adding-users
[add user] add 'random password' function
2015-08-31 11:19:07 +08:00
patrickgao
231fc63b39 update 2015-08-30 20:47:43 +08:00
patrickgao
1df8d3b2f0 generate a random password when adding a user 2015-08-19 11:06:24 +08:00
llj
5790cc525c modified 'file revision' & 'repo trash' 2015-08-18 16:52:02 +08:00
lian
8199992788 get file history by days 2015-08-18 16:05:18 +08:00
zhengxie
844dcf4a07 [sysadmin] Add virus scan records 2015-08-17 11:20:51 +08:00
llj
57fb0066e3 [file view] redesigned 'pdf file view with pdf.js' 2015-08-13 15:23:52 +08:00
llj
f7834be353 [share popup] modified btn ui for firefox 2015-08-10 14:34:35 +08:00
lian
d889f3bafe update activity page 2015-07-28 19:55:05 +08:00
llj
fa177dd150 [file lock] modified for firefox 2015-07-28 15:49:13 +08:00
llj
66c9bdd45c Merge pull request #747 from haiwen/new-download-link
new btn link
2015-07-28 13:56:27 +08:00
patrickgao
1c6fc34a84 new download link 2015-07-28 12:22:52 +08:00
lian
6867b1823d update thumbnail default size 2015-07-25 16:30:38 +08:00
llj
d47686ac56 clean up CSS 2015-07-23 14:34:24 +08:00
llj
f9e28022fd [shared file view] remove logo 2015-07-21 11:24:41 +08:00
llj
65c540a29d [lib/dir/file share] rewrote 'random password' 2015-07-20 16:36:07 +08:00
patrickgao
7f5a1f012d generate a random password 2015-07-20 11:15:07 +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
6ff2efb597 [dir private share] split into user/group share 2015-07-14 11:03:05 +08:00
llj
94d954eea4 [file view] cleaned up CSS
Conflicts:
	media/css/seahub.css
2015-07-11 10:24:01 +08:00
llj
b1e9dd0360 remove 'seaf' file 2015-07-10 17:47:10 +08:00
llj
33b8b673aa [user profile] improvement & clean up code 2015-07-10 11:59:45 +08:00
patrickgao
f3ebab71ca optimization of user profiles 2015-07-09 11:55:39 +08:00
llj
fedb858f38 [office preview] modified css 2015-07-01 11:34:37 +08:00
Shuai Lin
20ec383ed8 improve office documents online preview 2015-07-01 11:34:37 +08:00
llj
ccba0c9c12 [extra style] cleaned up 'extra_style' in pages 2015-06-27 20:24:23 +08:00
Daniel Pan
f6a3b05f75 Merge pull request #650 from haiwen/select
global addressbook
2015-06-18 09:57:09 +08:00
llj
945648de4c [select2] modification for long name/email 2015-06-17 14:26:31 +08:00
llj
a32ae19a4b [repo setting] modified 'folder perm' 2015-06-17 13:33:40 +08:00
llj
43d020a0a4 modification 2015-06-16 17:38:09 +08:00
llj
e69b93a1c5 add missing css file 2015-06-16 17:25:22 +08:00
llj
9b903cbaf2 [repo perm] 'perm add': modification, bugfix, improvement 2015-06-15 18:37:55 +08:00
llj
ee816216ea add 'top tip' for IE 2015-06-05 17:49:09 +08:00
llj
a66d22d363 [search result] modified UI 2015-05-29 11:05:33 +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
lian
b48d9844a8 [search-result] add highlight-content class 2015-05-28 17:33:59 +08:00
lian
df817c0529 [search-result] update search result css and add 128 pixel file icon 2015-05-28 15:50:28 +08:00
llj
cb4e0d7493 [org view] modified 'add library' 2015-05-28 13:57:00 +08:00
llj
be238d44c4 [share] bugfix for 'download link' 2015-05-27 15:10:50 +08:00
zhengxie
51ade2d834 Update styles of share popup 2015-05-26 14:36:31 +08:00
lian
903b29aea4 add public repo 2015-05-14 11:28:12 +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
llj
210fee97c5 modification for long lib/dir/file name 2015-05-09 15:04:16 +08:00
zhengxie
60b2a4b2bf Merge branch '4.1' 2015-05-08 10:38:44 +08:00
llj
ea355f0327 [dir view] bugfix for '#upload-menu' ui 2015-05-05 17:29:31 +08:00
llj
b2e5db1153 [select2] modified styles of 'input' 2015-05-05 12:02:51 +08:00
llj
7051aeb55d [file view] fix ui bug for pdf/doc/image files 2015-05-04 17:37:16 +08:00
llj
2c6994c56a [folder perm] modified 'user perm' 2015-04-28 17:18:24 +08:00
zhengxie
ab2b49a236 Moved select2.png 2015-04-27 17:50:00 +08:00
llj
c01969c7ed [folder perm] rewrote it 2015-04-25 14:28:09 +08:00
lian
1721a5821d [dirent-view] add/modify/remove user/group folder perm 2015-04-23 10:18:50 +08:00
llj
f53c178e95 [side nav] improvement 2015-04-22 15:31:52 +08:00
lian
66e938868a enable/disable personal wiki 2015-04-22 15:31:51 +08:00
zhengxie
c709eab594 Use django compressor to compress css 2015-04-22 15:31:48 +08:00
llj
8d45b64511 [dir view] use magnificPopup for img view 2015-04-22 15:31:47 +08:00
llj
62fe930d3a [libs] modified ui of 'lib list' & 'lib create'
* removed 'description', added 'size'
2015-04-22 15:31:46 +08:00
llj
c4dabb0220 [lib decrypt] modified form UI & used popup 2015-04-22 15:31:45 +08:00
llj
1b306dac28 [ui] modified ui details of 'share popup' & 'dir view' 2015-04-22 15:31:45 +08:00
llj
51d1e0a420 [dir view] modified UI of dirent hidden-op 2015-04-22 15:31:41 +08:00
llj
33de4b3c6f [lib view] modified UI of 'dirent-op' 2015-04-22 15:31:41 +08:00
lian
6aecc53750 new dir/file icon 2015-04-22 15:31:41 +08:00
llj
4c0f263cca [share] added lib/dir/file share 2015-04-22 15:31:40 +08:00
lian
b10d518ae2 show popup 2015-04-22 15:31:40 +08:00
lian
aaaaedd181 new cp/mv/del icon 2015-04-22 15:31:39 +08:00
lian
273872a91b update repo setting/trash/history
1. hide setting-icon if is not repo owner
2. hide trash-icon if user-perm is 'r'
2015-04-22 15:31:39 +08:00
lian
a3b1eff49a show setting/trash/history icon 2015-04-22 15:31:39 +08:00
Daniel Pan
1e3a18f6c9 [backbone] Remove path bar from repo list page 2015-04-22 15:31:37 +08:00
Daniel Pan
f5710ac77a [backbone] Add path bar to repo list page 2015-04-22 15:31:36 +08:00
llj
02ec7cfc94 [myhome lib] modified css, modified 'repo-file-list-topbar' UI 2015-04-22 15:31:36 +08:00
Daniel Pan
254357c3f1 [backbone] Merge lj's work 2015-04-22 15:31:32 +08:00
zhengxie
700dc2bf1d tmp mod 2015-04-22 15:29:47 +08:00
llj
6aee6b5578 [file view] modified ui 2015-04-15 16:51:18 +08:00
llj
0f3d73e346 [file view] modified 'file view area' height 2015-04-15 14:37:53 +08:00
lian
7b51afe600 [sysadmin-log] Show file-audit/update & permission log 2015-03-25 13:36:24 +08:00
lian
d1fb67c78f [repo-setting] Set folder perm 2015-01-21 11:14:34 +08:00
llj
287bb0bc80 [fileupload] modified fileupload, file-update, shared_upload_link 2014-12-17 12:04:31 +08:00
llj
b22f92fe1d [fileupload] updated plugin files, enabled 'folder drag & drop', added improvement 2014-12-17 12:04:31 +08:00
lian
c8cde80e7d [preview] Show image file's preview
Conflicts:
	seahub/views/repo.py
2014-12-09 15:19:59 +08:00
lian
95a3123354 [thumbnail] Show image file's thumbnail
Conflicts:
	seahub/views/ajax.py
	seahub/views/repo.py
2014-12-09 15:19:59 +08:00
llj
d2d7c72e99 [fileupload] redesigned 'add folder' 2014-12-03 11:28:56 +08:00
llj
c754f19f34 [fileupload] redesigned it. 2014-11-14 11:51:11 +08:00
llj
e1e5e885a5 [repo] use icons for dirent download & share. 2014-10-28 17:51:48 +08:00
llj
6756b48c14 use new ellipsis for group names in top-grp-list-popup & group homepage 2014-10-24 19:01:47 +08:00
llj
34c8299854 improved popup triangles UI 2014-10-22 15:13:00 +08:00
llj
f970ac5bb4 [header] added 'triangle' to popups 2014-10-21 15:05:05 +08:00
llj
a38fcffd34 [top nav] use 'hover' instead of 'click' to show group-list popup 2014-10-21 15:05:05 +08:00
llj
a0abb77adf modified UI of 'back to library' on some pages 2014-10-21 14:59:46 +08:00
llj
444706347e added 'left-right-tabs' ui widget, and used it on file/dir share popup 2014-09-25 16:39:14 +08:00
llj
da8fb66a05 [multi-tenancy] added icon for org, modified style for 'org url' in org_register 2014-08-30 14:54:46 +08:00
zhengxie
fb10e7d000 Merge branch '3.1' 2014-08-27 17:15:10 +08:00
zhengxie
2eb8b9ea82 Update org register and pubuser paginator 2014-08-26 15:25:33 +08:00
llj
327a6675b9 [notice] msg reply: improved ui & truncation of msg 2014-08-25 18:01:59 +08:00
llj
7f1a3d93e6 [notice] add 'topic' to grp-msg-reply: improved code & ui 2014-08-25 18:01:59 +08:00
lian
f6552ff297 [notice-popup] add simple group discussion topic to grpmsg-reply notification 2014-08-25 18:01:59 +08:00
llj
6d98462a5e [signup, passwd change] redesigned passwd tip, improved code; [file view] added tip for sidebar 2014-08-05 17:13:51 +08:00
zhengxie
79a043db60 Merge branch 'password' 2014-07-29 17:32:04 +08:00
llj
26f97371a1 [file view] added 'back to top' 2014-07-29 17:21:17 +08:00
llj
c8cf757191 [passwd strength] improved passwd tip & strength display, removed 'show passwd', fixed bugs 2014-07-29 11:26:41 +08:00
llj
790065b19c [file view] redesigned it; [repo] open file in new window 2014-07-17 13:56:36 +08:00
zhengxie
33732da277 Merge branch 'user-role' 2014-07-15 17:45:58 +08:00
llj
8ab9e72a96 [notice page] redesigned it 2014-07-14 16:34:54 +08:00
llj
11ec432f84 [user role] bugfix and improvement 2014-07-09 17:51:07 +08:00
imwhatiam
1683a73e4e [user-role] Select role when add a user / change role at user admin page;
Limit guest user's operation: can not create group and library.
2014-07-07 16:05:14 +08:00
llj
2849a13251 [share link] add passwd & expiration: improved ui & interaction 2014-07-04 17:40:07 +08:00
llj
e18f7cbb41 added notification popup and custom scrollbar 2014-06-18 10:21:42 +08:00
imwhatiam
81a4c5c3bf [shared-link-email] add extra message and show file/dir name at email body 2014-06-10 13:53:05 +08:00
zhengxie
d5f1c76146 Merge branch '3.0' 2014-05-23 13:38:07 +08:00
llj
1a5f051a0e highlight keywords in 'search result' and 'file view' page; bug fix for pdf view 2014-05-19 11:15:24 +08:00