5247 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
llj	6ff2efb597	[dir private share] split into user/group share	2015-07-14 11:03:05 +08:00
Daniel Pan	0df9194a55	Merge pull request #715 from haiwen/office-preview-xls-embedded-images ... several improvements to office preview	2015-07-13 22:27:19 +08:00
Shuai Lin	99a1347ade	remove debug print	2015-07-13 13:57:42 +08:00
Shuai Lin	00142ef4ea	improve open documents online preview in pro edition	2015-07-13 13:56:36 +08:00
Shuai Lin	fda0df7f10	[office preview] fix fetching images embedded in xls files	2015-07-13 13:56:35 +08:00
xiez	d0b35a75be	Merge pull request #714 from haiwen/org-activity-api ... [web-api] add multi-tenancy check when get evnets	2015-07-13 11:58:17 +08:00
zhengxie	61dff076d4	Fix dir/file api path not exists error	2015-07-13 11:56:09 +08:00
lian	a23050be41	[web-api] add multi-tenancy check when get evnets	2015-07-13 10:57:31 +08:00
llj	1a406f9b26	[lib/dir/file sort] bugfix for new interaction	2015-07-11 14:51:26 +08:00
Daniel Pan	3882bc1806	Merge pull request #711 from haiwen/remove-pub-repo ... remove pub group tab	2015-07-11 14:46:53 +08:00
lian	2b95f4021a	remove pub group tab	2015-07-11 14:26:43 +08:00
llj	e426ba0aa8	Merge pull request #709 from haiwen/file_view ... [file view] modified shared/history file view ui, cleaned up CSS	2015-07-11 10:39:09 +08:00
llj	94d954eea4	[file view] cleaned up CSS ... Conflicts: media/css/seahub.css	2015-07-11 10:24:01 +08:00
llj	2a5d97706f	redesigned 'history file view'	2015-07-11 10:18:36 +08:00
llj	33def43b2d	[shared file view] redesigned 'header'	2015-07-11 10:18:15 +08:00
Daniel Pan	490acfb33c	Merge pull request #707 from haiwen/rm_seaf ... remove 'seaf' file	2015-07-10 17:56:05 +08:00
llj	b1e9dd0360	remove 'seaf' file	2015-07-10 17:47:10 +08:00
zhengxie	0f65ddfae5	Fix forbiden issue in dir upload link	2015-07-10 16:32:48 +08:00
llj	7cb20817bb	Merge pull request #705 from haiwen/user-profile ... redesign of user profile	2015-07-10 12:16:58 +08:00
llj	33b8b673aa	[user profile] improvement & clean up code	2015-07-10 11:59:45 +08:00
patrickgao	f9282585b8	file sorting alternation	2015-07-09 17:16:10 +08:00
zhengxie	a47a15e5e3	Fix license parsing bug in fastcgi mode	2015-07-09 15:49:28 +08:00
patrickgao	f3ebab71ca	optimization of user profiles	2015-07-09 11:55:39 +08:00
Daniel Pan	03b82ce655	Merge pull request #695 from haiwen/IE8 ... Ie8	2015-07-09 11:13:14 +08:00
Daniel Pan	f5a465eb79	Merge pull request #697 from haiwen/rm_filePrivateShare ... remove 'file private share'	2015-07-09 11:12:10 +08:00
zhengxie	2cd615d561	Fix user last login duplicate error v4.2.4-pro	2015-07-08 14:47:57 +08:00
Daniel Pan	defe77e7ee	Merge pull request #701 from haiwen/office-preview-perm-check ... fixed office preview permission check	2015-07-08 14:39:14 +08:00
zhengxie	fbeb233865	Merge branch '4.2'	2015-07-08 13:49:44 +08:00
Shuai Lin	cc225f3bb0	fixed office preview permission check	2015-07-08 10:33:07 +08:00
llj	516779defb	remove 'file private share' & 'private shared files'	2015-07-07 17:35:23 +08:00
llj	ec65bb0b31	[IE] modified shared_upload_link page for IE	2015-07-07 16:22:08 +08:00
zhengxie	45c16e9a93	[api2] Add tests and remove unused code v4.2.3-pro	2015-07-07 15:49:34 +08:00
xiez	7a1b16443e	Merge pull request #692 from haiwen/open-via-client ... remove open via client	2015-07-07 15:28:01 +08:00
lian	143eebddf6	remove open via client	2015-07-07 15:26:17 +08:00
zhengxie	6a5290866a	[dist] Update locales and dist	2015-07-07 14:08:43 +08:00
zhengxie	506749b4c7	[profile] Handle multiple records error for detailed profile	2015-07-07 14:01:55 +08:00
Daniel Pan	7dcac275b8	Merge pull request #682 from haiwen/open-via-client ... only show open-via-client in pro version	2015-07-07 13:49:17 +08:00
Daniel Pan	82cd60a3aa	Merge pull request #686 from haiwen/add-org-api ... update add-org-api	2015-07-07 13:48:37 +08:00
Daniel Pan	43ab21c845	Merge pull request #689 from haiwen/star-file ... fix bug when unstar a file	2015-07-07 13:46:19 +08:00
lian	1f75aa2b62	update add org api	2015-07-07 09:54:38 +08:00
lian	20c7358ef9	fix bug when unstar a file	2015-07-06 14:43:45 +08:00
zhengxie	4c414b735c	Update dist	2015-07-06 13:30:53 +08:00
zhengxie	2c246acf0f	[profile] Update user profile v4.2.2-pro	2015-07-03 16:01:16 +08:00
zhengxie	8725d74029	[dist] Update	2015-07-03 14:45:03 +08:00
zhengxie	c90394bb08	Merge branch '4.2'	2015-07-03 10:58:27 +08:00
Daniel Pan	457147ff78	Merge pull request #684 from haiwen/add-org-api ... [web-api] add organization	2015-07-02 18:50:25 +08:00
llj	63a975bf3d	[dir.js] modified for IE8	2015-07-02 17:38:36 +08:00
llj	205f5486bb	[common.js] modified for IE8	2015-07-02 17:14:31 +08:00
lian	5f666bbf86	[web-api] add organization	2015-07-02 16:34:08 +08:00
patrickgao	0d837b0600	remove sharing-files	2015-07-02 14:00:42 +08:00