haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-20 10:20:42 +00:00
Code Issues Releases Wiki Activity
6,830 Commits 120 Branches 466 Tags
4ce3cf7080e52181acf61b9bb11182cffeb1c580
Commit Graph

1025 Commits

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