haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 10:26:17 +00:00
Code Issues Releases Wiki Activity
5,235 Commits 148 Branches 463 Tags
ed10512a534e4c80d76c735ae4ba97328a8abd8c
Commit Graph

5235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Pan
4f1a4aa492 Merge pull request #1210 from haiwen/search-user 
update search user api
 2016-05-26 14:13:05 +08:00
lian
08bb474d11 update search user api 2016-05-26 11:48:26 +08:00
zhengxie
0936f360bd Fix clear login attempts bug, and update login tests 2016-05-26 11:38:49 +08:00
Daniel Pan
2877dc481e Merge pull request #1207 from haiwen/feature/file_comment 
Feature/file comment
 2016-05-25 18:15:03 +08:00
llj
eb25765ebd [file view] changed 'discuss' to 'comment' and etc. 2016-05-25 18:06:17 +08:00
llj
73f92b22e5 [file view] discussion: fix & improvement 2016-05-25 15:28:02 +08:00
Daniel Pan
18ee06be50 Improve login function 2016-05-25 13:41:51 +08:00
zhengxie
2f3091093c Fix comment author issue 2016-05-25 11:48:09 +08:00
llj
f028564881 Merge pull request #1205 from haiwen/css-improve 
UI Improvement
 2016-05-25 10:48:48 +08:00
llj
f67865ea62 [file view] add 'discussion' 2016-05-24 17:53:29 +08:00
zhengxie
fe999b7559 [api2] Add user info to file comment obj 2016-05-23 17:51:23 +08:00
zhengxie
c19b781713 [file comment] Fix hash bug and improve sql 2016-05-23 17:51:23 +08:00
zhengxie
e8579d0742 [api] Add file comment endpoints 2016-05-23 17:51:23 +08:00
Daniel Pan
ee99d7aad8 Merge branch '5.1' 
Conflicts:
	seahub/group/templates/group/group_base.html
	seahub/templates/home_base.html
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/js/templates.html
	seahub/templates/libraries.html
	seahub/templates/pub_base.html
	static/scripts/app/views/group-discussions.js
 2016-05-21 13:42:04 +08:00
Daniel Pan
ce2648e646 Merge pull request #1206 from haiwen/head-commt-id 
return head commit id info from repos api
 2016-05-21 13:27:48 +08:00
lian
e4ac653e34 return head commit id info from repos api 2016-05-21 12:12:01 +08:00
Daniel Pan
e8a60d3318 Merge pull request #1190 from haiwen/fix-travis-download-phantomjs 
travis ci: download phantomjs from bintray instead of bitbucket.
 2016-05-20 20:52:07 +08:00
Daniel Pan
ac436d44ae Improve about dialog 2016-05-20 15:42:59 +08:00
Daniel Pan
e4ccddcf2c Merge pull request #1204 from haiwen/fix 
fix
 2016-05-20 15:37:40 +08:00
llj
b1909735a8 fix 2016-05-20 15:25:40 +08:00
Daniel Pan
4e4b6d07ba small UI improvement 2016-05-20 15:02:29 +08:00
Daniel Pan
e6dcebaf36 Merge pull request #1202 from haiwen/nav-fix3 
side nav
 2016-05-20 11:03:34 +08:00
llj
9f23d16b37 [side nav] fix 2016-05-20 10:56:39 +08:00
Daniel Pan
eff99890a2 Improve nav 2016-05-19 17:46:08 +08:00
xiez
36e3ec2d73 Merge pull request #1198 from haiwen/share-link 
update audit when view file via shared dir
 2016-05-19 10:36:47 +08:00
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