Commit Graph

613 Commits

Author SHA1 Message Date
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
0b5d736d15 Merge pull request #249 from wemeya/master
fix a sql bug
2016-05-19 14:54:59 +08:00
wemeya
973ee40fdf fix a sql bug 2016-05-19 14:40:09 +08:00
Wenkai Yin
91ef155da5 Merge pull request #207 from wemeya/master
add statistics api for projects and repositories
2016-05-19 12:06:22 +08:00
wemeya
1f44e2aa8b add a new func to reuse code 2016-05-18 17:48:05 +08:00
wemeya
2cd1226ac8 Merge remote-tracking branch 'upstream/master' 2016-05-18 17:46:57 +08:00
Daniel Jiang
311ba1d40c Merge pull request #240 from saga92/master
add database schema changelog.md
2016-05-18 15:32:36 +08:00
wemeya
155f8dc1a8 modify error message 2016-05-18 15:07:54 +08:00
saga92
0f73f1e376 Update changelog.md 2016-05-18 14:47:57 +08:00
wemeya
3e1bf8c862 change code for statistics and project api 2016-05-18 14:36:20 +08:00
saga92
681f94727d Merge branch 'master' of https://github.com/saga92/harbor 2016-05-18 11:35:56 +08:00
saga92
04d8fe87e6 Update changelog.md 2016-05-18 11:02:53 +08:00
saga92
97b7690cb7 Update changelog.md 2016-05-18 11:00:32 +08:00
saga92
d4ebe33907 change comment 2016-05-18 10:57:47 +08:00
wemeya
89fce7ed22 change comment and add sql fields 2016-05-18 10:30:55 +08:00
wemeya
0e52a68aa4 Merge remote-tracking branch 'upstream/master' 2016-05-18 10:30:07 +08:00
Haining Henry Zhang
413247b60a Merge pull request #244 from hainingzhang/master
update document
2016-05-17 08:39:40 -07:00
Henry Zhang
9f1977204b update docs 2016-05-17 22:42:22 +08:00
Henry Zhang
7a150c57c6 Merge remote-tracking branch 'hupstream/master' 2016-05-17 22:33:41 +08:00
Henry Zhang
e371b729a6 update docs 2016-05-17 22:04:16 +08:00
Henry Zhang
6b489bb689 update README and installation guide 2016-05-17 17:32:10 +08:00
wemeya
af200d6e4c change func parameter according to travis CI 2016-05-17 17:10:31 +08:00
wemeya
313887967e change api for statistics and project 2016-05-17 17:03:40 +08:00
wemeya
f6375414b1 Merge remote-tracking branch 'upstream/master' 2016-05-17 17:02:28 +08:00
kun wang
dc36ac8139 Merge pull request #241 from xiaods/master
Fix: sed compatible with mac os env
2016-05-17 16:17:36 +08:00
saga92
66b6c9d888 Update changelog.md 2016-05-17 14:33:56 +08:00
Deshi Xiao
6c6a694668 Fix: sed compatible with mac os env
sed -i need explicit extention on mac, but linux is optinoal.
so for developer need a compatible request on macos
2016-05-17 14:21:23 +08:00
saga92
9170581d21 Merge remote-tracking branch 'harbor/master' 2016-05-17 14:08:26 +08:00
wemeya
5921717ff0 Merge remote-tracking branch 'upstream/master' 2016-05-17 14:05:35 +08:00
saga92
9ea0d51984 Merge branch 'master' of https://github.com/saga92/harbor 2016-05-17 14:01:59 +08:00
saga92
50d8841d69 add db schema changelog 2016-05-17 14:01:38 +08:00
Daniel Jiang
25970419e8 Merge pull request #235 from int32bit/master
Update document to support mirror registry and multiple storage backend
2016-05-17 12:06:05 +08:00
int32bit
bbb400ed50 Resolve the merge conflict 2016-05-17 12:01:47 +08:00
Daniel Jiang
e79c1ac804 Merge pull request #213 from dieswaytoofast/master
Cleanup some of the documentation
2016-05-17 11:19:22 +08:00
wemeya
fbe41dd2c3 Merge remote-tracking branch 'upstream/master' 2016-05-17 11:01:29 +08:00
int32bit
36f17ef1e1 Configure Harbor to support multiple storage backend 2016-05-17 09:24:21 +08:00