1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-06-30 00:42:53 +00:00
Commit Graph

8 Commits

Author SHA1 Message Date
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
llj
e9150cf555 add 'group settings' 2016-01-06 16:46:25 +08:00
llj
d749a227e7 [groups] redesigned the UI 2015-12-17 14:58:50 +08:00
llj
8d2054dafd [js] bugfix for object 2015-06-10 13:43:41 +08:00
llj
b00d29c8e2 modified 'group repo' & some improvement 2015-04-22 15:48:46 +08:00
llj
ed4447150d [grp lib] bugfix & improvement 2015-04-22 15:47:38 +08:00
llj
4cb39ba0f4 [group] remove confirm for 'lib unshare' 2015-04-22 15:47:25 +08:00
Daniel Pan
9a25a52976 [backbone] Merge into one library app 2015-04-22 15:31:49 +08:00