Commit Graph

188 Commits

Author SHA1 Message Date
Wenkai Yin
96c9e4c202 bug fix: when no rows found, return nil not error 2016-06-15 11:29:14 +08:00
Wenkai Yin
db9347135c bug fix 2016-06-14 17:33:37 +08:00
Wenkai Yin
8f56e9fc4a Merge pull request #330 from ywk253100/sync_image
add modify policy
2016-06-13 17:54:05 +08:00
Wenkai Yin
bc0aa21441 add modify policy 2016-06-13 17:32:22 +08:00
Wenkai Yin
32857a9154 Merge pull request #329 from ywk253100/sync_image
filter policies by name and project ID
2016-06-13 16:57:43 +08:00
Wenkai Yin
39edccf549 filter policies by name and project ID 2016-06-13 16:49:46 +08:00
Wenkai Yin
784947a787 Merge pull request #328 from ywk253100/sync_image
Sync image
2016-06-13 14:40:25 +08:00
Wenkai Yin
82b4781571 update implements of FilterTargets() 2016-06-13 13:48:12 +08:00
Wenkai Yin
e05ff0373b update implements of FilterTargets() 2016-06-13 08:54:42 +08:00
Wenkai Yin
e5fe595f62 add test for FilterTargets() 2016-06-13 08:42:11 +08:00
Wenkai Yin
3bc41cc6d3 filter targets by name 2016-06-13 08:31:32 +08:00
wemeya
0147ec8d3b Merge remote-tracking branch 'upstream/job-service' into develop 2016-06-07 20:35:24 +08:00
Wenkai Yin
6788f891f1 add test for dao metod 2016-06-07 13:41:02 +08:00
wemeya
411ead21fc change code for review 2016-06-06 17:53:36 +08:00
Wenkai Yin
f4e6d048b2 add validation to create, update policies and targets 2016-06-06 17:31:47 +08:00
wemeya
9f16403a22 modify test code 2016-06-02 19:03:04 +08:00
wemeya
eb62beba31 modify merge conflicts 2016-06-02 17:57:39 +08:00
wemeya
389a6037d5 change code as the review reqired 2016-06-02 17:33:10 +08:00
root
d66a8f913e merge master 2016-06-02 13:41:52 +08:00
wemeya
267152f8e6 change code according to review 2016-06-01 19:29:08 +08:00
wemeya
1c9162559c change code 2016-06-01 18:07:33 +08:00
wemeya
c972406d0f change code 2016-06-01 18:02:32 +08:00
wemeya
af55312664 change code for review 2016-06-01 17:51:06 +08:00
wemeya
ffd58c0f2d add api to list top 10 repos 2016-06-01 17:01:43 +08:00
wemeya
498d2e629a change code according to review 2016-06-01 12:27:26 +08:00
wemeya
0aade05222 change code according to comment 2016-05-31 17:38:51 +08:00
wemeya
97b5d16e26 change dao_test file 2016-05-30 17:22:38 +08:00
wemeya
53edb50eef modify code to search logs only relevant to the user 2016-05-30 17:11:39 +08:00
Tan Jiang
e53d2d9900 Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-30 15:53:55 +08:00
Tan Jiang
05069eeed1 clean up code, update API url of job service 2016-05-30 14:44:03 +08:00
Wenkai Yin
4f0e64c404 support job deletion 2016-05-27 18:46:07 +08:00
wemeya
b29a41034c modify code according to review 2016-05-27 17:54:25 +08:00
Wenkai Yin
1e09cf899b fix 2016-05-27 15:04:20 +08:00
Wenkai Yin
039d94c13d Merge branch 'master' into sync_image
Conflicts:
	api/repository.go
