1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 23:02:26 +00:00
Commit Graph

970 Commits

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