Commit Graph

634 Commits

Author SHA1 Message Date
kunw
b5c1985247 Merge branch 'api-attribute-rename' of https://github.com/vmware/harbor into api-attribute-rename 2016-06-02 12:30:57 +08:00
Daniel Jiang
82fb8df5a1 Merge pull request #303 from reasonerjt/api-attributes
missed quotes around json tag...
2016-06-02 12:20:17 +08:00
Tan Jiang
bbac16a033 missed quotes around json tag... 2016-06-02 12:14:40 +08:00
Daniel Jiang
f9f5f7f70a Merge pull request #302 from reasonerjt/api-attributes
role info need to be in user model for now
2016-06-02 12:11:39 +08:00
kunw
e3e0b48230 Merge branch 'api-attribute-rename' of https://github.com/vmware/harbor into api-attribute-rename 2016-06-02 12:11:16 +08:00
kunw
e8531edd39 updates for attribute-rename of js 2016-06-02 12:10:32 +08:00
Tan Jiang
1dcb19b519 role info need to be in user model for now 2016-06-02 12:07:30 +08:00
Daniel Jiang
0d209c12bf Merge pull request #301 from reasonerjt/api-attributes
Api attributes
2016-06-02 11:33:05 +08:00
Tan Jiang
886fb8eb67 fix annotation error 2016-06-01 17:10:48 +08:00
Tan Jiang
33c979974d fix annotation error 2016-06-01 16:08:40 +08:00
Daniel Jiang
03389abb96 Merge pull request #298 from reasonerjt/api-attributes
update attributes of api
2016-06-01 15:43:52 +08:00
Tan Jiang
bf86f1ff58 update attributes of api 2016-06-01 15:17:05 +08:00
Wenkai Yin
8206ef2dcb Merge pull request #296 from ywk253100/bug_fix_get_member
bug fix: the length should be 0 when initialize a slice
2016-06-01 13:52:07 +08:00
Wenkai Yin
07c7ce403c bug fix: the length should be 0 when initialize a slice 2016-06-01 13:47:23 +08:00
Wenkai Yin
a4d318dffe Merge pull request #274 from ywk253100/modify_authentication_of_repository_api
bug fix: create repository client with credential when basic auth is used
2016-05-27 12:25:35 +08:00
Wenkai Yin
119dd50418 buf fix: create repository client with credential when basic auth is used 2016-05-27 12:18:12 +08:00
Wenkai Yin
f7de4c5841 Merge pull request #255 from ywk253100/modify_authentication_of_repository_api
Some modifications for implements of API
2016-05-26 14:05:53 +08:00
Wenkai Yin
73f69254e2 Merge branch 'master' into modify_authentication_of_repository_api 2016-05-26 14:01:09 +08:00
Wenkai Yin
6b2b6dedd8 support Get /api/projects/:id 2016-05-26 13:59:03 +08:00
Wenkai Yin
2a0571fc64 remove goto 2016-05-26 13:26:10 +08:00
Daniel Jiang
14ce697025 Merge pull request #238 from yhua123/patch-1
Update for using static 'rsyslog.conf' instead command 'sed' in  Dockerfile of  the log container
2016-05-26 13:01:14 +08:00
Daniel Jiang
78be8eec65 Merge pull request #271 from ywk253100/buf_fix_268
fix #268
2016-05-26 12:38:21 +08:00
Wenkai Yin
535bea1b6b fix #268 2016-05-25 17:22:33 +08:00
Daniel Jiang
db908edf87 Merge pull request #256 from saga92/master
add orm singleton
2016-05-24 11:01:19 +08:00
saga92
de51b247f7 make singleton thread safe 2016-05-24 09:41:34 +08:00
saga92
2f60bf4f1f add unit test of GetOrmer 2016-05-20 17:35:16 +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
0b30d04455 sort tags by name 2016-05-20 14:02:44 +08:00
Wenkai Yin
1919f19459 remove useless codes 2016-05-20 11:38:24 +08:00
Wenkai Yin
7920803735 handle project name is nil 2016-05-20 11:32:12 +08:00
Wenkai Yin
4b27ef7a25 Merge branch 'master' into modify_authentication_of_repository_api 2016-05-20 11:18:33 +08:00
Wenkai Yin
8c86e786c2 user can get public projects without login 2016-05-20 11:16:19 +08:00
Wenkai Yin
6cd1813b86 1. user can get repositories of public project without login 2. add basic auth support for repository API 3. system admin can CRUD members of all projects 2016-05-19 18:36:40 +08:00
Wenkai Yin
0b5d736d15 Merge pull request #249 from wemeya/master
fix a sql bug
2016-05-19 14:54:59 +08:00
wemeya
973ee40fdf fix a sql bug 2016-05-19 14:40:09 +08:00
Wenkai Yin
91ef155da5 Merge pull request #207 from wemeya/master
add statistics api for projects and repositories
2016-05-19 12:06:22 +08:00
wemeya
1f44e2aa8b add a new func to reuse code 2016-05-18 17:48:05 +08:00
wemeya
2cd1226ac8 Merge remote-tracking branch 'upstream/master' 2016-05-18 17:46:57 +08:00
Daniel Jiang
311ba1d40c Merge pull request #240 from saga92/master
add database schema changelog.md
2016-05-18 15:32:36 +08:00
wemeya
155f8dc1a8 modify error message 2016-05-18 15:07:54 +08:00
saga92
0f73f1e376 Update changelog.md 2016-05-18 14:47:57 +08:00
wemeya
3e1bf8c862 change code for statistics and project api 2016-05-18 14:36:20 +08:00
saga92
681f94727d Merge branch 'master' of https://github.com/saga92/harbor 2016-05-18 11:35:56 +08:00
saga92
04d8fe87e6 Update changelog.md 2016-05-18 11:02:53 +08:00
saga92
97b7690cb7 Update changelog.md 2016-05-18 11:00:32 +08:00
saga92
d4ebe33907 change comment 2016-05-18 10:57:47 +08:00
wemeya
89fce7ed22 change comment and add sql fields 2016-05-18 10:30:55 +08:00
wemeya
0e52a68aa4 Merge remote-tracking branch 'upstream/master' 2016-05-18 10:30:07 +08:00
Haining Henry Zhang
413247b60a Merge pull request #244 from hainingzhang/master
update document
2016-05-17 08:39:40 -07:00