Commit Graph

1592 Commits

Author SHA1 Message Date
wy65701436
428d429e17 add testing code, fix issue. 2016-08-31 02:38:06 -07:00
wy65701436
b081909de7 add testing code. 2016-08-31 02:03:47 -07:00
wy65701436
aba1a33f46 Add repo into DB, update code per comments 2016-08-29 06:21:49 -07:00
Wenkai Yin
4e065bba95 Merge pull request #727 from ywk253100/m_t
Merge lost commits into branch dev
2016-08-29 16:01:17 +08:00
Wenkai Yin
c98a7ebd9d Merge branch 'project_deletion' into m_t 2016-08-29 15:26:41 +08:00
Wenkai Yin
4977a2c77e Merge pull request #721 from ywk253100/page
Add pagination support for listing projects
2016-08-29 11:37:20 +08:00
Daniel Jiang
72ddf8a10c Merge pull request #722 from ywk253100/swa
Add pagination and repository details to swagger
2016-08-29 10:52:10 +08:00
Wenkai Yin
531f36810c add pagination and repository details 2016-08-26 14:32:20 +08:00
Wenkai Yin
a592ed1204 add pagination support for listing projects 2016-08-26 13:51:39 +08:00
Daniel Jiang
5de4735e01 Merge pull request #712 from yhua123/dev
change branch from master to dev for coveralls in README.md
2016-08-25 11:44:27 +08:00
yhua
7490ce5586 change branch from master to dev for coveralls in README.md 2016-08-24 14:17:05 +08:00
Tan Jiang
78c807545d sync master 2016-08-24 13:54:31 +08:00
Daniel Jiang
bd2aa49fe0 Merge pull request #711 from reasonerjt/master
update compose template, introduce support for photon
2016-08-24 11:46:19 +08:00
Tan Jiang
73b5ea0916 update compose template, introduce support for photon 2016-08-23 17:57:12 +08:00
Wenkai Yin
c546c3a48b support project deletion 2016-08-23 15:56:30 +08:00
kun wang
14640c59dc Merge pull request #702 from wknet123/master
add resources for UI offline deploying.
2016-08-23 13:58:23 +08:00
kunw
50a2a44873 update for bypassing session check list of UI. 2016-08-23 11:58:20 +08:00
kunw
40e30221d3 add resources for UI offline deploying. 2016-08-22 16:24:12 +08:00
Haining Henry Zhang
d5d4c1424b Merge pull request #697 from hainingzhang/master
update readme file
2016-08-21 09:25:34 +08:00
Henry Zhang
85c63eb626 update README 2016-08-20 22:58:00 +08:00
Henry Zhang
14d2d7eb42 update README 2016-08-20 22:50:21 +08:00
Daniel Jiang
d964c1ed82 Merge pull request #690 from ywk253100/dev_ut
Add UT for package utils
2016-08-20 12:05:35 +08:00
Wenkai Yin
7538bbf066 UT for package utils 2016-08-19 17:09:28 +08:00
Wenkai Yin
e0649f6d69 Merge pull request #691 from ywk253100/policy_deletion
Bug fix for policy deletion: read wrong column name
2016-08-18 12:03:02 +08:00
Wenkai Yin
2d91b8c3fd bug fix for policy deletion: wrong column name 2016-08-18 11:43:45 +08:00
Daniel Jiang
0da29e5305 Merge pull request #688 from reasonerjt/dev
jsminify's basedir should be configurable
2016-08-17 16:54:32 +08:00
Daniel Jiang
2cb2175940 Merge pull request #682 from ywk253100/policy_deletion
Support policy deletion
2016-08-17 16:54:15 +08:00
Tan Jiang
fd0a6f8b1d Merge remote-tracking branch 'upstream/dev' into dev 2016-08-17 16:17:56 +08:00
Tan Jiang
8302892bfb jsminify's basedir should be configurable 2016-08-17 16:17:17 +08:00
kun wang
dd0a5b3576 Merge pull request #685 from wknet123/master
Update for i18n messages.
2016-08-16 17:51:49 +08:00
kunw
74f459c0b5 Update for i18n messages. 2016-08-16 17:39:34 +08:00
Daniel Jiang
055a1438d4 Merge pull request #683 from yhua123/master
add new structs from swagger auto gen code
2016-08-15 16:43:17 +08:00
yhua
60cae7357f add new structs from swagger auto gen code 2016-08-15 14:36:42 +08:00
Daniel Jiang
298934a56c Merge pull request #684 from ywk253100/swagger
Merge branch master into dev
2016-08-15 14:27:10 +08:00
Wenkai Yin
4ef5c1f98a Merge master into dev
Conflicts:
	.travis.yml
	Dockerfile.job
	vendor/vendor.json
2016-08-15 11:30:06 +08:00
Wenkai Yin
ff348be048 1. support policy deletion 2. bug fix: missing semicolon in js 2016-08-12 17:59:25 +08:00
Daniel Jiang
ddd13145b4 Merge pull request #678 from yhua123/patch-2
Update swagger.yaml
2016-08-12 17:22:38 +08:00
yhua123
fbd0c03b93 Update swagger.yaml
update repo_id
2016-08-12 15:12:35 +08:00
Daniel Jiang
76ba31d045 Merge pull request #681 from reasonerjt/vendor-rework
rebuild vendor directory
2016-08-12 15:03:23 +08:00
Tan Jiang
3f26bca5ed rebuild vendor directory 2016-08-12 14:50:00 +08:00
Daniel Jiang
361f6bd393 Merge pull request #679 from ywk253100/master_d
bug fix: check whether project is nil befere reading its properties
2016-08-12 14:39:27 +08:00
Daniel Jiang
13b859f58b Merge pull request #673 from ywk253100/dev_ut
add UT for package utils
2016-08-12 14:38:42 +08:00
Daniel Jiang
aef7dd553a Merge pull request #680 from reasonerjt/master
fixes #658
2016-08-12 14:37:36 +08:00
Daniel Jiang
71716ef06d fixes #658 2016-08-11 21:38:15 +08:00
Wenkai Yin
3d909bd0bd add UT for package utils 2016-08-11 17:58:17 +08:00
yhua123
b8eafdc74c Update swagger.yaml
add 0.3.0 new features' API
2016-08-11 17:39:36 +08:00
Daniel Jiang
ae368d1be1 Merge pull request #676 from yhua123/patch-2
Update .travis.yml
2016-08-11 16:35:18 +08:00
Wenkai Yin
98e399c8fe bug fix: check whether project is nil befere reading its properties 2016-08-11 14:11:45 +08:00
yhua123
0a0c8cea5d Update .travis.yml
update .travis.yml for docker & docker-compose upgrade
2016-08-10 17:18:47 +08:00
Tan Jiang
c683be1c64 merge with master 2016-08-10 15:34:23 +08:00