Commit Graph

652 Commits

Author SHA1 Message Date
root
d66a8f913e merge master 2016-06-02 13:41:52 +08:00
wemeya
267152f8e6 change code according to review 2016-06-01 19:29:08 +08:00
wemeya
ccbe297bba change code according to travis CI 2016-06-01 18:12:06 +08:00
wemeya
1c9162559c change code 2016-06-01 18:07:33 +08:00
wemeya
c972406d0f change code 2016-06-01 18:02:32 +08:00
wemeya
9b5cb57d2a change code according to travis CI 2016-06-01 17:57:33 +08:00
wemeya
af55312664 change code for review 2016-06-01 17:51:06 +08:00
wemeya
4d4ab9e408 Merge remote-tracking branch 'upstream/master' 2016-06-01 17:02:02 +08:00
wemeya
ffd58c0f2d add api to list top 10 repos 2016-06-01 17:01:43 +08:00
kun wang
54e54433e1 Merge pull request #283 from liubin/add-support-for-Japanese
add Japanese support
2016-06-01 16:33:13 +08:00
Wenkai Yin
8206ef2dcb Merge pull request #296 from ywk253100/bug_fix_get_member
bug fix: the length should be 0 when initialize a slice
2016-06-01 13:52:07 +08:00
Wenkai Yin
07c7ce403c bug fix: the length should be 0 when initialize a slice 2016-06-01 13:47:23 +08:00
wemeya
498d2e629a change code according to review 2016-06-01 12:27:26 +08:00
wemeya
0aade05222 change code according to comment 2016-05-31 17:38:51 +08:00
wemeya
97b5d16e26 change dao_test file 2016-05-30 17:22:38 +08:00
wemeya
53edb50eef modify code to search logs only relevant to the user 2016-05-30 17:11:39 +08:00
bin liu
bf6c8e5a44 remove tail comma 2016-05-30 14:42:23 +08:00
bin liu
3470366199 add Japanese support 2016-05-27 23:20:26 +08:00
wemeya
b29a41034c modify code according to review 2016-05-27 17:54:25 +08:00
wemeya
e4bffb59da Merge remote-tracking branch 'upstream/master' 2016-05-27 17:32:54 +08:00
Wenkai Yin
a4d318dffe Merge pull request #274 from ywk253100/modify_authentication_of_repository_api
bug fix: create repository client with credential when basic auth is used
2016-05-27 12:25:35 +08:00
Wenkai Yin
119dd50418 buf fix: create repository client with credential when basic auth is used 2016-05-27 12:18:12 +08:00
wemeya
b1adf74913 modify router 2016-05-26 18:06:37 +08:00
wemeya
4314c244e5 add instructions for new added api 2016-05-26 16:48:49 +08:00
Wenkai Yin
f7de4c5841 Merge pull request #255 from ywk253100/modify_authentication_of_repository_api
Some modifications for implements of API
2016-05-26 14:05:53 +08:00
Wenkai Yin
73f69254e2 Merge branch 'master' into modify_authentication_of_repository_api 2016-05-26 14:01:09 +08:00
Wenkai Yin
6b2b6dedd8 support Get /api/projects/:id 2016-05-26 13:59:03 +08:00
Wenkai Yin
2a0571fc64 remove goto 2016-05-26 13:26:10 +08:00
Daniel Jiang
14ce697025 Merge pull request #238 from yhua123/patch-1
Update for using static 'rsyslog.conf' instead command 'sed' in  Dockerfile of  the log container
2016-05-26 13:01:14 +08:00
Daniel Jiang
78be8eec65 Merge pull request #271 from ywk253100/buf_fix_268
fix #268
2016-05-26 12:38:21 +08:00
Wenkai Yin
535bea1b6b fix #268 2016-05-25 17:22:33 +08:00
wemeya
bf3e6ed8cf modify conficts 2016-05-25 15:45:30 +08:00
wemeya
ad9d80aee9 modify merge confict 2016-05-25 15:21:27 +08:00
wemeya
25a88f8e29 change code for user and logapi 2016-05-25 14:21:01 +08:00
Daniel Jiang
db908edf87 Merge pull request #256 from saga92/master
add orm singleton
2016-05-24 11:01:19 +08:00
saga92
de51b247f7 make singleton thread safe 2016-05-24 09:41:34 +08:00
wemeya
f3ae27649b modify test code 2016-05-23 14:24:42 +08:00
wemeya
06c3f59d03 modify code as travis ci required 2016-05-20 18:00:30 +08:00
wemeya
27efcc133d modify code as travis ci required 2016-05-20 17:56:01 +08:00
wemeya
45136996eb modify code as travis ci required 2016-05-20 17:39:49 +08:00
saga92
2f60bf4f1f add unit test of GetOrmer 2016-05-20 17:35:16 +08:00
wemeya
a6fd1a5050 modify code as travis ci required 2016-05-20 17:12:23 +08:00
wemeya
888604fb0d modify code as travis ci required 2016-05-20 17:03:50 +08:00
wemeya
7c74b16eef add api for listing recent logs and changing user profile 2016-05-20 16:56:12 +08:00
saga92
867911e96e format comment 2016-05-20 16:54:24 +08:00
saga92
145e3537ab add orm singleton 2016-05-20 16:36:10 +08:00
Wenkai Yin
0b30d04455 sort tags by name 2016-05-20 14:02:44 +08:00
Wenkai Yin
1919f19459 remove useless codes 2016-05-20 11:38:24 +08:00
Wenkai Yin
7920803735 handle project name is nil 2016-05-20 11:32:12 +08:00
Wenkai Yin
4b27ef7a25 Merge branch 'master' into modify_authentication_of_repository_api 2016-05-20 11:18:33 +08:00