Commit Graph

110 Commits

Author SHA1 Message Date
kunw
86e13b6c02 Merge branch 'job-service' into new-ui-with-sync-image 2016-06-03 14:10:53 +08:00
Tan Jiang
bd223796b4 fix issue in travis 2016-06-01 13:28:02 +08:00
Tan Jiang
8817c24a27 Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-27 16:21:55 +08:00
Tan Jiang
9493b8c238 integrate jobservice into docker-compose template 2016-05-27 16:21:32 +08:00
kunw
8b9e1ebdee Merge branch 'master' into new-ui-with-sync-image 2016-05-26 18:52:35 +08:00
Wenkai Yin
d42359c679 Merge branch 'master' into sync_image 2016-05-26 14:05:14 +08:00
Tan Jiang
a2d2314708 add tags in db, and support tags in dao and job service api 2016-05-25 16:33:45 +08:00
Tan Jiang
0a2b9b320b remove job_log table 2016-05-24 11:08:49 +08:00
kunw
2bf1742ecb refactor i18n processing and sign-in validation. 2016-05-21 17:20:39 +08:00
Tan Jiang
f9b6b2f604 merge with master 2016-05-17 13:36:21 +08:00
kunw
b7ca941ca0 Merge branch 'newer-ui' into new-version-of-ui 2016-05-17 11:55:34 +08:00
yhua123
0c75672f59 Update Dockerfile 2016-05-17 11:24:02 +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
kun wang
1132e081b9 Merge pull request #225 from Erkak/master
Added support of Russian language
2016-05-16 17:44:47 +08:00
kunw
845abfbaff add some missing files. 2016-05-16 11:57:39 +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
xiahaoshawn
b673c98f31 update https rewite url 2016-05-13 18:54:44 +08: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
7493fccb24 Add support of Russian language 2016-05-13 13:25:53 +03:00
Daniel Jiang
d7c0bb66e2 Revert "introduce workerpool to handle jobs" 2016-05-13 14:49:12 +08:00
Daniel Jiang
6d6a353c1f Merge pull request #217 from xiahaoshawn/master
update https rewite url
2016-05-13 14:45:26 +08:00
Tan Jiang
fd0d291931 Merge branch 'master' into job-service 2016-05-12 17:44:17 +08:00
xiahaoshawn
6e217ba3cc update https rewite url 2016-05-12 14:18:34 +08:00
kunw
c9a305edcd Merge branch 'master' into newer-ui 2016-05-11 16:07:45 +08:00
kunw
b135cfcfbe updates on modal-dialog and others of UI 2016-05-11 15:57:52 +08:00
Tan Jiang
dbc20a57bc set the Host header to registry to include the port information 2016-05-11 14:25:22 +08:00
Tan Jiang
2752213ed1 Merge branch 'master' into job-service 2016-05-10 19:45:24 +08:00
Tan Jiang
4541ed27f0 job service rework 2016-05-10 19:38:50 +08:00
Daniel Jiang
7a16b15575 Merge pull request #199 from saga92/master
add data migration
2016-05-10 11:13:14 +08:00
saga92
9cf2525c10 fix bugs 2016-05-09 18:50:04 +08:00
saga92
85ad1392f8 add data migration module 2016-05-09 14:41:28 +08:00
Nagarjun
a98a786f8c email field data type size changed to 128 characters from 30 characters 2016-05-09 11:48:23 +05:30
Wenkai Yin
6373497e58 rollback 2016-05-05 16:24:08 +08:00
Wenkai Yin
e7e31dbb69 do not track them 2016-05-05 16:09:58 +08:00
Tan Jiang
8fba0b314f Merge branch 'master' into job-service 2016-05-03 13:52:50 +08:00
Wenkai Yin
2462405c1f Merge remote-tracking branch 'upstream/master'
Conflicts:
	Deploy/templates/ui/env
	api/repository.go
2016-05-03 10:33:02 +08:00
Wenkai Yin
5a7857b05f set cgo as the default DNS resolver 2016-04-29 18:19:09 +08:00
Wenkai Yin
60f5df1a80 set cgo as the default DNS resovler 2016-04-29 13:17:59 +08:00
hmwenchen
5e8a6a6d55 Merge remote-tracking branch 'origin/master' into feature/accesslog
Enlarge registry timeout
2016-04-27 20:38:04 +08:00
Tan Jiang
db15c2abc6 add timeout for notification in registry 2016-04-27 13:38:59 +08:00
kunw
2ab653c642 Merge branch 'master' into newer-ui 2016-04-27 00:46:29 +08:00
hmwenchen
f5b15e9f22 Merge remote-tracking branch 'origin/master' into feature/accesslog 2016-04-26 20:06:47 +08:00
Robin Naundorf
dc2d33a2bc
Added german locale 2016-04-26 13:21:31 +02:00
xiahaoshawn
8f1c74e086 update registry to 2.4.0 2016-04-26 14:52:10 +08:00
Tan Jiang
8d9d639cbf Merge branch 'master' into job-service 2016-04-25 17:53:41 +08:00
Daniel Jiang
7787cbad8d Merge pull request #137 from saga92/master
add customizing certificate feature into prepare file
2016-04-25 17:21:43 +08:00
saga92
3a5a0ca929 fix cfg 2016-04-25 16:18:50 +08:00
saga92
679875e67e fix bugs 2016-04-25 16:08:16 +08:00
kunw
76c77db807 adapt current code structure for UI development. 2016-04-25 14:31:05 +08:00