Commit Graph

709 Commits

Author SHA1 Message Date
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
Tan Jiang
c45a3d205b Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-17 13:45:21 +08:00
Wenkai Yin
8845331d60 Merge pull request #239 from ywk253100/sync_image
Sync image
2016-05-17 13:45:03 +08:00
Wenkai Yin
310460fa68 Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-05-17 13:39:52 +08:00
Tan Jiang
f9b6b2f604 merge with master 2016-05-17 13:36:21 +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
yhua123
0c75672f59 Update Dockerfile 2016-05-17 11:24:02 +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
yhua123
18254b9170 Create rsyslog.conf
Using static 'rsyslog.conf' instead 'sed' command in Dockerfile, this is the modified config file.
2016-05-17 10:09:34 +08:00
int32bit
36f17ef1e1 Configure Harbor to support multiple storage backend 2016-05-17 09:24:21 +08:00
Tan Jiang
bb3bebac13 dao methods for querying policy and jobs 2016-05-16 19:34:24 +08:00
int32bit
5e3d3afb11 Configure Harbor as a mirror registry 2016-05-16 18:13:28 +08:00
wemeya
facfb03d15 change dao_test file 2016-05-16 18:08:50 +08:00
wemeya
9d1a9c31c2 change dao/porject.go file 2016-05-16 18:02:39 +08:00
wemeya
36e6f5f732 change dao/porject.go file 2016-05-16 17:57:54 +08:00
wemeya
cf08ed8437 change dao_test file 2016-05-16 17:50:27 +08:00
kun wang
1132e081b9 Merge pull request #225 from Erkak/master
Added support of Russian language
2016-05-16 17:44:47 +08:00
wemeya
ec59807963 change dao_test file 2016-05-16 17:42:36 +08:00
wemeya
9017fe2b56 change code for statistics api and project detail api 2016-05-16 17:31:38 +08:00
wemeya
30f0081e3f Merge remote-tracking branch 'upstream/master' 2016-05-16 17:29:56 +08:00
Daniel Jiang
de91b62443 Merge pull request #224 from saga92/master
fill sysadmin_flag&update_time&add test function
2016-05-16 16:40:16 +08:00
Daniel Jiang
f2db860021 Merge pull request #230 from ywk253100/auth_of_api
add authtication to repository API
2016-05-16 16:34:39 +08:00
Wenkai Yin
4641f2b89f add authtication to repository API 2016-05-16 14:39:57 +08:00
Wenkai Yin
5e5fc9b2cb fixes 2016-05-16 13:57:30 +08:00
wemeya
fa41c6aa17 Merge remote-tracking branch 'upstream/master' 2016-05-16 10:57:08 +08:00
Daniel Jiang
c95fbb6e3f Merge pull request #226 from reasonerjt/job-service
refactor, associate statemachine to worker and reuse it
2016-05-13 21:45:33 +08:00
Tan Jiang
dd4c346826 refactor, associate statemachine to worker and reuse it 2016-05-13 21:43:17 +08:00
Tan Jiang
0e4d358bd7 Merge branch 'master' into job-service 2016-05-13 18:56:40 +08:00
Nagarjun
7b7c1fbe76 email field data type size changed to 128 characters from 30 characters 2016-05-13 18:54:44 +08:00
Wenkai Yin
0e7daf9bd4 guarantee the read-write operation for cache token is atomic 2016-05-13 18:54:44 +08:00
Wenkai Yin
81d2d515c9 fix golint errors 2016-05-13 18:54:44 +08:00
Wenkai Yin
be4601b2fc remove useless code 2016-05-13 18:54:44 +08:00
Wenkai Yin
1144a1a289 add ut for registry client 2016-05-13 18:54:44 +08:00
xiahaoshawn
b673c98f31 update https rewite url 2016-05-13 18:54:44 +08:00
Erkak
da00ed3690 Added support of Russian language 2016-05-13 13:37:11 +03:00
Erkak
79e7a16f94 Added support of Russian language 2016-05-13 13:35:45 +03:00
Erkak
968044ca39 Added support of Russian language 2016-05-13 13:35:13 +03:00
Erkak
6d57c6c090 Added support of Russian language 2016-05-13 13:34:46 +03:00
Erkak
b7c287b295 Added support of Russian language 2016-05-13 13:33:51 +03:00
Daniel Jiang
605c209bca Merge pull request #197 from nagarjung/master
email field data type size changed to 128 characters from 30 characters
2016-05-13 18:33:11 +08:00
Erkak
6a654fe827 Added support of Russian language 2016-05-13 13:31:09 +03:00