Commit Graph

155 Commits

Author SHA1 Message Date
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
hmwenchen
957df50958 Minor change to comply with CI requirements 2016-04-22 20:26:28 +08:00
wy65701436
94422e9a71 add post return, add the URI to header location. 2016-04-22 02:57:39 -07:00
hmwenchen
ab6bb58c36 Add tag to accesslog 2016-04-22 00:28:59 +08:00
Wenkai Yin
b5b22350d1 set timeout for creation of connection between UI and DB 2016-04-20 14:44:19 +08:00
Tan Jiang
c7a7eb29a0 Merge remote-tracking branch 'upstream/job-service' into job-service 2016-04-20 14:33:12 +08:00
Tan Jiang
90d58c8774 prototype api for job management 2016-04-20 14:24:17 +08:00
Wenkai Yin
6e5ad732dc print the logs when UI fails to connet to DB 2016-04-19 16:00:23 +08:00
Daniel Jiang
6779274b54 Merge pull request #113 from ywk253100/delete_image
API for deleting repository and tag
2016-04-19 13:58:24 +08:00
wy65701436
ae83c77f94 update an tiny typo admim => admin 2016-04-17 20:35:46 -07:00
Wenkai Yin
24cd26aa5a bug fix 2016-04-15 21:48:28 +08:00
Wenkai Yin
39beda438c bug fix: user does not have admin role if user is nil 2016-04-15 16:52:48 +08:00
Wenkai Yin
85869f1b81 repo tag delete 2016-04-15 13:17:32 +08:00
Tan Jiang
72b9198e8e fix UT breakage: 2016-04-01 19:23:31 +08:00
Tan Jiang
cb78c5cd7e switch to v2 format docker compose template 2016-04-01 18:54:21 +08:00
Wenkai Yin
a5d8783b76 modified code according to the comments 2016-03-30 17:40:49 +08:00
Wenkai Yin
7fea8c55dd return nil if the user is deleted in LoginByDb() 2016-03-30 14:36:38 +08:00
Wenkai Yin
d8785196c0 delete useless files 2016-03-29 13:40:15 +08:00
Wenkai Yin
0812d2870c logger refactor 2016-03-29 13:33:49 +08:00
Wenkai Yin
f1a2942f6a db_role_refactor 2016-03-29 12:09:27 +08:00
Wenkai Yin
ac5bbc4657 db refactor 2016-03-28 15:34:41 +08:00
Tan Jiang
a462f118f1 update file names, remove tests folder 2016-02-29 10:50:47 +08:00
Tan Jiang
2cabd9c187 fix package comment issue 2016-02-26 18:54:14 +08:00
yinw
2a40866043 golint comment for model, dao and utils 2016-02-26 18:13:13 +08:00
yinw
3229d9ea45 add json annotations for model 2016-02-26 16:07:20 +08:00
yinw
61f12f089d go vet refactor 2016-02-26 14:24:44 +08:00
yinw
ed60d2245e golint refactor for dao 2016-02-26 11:26:54 +08:00
yinw
4a0b069994 golint refactor for model 2016-02-26 10:15:01 +08:00
Tan Jiang
9660645fe2 improve test coverage 2016-02-24 18:16:16 +08:00
wknet123
273aea3c6d refined error check in changing and resetting password, added ut for changing password with incorrect old password. 2016-02-24 21:36:45 +08:00
wknet123
be07274e33 added checking affected count in changing password, added ut for changing password with old password. 2016-02-24 20:44:46 +08:00
wknet123
297474c10e Merge remote-tracking branch 'upstream/master' into fix_password_controller 2016-02-24 19:15:02 +08:00
wknet123
ea063c13df fixed no need to provide old password when initialization. 2016-02-24 18:58:28 +08:00
wknet123
fc2fda0efe fixed codes about changing password processes. 2016-02-24 04:02:08 +08:00