2016-05-26 14:12:26 +08:00
Wenkai Yin
73f69254e2 Merge branch 'master' into modify_authentication_of_repository_api 2016-05-26 14:01:09 +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
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
Wenkai Yin
55bc9de505 Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-05-24 15:03:44 +08:00
Tan Jiang
58e7ab95a4 merge with master 2016-05-24 13:20:11 +08:00
saga92
de51b247f7 make singleton thread safe 2016-05-24 09:41:34 +08:00
Tan Jiang
71b4dde8a9 Merge branch 'job-service' of https://github.com/vmware/harbor into job-service 2016-05-23 19:37:42 +08:00
Wenkai Yin
7449b3604c move target.go to api/ 2016-05-23 18:41:48 +08:00
Wenkai Yin
772280d4e3 add targets api 2016-05-23 16:48:55 +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
cc8a4cbdab Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-05-20 11:50:50 +08:00
Wenkai Yin
7920803735 handle project name is nil 2016-05-20 11:32:12 +08:00
Tan Jiang
fcd0de0ca0 Merge branch 'master' into job-service 2016-05-19 16:12:21 +08:00
Tan Jiang
4510bdb113 provide api to stop running jobs of a policy 2016-05-19 16:10:25 +08:00
wemeya
973ee40fdf fix a sql bug 2016-05-19 14:40:09 +08:00
Wenkai Yin
fa5dbeeaf5 add update method for replication target 2016-05-19 13:08:27 +08:00
wemeya
1f44e2aa8b add a new func to reuse code 2016-05-18 17:48:05 +08:00
wemeya
3e1bf8c862 change code for statistics and project api 2016-05-18 14:36:20 +08:00
wemeya
89fce7ed22 change comment and add sql fields 2016-05-18 10:30:55 +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
Tan Jiang
c45a3d205b Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-17 13:45:21 +08:00
Tan Jiang
bb3bebac13 dao methods for querying policy and jobs 2016-05-16 19:34:24 +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
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
Wenkai Yin
5e5fc9b2cb fixes 2016-05-16 13:57:30 +08:00
wemeya
2561371e37 change CI error 2016-05-13 16:46:25 +08:00
wemeya
d30fc97b3f modify code when project list length is 0 2016-05-13 16:39:22 +08:00
wemeya
8c35e6ffa2 change code for statistic and project repo_count, role_id api 2016-05-13 22:45:30 +08:00
Tan Jiang
fd0d291931 Merge branch 'master' into job-service 2016-05-12 17:44:17 +08:00
wemeya
f43d6dab18 change api for statistics and project repo, roleid 2016-05-12 14:56:43 +08:00
wemeya
d4cc5090e4 Merge remote-tracking branch 'upstream/master' 2016-05-11 15:55:03 +08:00
wemeya
8502d3da1b change api for statistics 2016-05-11 15:54:26 +08:00
Daniel Jiang
5ae6d7d16c Merge pull request #195 from ywk253100/sysadmin_has_all_privileges_for_projects
Sysadmin has all privileges for projects
2016-05-11 12:28:11 +08:00
Wenkai Yin
0a5d5b638e add ut for GetAllProjects() 2016-05-10 22:11:07 +08:00
Wenkai Yin
3b8baf0139 add ut for GetAllProjects() 2016-05-10 22:08:36 +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
Wenkai Yin
48be0a988d dao test 2016-05-09 16:53:33 +08:00
Wenkai Yin
56ccfc024a search api modification for admin 2016-05-09 16:48:59 +08:00
Wenkai Yin
8c8bad8602 sysadmin has all privileges for projects 2016-05-09 12:45:45 +08:00
hmwenchen
83ba195166 Add unit test for AccessLog 2016-05-03 16:54:01 +08:00
Tan Jiang
f0a2bc879a Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-03 15:57:00 +08:00
Tan Jiang
917adc9520 update to job service, support max job limit, state machine can transit automatically 2016-05-03 15:51:52 +08:00
Tan Jiang
8fba0b314f Merge branch 'master' into job-service 2016-05-03 13:52:50 +08:00
hmwenchen
5e8a6a6d55 Merge remote-tracking branch 'origin/master' into feature/accesslog
Enlarge registry timeout
2016-04-27 20:38:04 +08:00
Daniel Jiang
00b33d6b4d Merge pull request #146 from wy65701436/master
add post return, add the URI to header location.
2016-04-27 12:11:33 +08:00
hmwenchen
f5b15e9f22 Merge remote-tracking branch 'origin/master' into feature/accesslog 2016-04-26 20:06:47 +08:00
Tan Jiang
867b4bc352 add email check 2016-04-26 11:18:34 +08:00
Tan Jiang
57081792de adapt to other ldap servers 2016-04-25 19:00:36 +08:00
Tan Jiang
8d9d639cbf Merge branch 'master' into job-service 2016-04-25 17:53:41 +08:00