5310 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
lian	160963c272	update audit when view file via shared dir	2016-05-18 17:11:56 +08:00
llj	d15fb971f9	[side nav] improvement	2016-05-18 14:48:23 +08:00
zhengxie	c4fb7d51b4	[tests] Update tests	2016-05-17 18:14:17 +08:00
zhengxie	f12215ec5e	[shib] Fix shib complete url bug	2016-05-17 17:48:57 +08:00
Daniel Pan	87c6b613c5	Merge pull request #1192 from haiwen/user-info-traffic ... rm hyperlink of traffic in user info popup	2016-05-17 15:40:28 +08:00
lian	3aad5fdbdf	rm hyperlink of traffic in user info popup	2016-05-17 15:10:31 +08:00
Daniel Pan	4e0a5c5e05	Merge pull request #1191 from haiwen/admin-user-info ... add account view to sysadmin app router	2016-05-17 14:46:28 +08:00
lian	ca1a817dbd	add account view to sysadmin app router	2016-05-17 14:09:24 +08:00
Daniel Pan	702077bd0e	Merge pull request #1189 from haiwen/improve-nav-description ... Improve nav description	2016-05-17 12:20:10 +08:00
llj	566c19654e	modified 'side nav'; clean css	2016-05-17 12:05:54 +08:00
Shuai Lin	aa41bb9bc3	travis ci: download phantomjs from bintray instead of bitbucket.	2016-05-17 11:11:18 +08:00
Daniel Pan	2425d58f41	Merge pull request #1187 from haiwen/table ... [CSS] modified 'table', removed backbone.css	2016-05-17 11:02:55 +08:00
llj	12accf7240	[dir view] modified column width of the table	2016-05-17 10:26:33 +08:00
llj	7eb1e1d132	[CSS] modified 'table', removed backbone.css	2016-05-16 17:08:21 +08:00
Daniel Pan	83a537edf6	clean css	2016-05-15 19:25:54 +08:00
Daniel Pan	8b5e5a52de	Improve navigation descriptions	2016-05-15 16:58:30 +08:00
Daniel Pan	251ebab339	Merge pull request #1184 from haiwen/side-nav-footer ... Side nav	2016-05-13 20:17:24 +08:00
llj	5a0e8f315d	fixed 'help'; rm footer.html	2016-05-13 20:13:49 +08:00
llj	c51b340eff	rm pub_base.html	2016-05-13 20:13:49 +08:00
llj	72a4cde6f7	fixed 'side-nav' for pages; fixed 'help'	2016-05-13 20:13:49 +08:00
Daniel Pan	0c6e50818e	Add about dialog	2016-05-13 20:11:20 +08:00
Daniel Pan	134cef775a	Add nav footer	2016-05-13 20:11:20 +08:00
Daniel Pan	9c4e1e57e8	Merge pull request #1186 from haiwen/full-screen-fix ... [full screen] shared dir/file view, sysadmin: fix	2016-05-13 18:31:23 +08:00
xiez	80a3b1e7d7	Merge pull request #1185 from haiwen/share-link-upload ... remember username when upload file from upload-link	2016-05-13 16:26:11 +08:00
zhengxie	2e4839dcf1	[test] Update test	2016-05-13 16:17:55 +08:00
llj	fde0bdb9d9	[full screen] shared dir/file view, sysadmin: fix	2016-05-13 16:10:05 +08:00
lian	97a39ead0d	remember username when upload file from upload-link	2016-05-13 14:46:20 +08:00
Daniel Pan	671186dd60	Merge pull request #1163 from haiwen/full-screen ... Full screen	2016-05-12 10:57:20 +08:00
llj	b421783eab	[side nav] improvement	2016-05-12 10:18:22 +08:00
llj	c9c673d832	[dir view] improved details	2016-05-11 18:29:01 +08:00
llj	2e9c7170c3	rm myhome_base.html	2016-05-11 18:09:32 +08:00
llj	7dd8a684d2	modified pages: replaced myhome_base.html with base.html	2016-05-11 17:36:15 +08:00
llj	d0e86965fc	fix ui detail	2016-05-11 16:55:41 +08:00
zhengxie	13cc30c33c	Update locales and add missing trans context	2016-05-11 10:36:54 +08:00
llj	1c68ac92ff	fix .btn-link	2016-05-10 18:05:51 +08:00
llj	35f7389227	layout: fix pages; rm unused code & files	2016-05-10 17:11:35 +08:00
Daniel Pan	45ced42002	Merge pull request #1182 from haiwen/share-link ... update share link api url to make it more RESTful	2016-05-10 13:50:05 +08:00
lian	7fc60fb5cc	update share link api url to make it more RESTful	2016-05-10 10:44:28 +08:00
Daniel Pan	ed173f5a56	Merge pull request #1181 from haiwen/repo-history-change ... rm encrypted repo password check when get repo history	2016-05-09 15:55:05 +08:00
lian	2d7f2a8416	rm encrypted repo password check when get repo history	2016-05-09 15:01:35 +08:00
llj	d5bc279ffc	UI fix	2016-05-09 14:34:09 +08:00
Daniel Pan	b41333902b	Merge pull request #1179 from haiwen/uploadblks ... [api2] Add api to check missing blocks before uploading	2016-05-07 16:27:27 +08:00
Daniel Pan	1c860a9590	Merge pull request #1178 from haiwen/activities-api ... add avatar_url info when get activities	2016-05-07 11:50:24 +08:00
lian	93befba419	add avatar_url info when get activities	2016-05-07 11:48:26 +08:00
xiez	44a01ea6aa	Merge pull request #1175 from haiwen/update-trans-string ... update trans string when share repo to group	2016-05-07 10:25:34 +08:00
zhengxie	c2f07f22d1	[i18n] Update settings.html and source file	2016-05-06 17:04:34 +08:00
zhengxie	73ae8b1399	[i18n] Update source file	2016-05-06 16:37:33 +08:00
lian	6665908bca	rm console log	2016-05-06 15:27:55 +08:00
Daniel Pan	45a634b3be	Merge pull request #1176 from haiwen/fix-group-transfer ... Fix group transfer	2016-05-06 15:09:04 +08:00
lian	e71ca6d84b	unset admin after transfer success	2016-05-06 14:52:28 +08:00