haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-21 16:34:33 +00:00
Code Issues Releases Wiki Activity
12,389 Commits 141 Branches 456 Tags 2.7 GiB
625116cccb
Commit Graph

1280 Commits

Author SHA1 Message Date
shanshuirenjia
5ce1b15fb2 Style bug repair (#2394) 
* optimized css code

* repair search module

* repair response bug

* repair notificition bug

* repair file-history bug

* repair search info bug

* optimized code
 2018-09-25 09:13:06 +08:00
shanshuirenjia
490a15deed Code optimized (#2388) 2018-09-21 14:16:15 +08:00
shanshuirenjia
ba583d6efd Draft dashboard optimized (#2384) 
* create a common toolbar component

* optimized code

* combine side-panel

* add change state
 2018-09-20 10:19:11 +08:00
shanshuirenjia
db47fb34a7 Wiki coding style improve (#2380) 2018-09-19 09:57:17 +08:00
shanshuirenjia
180f388af1 Clean css (#2377) 2018-09-15 17:47:09 +08:00
shanshuirenjia
e793730939 Drafts module (#2375) 2018-09-15 16:14:17 +08:00
llj
ffce0e0778 [system admin, org admin] file access/update, permission: modified ui (#2370) 2018-09-15 08:14:15 +08:00
shanshuirenjia
d6d037afbc change font style lib (#2366) 2018-09-13 14:26:39 +08:00
ilearnit
5a4df40b92 Merge branch '6.3' 2018-09-12 18:04:30 +08:00
llj
b14ddfeb31 Traffic fe (#2363) 
* Refactor seafevents msg and add traffic stats API

Squashed commit of the following:

commit 85fe5369f711e1514762d93008f9ebb3c5d49041
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Aug 6 15:48:55 2018 +0800

    Add '-link' to access_token op type when generate download/upload link

commit 1817833fc3374f54030e16f3a1283ff6f34ddbf5
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Aug 6 15:28:38 2018 +0800

    Refactor file/dir events

    1. Remove traffic related msg
    2. Rename seahub.stats to seahub.audit for audit related msg

* Fix share link zip task traffic owner

* [admin api] Add org traffic

* [system admin] statistic: added 'traffic', fixed 'storage'

* [system admin] statistic: added 3 more charts for 'traffic', and modified the top nav

* [system admin] statistic: added 'traffic' for org; added a traffic nav, improved chart dot title
 2018-09-12 17:41:59 +08:00
shanshuirenjia
ca0110e996 New file history (#2359) 2018-09-12 17:01:48 +08:00
ilearnit
15b5be489d Merge branch '6.3' 
Conflicts:
	frontend/build/frontend/js/main.js
	frontend/build/frontend/js/main.js.map
	frontend/build/frontend/js/wiki.js
	frontend/build/frontend/js/wiki.js.map
	frontend/src/components/constance.js
	frontend/src/pages/wiki/main-panel.js
	frontend/src/pages/wiki/side-panel.js
	frontend/src/wiki.js
 2018-09-12 12:03:07 +08:00
C_Q
7bd50ad009 view repo via wiki (#2354) 
* view repo via wiki

* Modify details

* add list/grid mode

* [dist]
 2018-09-12 10:32:31 +08:00
llj
94368c5af9 [dir view] fileupload: added support for IE9 2018-09-07 15:17:46 +08:00
ilearnit
2e01046493 Merge branch '6.3' 
Conflicts:
	frontend/src/components/MainPanel.js
	frontend/src/components/account.js
	frontend/src/components/main-panel.js
	frontend/src/components/search.js
	frontend/src/pages/wiki/main-panel.js
	frontend/src/pages/wiki/side-panel.js
	frontend/src/wiki.js
 2018-09-04 18:15:48 +08:00
llj
094871b45f [share popup] share link: new design 2018-09-03 18:51:54 +08:00
zhengxie
5ec002c98a Merge branch '6.3' 2018-09-01 15:34:31 +08:00
llj
0aeab05ecf [share popup] modified UI 2018-09-01 14:22:12 +08:00
shanshuirenjia
31461b0040 repair wiki-list rename bug (#2324) 2018-09-01 11:34:47 +08:00
zhengxie
a3bdae76b2 Merge branch '6.3' 
Conflicts:
	frontend/src/pages/wiki/side-panel.js
 2018-08-31 11:59:19 +08:00
llj
37875256de Squashed commit of the following: 
commit 8ac4cd167993b4be4249fa28368b0c869852585b
Author: llj <lingjun.li1@gmail.com>
Date:   Thu Aug 30 16:38:15 2018 +0800

    [share link] fixup & improvement for 'permission & copy'; added 'copy' for upload link

commit f318353797d6479bb8c5bc2c3d20b05ca2ac5b70
Author: lian <imwhatiam123@gmail.com>
Date:   Wed Aug 29 13:44:23 2018 +0800

    update

commit bcadd6c3b708f1c672df3873b22816be1eea195d
Author: lian <imwhatiam123@gmail.com>
Date:   Wed Aug 29 11:49:49 2018 +0800

    add can_edit permission when generate share link
 2018-08-30 16:44:34 +08:00
shanshuirenjia
740d6a86cf React activity (#2315) 2018-08-30 15:10:52 +08:00
zhengxie
29ce466c3c Merge branch '6.3' 2018-08-24 17:43:46 +08:00
shanshuirenjia
5d1fd88da3 Add wiki use lib (#2297) 2018-08-24 14:24:14 +08:00
zhengxie
14ed32c994 Merge branch '6.3' 2018-08-21 13:39:43 +08:00
shanshuirenjia
0105e8e8ef wiki search (#2278) 2018-08-17 12:23:55 +08:00
C_Q
e68efa9a31 Remove user email from the wiki page (#2274) 2018-08-14 12:14:04 +08:00
shanshuirenjia
7bd164f0e1 add wiki outline (#2263) 2018-08-10 17:05:29 +08:00
zhengxie
864b4da11d Merge branch '6.3' 
Conflicts:
	seahub/urls.py
 2018-08-08 10:40:48 +08:00
Daniel Pan
65a659876f Improve css of wiki page 2018-08-06 23:58:23 +08:00
Daniel Pan
fa38dd9151
Rewrite wiki page with react (#2258) 2018-08-06 18:29:12 +08:00
lian
ee8e4135ea Revert "[select2] upgraded it to v4.0" 
This reverts commit 62c3519e85.
 2018-08-03 16:08:29 +08:00
lian
20cb4ce86f Revert "[select2] fixup after rebase" 
This reverts commit 5fe0865629.
 2018-08-03 16:07:05 +08:00
lian
57e2cef98b Revert "[select2] show 'searching' tip" 
This reverts commit 7daec7d742.
 2018-08-03 16:05:20 +08:00
llj
7daec7d742 [select2] show 'searching' tip 2018-08-02 17:18:53 +08:00
lian
85d2812ca6
Merge pull request #2247 from haiwen/document-bug 
repair editor menu style for different device
 2018-08-01 18:32:07 +08:00
llj
5fe0865629 [select2] fixup after rebase 2018-08-01 14:24:14 +08:00
shanshuirenjia
d8d7462298 repair mp3 mp4 3d exp. problem 2018-08-01 11:26:56 +08:00
shanshuirenjia
998ca7d675 repair the code style 2018-07-31 16:59:46 +08:00
杨顺强
12fb7a18f0 first : modify the editor to be resposed for pc and mobile; 
second: change the editor menu style for different device;
 2018-07-31 15:40:00 +08:00
lian
9733d50a1a
Merge pull request #2235 from haiwen/select2-upgrade 
[select2] upgraded it to v4.0
 2018-07-31 15:14:13 +08:00
llj
62c3519e85 [select2] upgraded it to v4.0 2018-07-26 18:28:17 +08:00
zheng xie
4286742f51
Use contact email instead of username (#2218) 
* Use contact email instead of username

* remove contact email

* username center

* [profile] Clean code
 2018-07-26 10:30:13 +08:00
cainiao222
e589403bc6 add help of internal-link, change the name smart-link to internal-link 2018-07-25 11:16:33 +08:00
cainiao222
349ea9368c frontend add smart-link 2018-07-11 17:44:32 +08:00
zhengxie
7d12a43f3b Merge branch '6.3' 2018-07-09 13:29:50 +08:00
Norbert Kelemen
4a91663f8a
User profile form fix 
User profile form label fix for hungarian language
 2018-07-03 14:10:35 +02:00
llj
c27d131710 [groups, group] use new icon for 'unshare' a repo 2018-06-25 14:42:33 +08:00
llj
f511f240a6 [search] added 'search by time & size' 2018-06-25 10:51:00 +08:00
llj
435ced05f5 [register] redesigned it 2018-06-14 16:51:13 +08:00
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