Commit Graph

2653 Commits

Author SHA1 Message Date
Daniel Jiang
7d6d641827 Merge branch 'master' into dev 2017-04-05 17:01:27 +08:00
Daniel Jiang
f703315226 Merge pull request #1914 from wy65701436/dev
update make file
2017-04-05 16:32:02 +08:00
wy65701436
40ae3694f6 update make file 2017-04-05 01:00:39 -07:00
Steven Zou
7137e0c26c Merge pull request #1913 from wknet123/dev-sync
Fix some UX issues.
2017-04-05 15:32:56 +08:00
kunw
6b322a6e00 Fix some UX issues. 2017-04-05 15:20:21 +08:00
Daniel Jiang
85233a9b16 Merge pull request #1910 from wy65701436/dev
use gzip to save docker images.
2017-04-05 15:15:16 +08:00
wy65701436
b827fdd5a5 use gzip to save docker images. 2017-04-04 23:48:29 -07:00
kun wang
3028fe5a71 Merge pull request #1907 from steven-zou/dev
Fix minor style issues
2017-04-05 01:06:24 -05:00
Yan
2ec55e493c Merge pull request #1906 from wknet123/dev-sync
Remove unused images
2017-04-04 22:33:36 -07:00
Steven Zou
448555e952 Merge pull request #26 from steven-zou/fix/issues
fix style issues
2017-04-05 13:12:38 +08:00
Steven Zou
30dc41b4bb fix style issues 2017-04-05 13:11:49 +08:00
Daniel Jiang
8a5f024a1a Merge pull request #1905 from wy65701436/dev
move clarity to vmware namespace.
2017-04-05 13:04:07 +08:00
wy65701436
32555dbb06 modify travis 2017-04-04 20:41:22 -07:00
kunw
0c53d9de51 Remove unused images. 2017-04-05 11:20:37 +08:00
wy65701436
3c44235efe move clarity to vmware namespace. 2017-04-04 20:12:00 -07:00
kunw
39e64f28c9 Merge remote-tracking branch 'upstream/dev' into dev-sync 2017-04-03 18:01:33 +08:00
kun wang
768f20164b Merge pull request #1901 from steven-zou/dev
Fix related UI bugs
2017-04-01 06:09:17 -05:00
Steven Zou
d8656c24a8 Merge pull request #25 from steven-zou/fix/issue_1824
fix issue 1824: Move signoff to the sign-in route canActivate
2017-04-01 18:37:04 +08:00
Steven Zou
5db2e387c1 fix issue 1824: Move signoff to the sign-in route canActivate 2017-04-01 18:36:20 +08:00
Steven Zou
da7d76ae0b Merge pull request #24 from steven-zou/fix/issue_1874
add loading icon to index and remove related console logs
2017-04-01 18:15:22 +08:00
Steven Zou
a25e736ad0 add loading icon to index and remove related console logs 2017-04-01 18:14:08 +08:00
Steven Zou
403f4da994 Merge pull request #23 from steven-zou/fix/issue_1874
fix issue 1874: support metrics refresh
2017-04-01 17:37:55 +08:00
Steven Zou
30c28f9d8d fix issue 1874: support metrics refresh 2017-04-01 17:37:00 +08:00
Steven Zou
05ac2a432c Merge pull request #22 from steven-zou/fix/issue_1687
Fix minor issue of layout
2017-04-01 16:54:59 +08:00
Steven Zou
34927dacfa Fix minor issue of layout 2017-04-01 16:53:49 +08:00
Steven Zou
ae6f51a1da Merge pull request #21 from steven-zou/fix/issue_1687
fix issue 1687: change fonts and layout of metrics
2017-04-01 16:34:03 +08:00
Steven Zou
5a02cdc1cd fix issue 1687: change fonts and layout of metrics 2017-04-01 16:33:06 +08:00
Steven Zou
05777ea3cf Merge pull request #20 from steven-zou/fix/issue_1897
fix issue 1897: password validation enhancement
2017-04-01 16:19:34 +08:00
Steven Zou
7e542258ee fix issue 1897: password validation enhancement 2017-04-01 16:18:42 +08:00
kunw
04b1900c64 Merge remote-tracking branch 'upstream/dev' into dev-sync 2017-03-31 18:50:47 +08:00
Steven Zou
c3be926426 Merge pull request #1898 from wknet123/dev-sync
Updates for clearing filter values after actions.
2017-03-31 18:40:17 +08:00
Daniel Jiang
2878d0c8a6 Merge pull request #1896 from reasonerjt/dev
Do not return 403 for HEAD
2017-03-31 18:31:26 +08:00
kunw
925c7e3dee Merge remote-tracking branch 'upstream/dev' into dev-sync 2017-03-31 18:30:27 +08:00
kunw
a8233a5b9a Updates for clearing filter values after actions. 2017-03-31 18:28:21 +08:00
kun wang
7d42b73f83 Merge pull request #1886 from steven-zou/dev
Fix issue 1709
2017-03-31 18:13:53 +08:00
Steven Zou
0ae5360a4b Merge pull request #19 from steven-zou/fix/reset_password
fix issue of resetting password
2017-03-31 17:43:39 +08:00
Steven Zou
ec0baa5785 fix issue of resetting password 2017-03-31 16:56:38 +08:00
Steven Zou
e4106aa05c Merge pull request #18 from steven-zou/fix/issues
fix issue of package.json
2017-03-31 16:08:04 +08:00
Steven Zou
9947d1f4bc fix issue of package.json 2017-03-31 16:07:06 +08:00
Tan Jiang
f96bde1abb Do not return 403 for HEAD 2017-03-31 15:36:57 +08:00
Steven Zou
77ca1e9b42 Merge pull request #17 from steven-zou/fix/issues
fix copyrights and icon color issues
2017-03-31 15:01:54 +08:00
Steven Zou
ead67ba374 fix copyrights and icon color issues 2017-03-31 15:00:49 +08:00
Steven Zou
206ed414c5 Merge pull request #16 from steven-zou/fix/package.json
fix dependency issue in package.json
2017-03-31 14:40:35 +08:00
Steven Zou
c801a1cc82 fix dependency issue in package.json 2017-03-31 14:38:52 +08:00
Steven Zou
551ce63927 Merge pull request #1891 from wknet123/dev-sync
Update for UX issues.
2017-03-31 11:04:52 +08:00
kunw
00bd8f3194 Update for UX issues. 2017-03-31 00:51:03 +08:00
Steven Zou
119ec4eafe Merge pull request #15 from steven-zou/fix/issue_1709
append package.json file
2017-03-30 19:31:41 +08:00
Steven Zou
a40cb3c5fb append package.json file 2017-03-30 19:30:04 +08:00
Daniel Jiang
08d30777ad Merge pull request #1876 from wy65701436/dev
add copy right script
2017-03-30 19:16:21 +08:00
Daniel Jiang
53a19674bf Merge pull request #1885 from ywk253100/170330_fix
Shorten comment message of user registered from LDAP
2017-03-30 19:14:47 +08:00