Commit Graph

2592 Commits

Author SHA1 Message Date
kunw
8d7ac82cea Merge branch 'dev-revised' of github.com:wknet123/harbor into dev-revised 2017-03-30 16:08:09 +08:00
kunw
2150b355a6 Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-03-30 16:07:50 +08:00
kunw
b677e8338b Fix list job error message. 2017-03-30 16:07:14 +08:00
Tan Jiang
a2cfbc5519 update nginx log format to include response time 2017-03-30 16:07:14 +08:00
Steven Zou
aa8edc5f15 fix user constructor issue 2017-03-30 16:07:14 +08:00
Steven Zou
9b9be0253c fix issue 1860 and other minor remending 2017-03-30 16:07:14 +08:00
Wenkai Yin
966b476d36 mount ca dir to container, fix #1829 2017-03-30 16:07:14 +08:00
Wenkai Yin
fc1ec482a4 remove compress js flag 2017-03-30 16:07:14 +08:00
Steven Zou
791aaa0724 fix issues 2017-03-30 16:07:14 +08:00
Wenkai Yin
052bc429a7 update 2017-03-30 16:07:14 +08:00
Wenkai Yin
0d80608036 add ut 2017-03-30 16:07:14 +08:00
Wenkai Yin
c3a35510fd fix sending email bug, fix #1834 2017-03-30 16:07:14 +08:00
kunw
6acf2af7c0 Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-03-30 15:51:21 +08:00
kunw
a1b3fe8a27 Fix UX issues. 2017-03-30 15:51:00 +08:00
Daniel Jiang
d49a307312 Merge pull request #1868 from reasonerjt/nginx-log-format
update nginx log format to include response time
2017-03-30 15:12:30 +08:00
kun wang
64bcbfde00 Merge pull request #1872 from steven-zou/dev
Fix issue #1860 and other minor things
2017-03-30 14:27:27 +08:00
Wenkai Yin
89a01957f6 Merge pull request #1849 from ywk253100/170329_send_email
Fix sending email bug
2017-03-30 14:15:14 +08:00
Wenkai Yin
4236d47653 Merge remote-tracking branch 'upstream/dev' into 170329_send_email 2017-03-30 14:03:25 +08:00
Wenkai Yin
2528ad9c62 Merge pull request #1870 from ywk253100/170330_ca_download_dir
Mount ca dir to UI container
2017-03-30 13:52:27 +08:00
Wenkai Yin
0ec0349016 update 2017-03-30 13:51:56 +08:00
Steven Zou
36e7e079ae Merge pull request #13 from steven-zou/fix/new_user_constructor
fix user constructor issue
2017-03-30 13:41:28 +08:00
Steven Zou
03aa346efc fix user constructor issue 2017-03-30 13:40:36 +08:00
Daniel Jiang
d5cd72479e Merge pull request #1871 from ywk253100/170330_remove_compressjs
Remove compress js flag
2017-03-30 13:30:28 +08:00
Steven Zou
ad79cb9e29 Merge pull request #12 from steven-zou/fix/issue_1860
fix issue 1860 and other minor remending
2017-03-30 13:25:29 +08:00
Steven Zou
3ec4310faf fix issue 1860 and other minor remending 2017-03-30 13:24:15 +08:00
Wenkai Yin
ec27e2dc07 remove compress js flag 2017-03-30 12:59:47 +08:00
Wenkai Yin
ee2a6748c0 mount ca dir to container, fix #1829 2017-03-30 12:50:20 +08:00
Tan Jiang
7555dd9d48 update nginx log format to include response time 2017-03-30 12:46:13 +08:00
kun wang
89ca6e5b1a Merge pull request #1867 from steven-zou/dev
Fix issues
2017-03-30 12:44:04 +08:00
Steven Zou
13797d169a Merge pull request #11 from steven-zou/fix/issues
fix issues
2017-03-30 12:35:01 +08:00
Steven Zou
e38a055451 fix issues 2017-03-30 12:33:42 +08:00
kunw
c88b705c8b Fix matched lang issue and some i18n messages. 2017-03-30 00:35:19 +08:00
Wenkai Yin
705452ac04 add ut 2017-03-29 23:12:17 +08:00
Steven Zou
8ecfb04d1a Merge pull request #1859 from wknet123/dev-revised
Lowercase language names.
2017-03-29 20:00:19 +08:00
kunw
ed11d23e40 Lowercase language names. 2017-03-29 19:57:06 +08:00
Steven Zou
0a851b2b4a Merge pull request #1858 from wknet123/dev-revised
Fix export function.
2017-03-29 19:26:40 +08:00
kunw
04f1c8e625 Fix export function. 2017-03-29 19:18:17 +08:00
Steven Zou
28771b10f5 Merge pull request #1857 from wknet123/dev-revised
Add styles.css
2017-03-29 19:08:03 +08:00
kunw
3fdb06377d Add styles.css 2017-03-29 19:04:56 +08:00
Steven Zou
7437eb2fbc Merge pull request #1856 from wknet123/dev-revised
Updates for date time format by locale
2017-03-29 18:51:09 +08:00
kunw
ae4fdff2c3 Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-03-29 18:40:38 +08:00
kunw
0616bb3219 Updates for date time format by locale. 2017-03-29 18:40:18 +08:00
kun wang
7a3a2d29cf Merge pull request #1855 from steven-zou/dev
Fix UI issues
2017-03-29 18:33:55 +08:00
Steven Zou
074343cd9c Merge pull request #10 from steven-zou/fix/issue_1809
fix issue #1809
2017-03-29 18:27:05 +08:00
Steven Zou
fdb7f9fa4b fix issue #1809 2017-03-29 18:25:21 +08:00
Daniel Jiang
61d84694ff Merge pull request #1851 from reasonerjt/delete-cert-tmp
prepare should remove the temp files generated for creating certificate
2017-03-29 17:32:44 +08:00
Tan Jiang
864e0f415e prepare should remove the temp files generated for creating certificate 2017-03-29 17:08:28 +08:00
kun wang
ef21b25115 Merge pull request #1850 from steven-zou/dev
Fix UI issues
2017-03-29 16:23:07 +08:00
Steven Zou
ce9b9dd91d Merge pull request #9 from steven-zou/fix/issues
Fix UI issues
2017-03-29 16:18:26 +08:00
Steven Zou
fe5de50566 Fix UI issues 2017-03-29 16:17:17 +08:00