xiez 01b355a0f6 Merge branch 'recommend' ...

Conflicts:
	media/css/seahub.css
	views.py

2012-08-13 10:46:07 +08:00

..

bottom_bar.html

Merge branch 'recommend'

2012-08-13 10:46:07 +08:00

editor_set_mode.html

added func: source file edit

2012-08-09 20:45:29 +08:00

file_view_js.html

[editor]added worker-css/js;added one line for bottom scrollbar

2012-08-09 20:45:29 +08:00

myhome_extra_script.html

improved auto-complete in myhome

2012-08-04 17:59:55 +08:00

repo_create_form.html

Move included files to templates/snippets

2012-07-28 16:41:24 +08:00

repo_file_get.html

del 'history' in file-op-popup; added 'history' in file-view

2012-08-11 20:00:20 +08:00

repo_share_form.html

Modify repo share.

2012-07-31 15:02:18 +08:00