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

..

font

[seaf edit] added 'removeformat', improved 'fontsize'

2013-10-08 16:43:37 +08:00

sf_font

[seaf edit] added 'removeformat', improved 'fontsize'

2013-10-08 16:43:37 +08:00

sf_font2

[seafile-font2] update icon files

2016-01-11 15:20:10 +08:00

background.png

Added files for mediaelementjs

2013-02-26 05:15:42 +01:00

bigplay.png

Added files for mediaelementjs

2013-02-26 05:15:42 +01:00

bigplay.svg

Added files for mediaelementjs

2013-02-26 05:15:42 +01:00

bootstrap.popover.min.css

[signup, passwd change] redesigned passwd tip, improved code; [file view] added tip for sidebar

2014-08-05 17:13:51 +08:00

controls.png

Added files for mediaelementjs

2013-02-26 05:15:42 +01:00

controls.svg

Added files for mediaelementjs

2013-02-26 05:15:42 +01:00

doc_and_pdf.css

[pdf file view] modified 'page loading'

2015-09-10 17:20:32 +08:00

editormd.min.css

[markdown view/edit] use 'marked' for md/wiki view, use editormd for md edit

2015-11-10 10:26:55 +08:00

file_view_extra.css

[shared file view] remove logo

2015-07-21 11:24:41 +08:00

jquery-ui.datepicker.min.css

[sysadmin] rm icons in op btns; add datepicker files

2015-11-21 10:49:17 +08:00

loading.gif

Added files for mediaelementjs

2013-02-26 05:15:42 +01:00

mediaelementplayer.css

Added files for mediaelementjs

2013-02-26 05:15:42 +01:00

mobile.css

[shared upload link] bug fix and improvement; [dir priv share] improved

2013-11-14 16:31:40 +08:00

seacloud.css

Add seacloud home page

2013-09-25 14:48:52 +08:00

seahub.css

Merge branch '5.0'

2016-01-13 10:19:56 +08:00

seahub.min.css

[base.html] use seahub.min.css, update timestamp

2014-04-10 12:44:39 +08:00

select2.css

[msg] redesigned send-msg popup, improved topbar & user-msg page

2013-06-01 14:25:40 +08:00

spreadsheet_convert.css

[spreadsheet file view] improvement

2015-09-11 16:12:08 +08:00