Commit Graph

1565 Commits

Author SHA1 Message Date
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
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
Daniel Jiang
954c38a225 Merge pull request #668 from yhua123/master
add api testing framework
2016-08-10 15:29:54 +08:00
yhua
74702a0be7 add api testing framework 2016-08-10 14:34:56 +08:00
kun wang
b6884900d2 Merge pull request #663 from wknet123/dev
Add pagination to UI.
2016-08-09 11:12:28 +08:00
kun wang
6fe9167e4b Merge pull request #660 from wknet123/master
Updates for toggling project publicity and blocking user change admin role by oneself.
2016-08-09 10:57:42 +08:00
Haining Henry Zhang
a3fc9de391 Merge pull request #628 from ywk253100/docs
Add guide about configuring Harbor to listen on a customized port
2016-08-08 21:23:15 +08:00
kunw
160e76646e updates for comparison expression. 2016-08-08 18:25:18 +08:00
kunw
82f6598aa3 updates for toggling project publicity and block user remove admin role with himself. 2016-08-08 18:09:31 +08:00
kunw
55243f274c Merge remote-tracking branch 'upstream/dev' into dev 2016-08-08 18:05:04 +08:00
kunw
a7f0037156 updates for toggling project publicity and block user remove admin role with himself. 2016-08-08 17:31:57 +08:00
kunw
5cf6f99025 update for pagination in repository, replication and logs. 2016-08-08 17:29:42 +08:00
Daniel Jiang
475c812d9a Merge pull request #657 from ywk253100/user
sys admin can not delete himself - API update
2016-08-08 14:18:17 +08:00
Wenkai Yin
5079a8d20c sys admin can not delete himself 2016-08-08 12:42:30 +08:00
Daniel Jiang
f69c4b67a7 Merge pull request #656 from ywk253100/master_d
make token expiratioin configurable
2016-08-08 12:22:41 +08:00
Wenkai Yin
24471c9bbb add guide about customizing port 2016-08-08 11:29:59 +08:00
Wenkai Yin
fe34a6a110 make token expiratioin configurable 2016-08-08 11:21:48 +08:00
kunw
e44d445ee3 update for toggling page button. 2016-08-06 17:35:57 +08:00
kunw
8245eeaec9 updates for paginator toggling previous and next. 2016-08-06 17:19:29 +08:00
kunw
066d108012 updates paginator with following the restriction mode 2016-08-06 16:12:48 +08:00
kunw
d4035e0ec3 updates for paginator and pagination in logs. 2016-08-06 15:11:20 +08:00
kunw
f44e6f5991 add paginator, add pagination to the logs. 2016-08-05 20:37:58 +08:00
Daniel Jiang
08722e2166 Merge pull request #651 from reasonerjt/dev
improve test coverage for dao
2016-08-05 16:44:58 +08:00
Tan Jiang
64be247565 improve test coverage for dao 2016-08-05 16:24:49 +08:00
Daniel Jiang
4fc9373fec Merge pull request #618 from ywk253100/security_check_on_jobservice
add security check on job service
2016-08-05 14:53:38 +08:00
Daniel Jiang
7efe419518 Merge pull request #649 from reasonerjt/dev
Update decrypt for backward compatibility
2016-08-05 14:53:22 +08:00
Daniel Jiang
77448551ee Merge pull request #644 from wemeya/new-ui-with-sync-image
Update configure_https.md
2016-08-05 14:00:50 +08:00
Daniel Jiang
f5e6fb2bf3 Merge pull request #647 from ScorpioCPH/dev-sed-fix
Add comments to fix sed compatibility issue between BSD and GNU versions
2016-08-05 14:00:39 +08:00
Tan Jiang
fde17725d5 Update decrypt for backward compatibility 2016-08-05 13:47:46 +08:00