Skip to content

A
apollo
Commit 586006a9 by vss宋顺
Options

Merge branch 'master' into 'release'

Master See merge request !27
parents 7fbe7a5d 5877d839
Showing with 26 additions and 21 deletions
apollo-adminservice/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
......
apollo-assembly/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
......
apollo-biz/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<artifactId>apollo</artifactId>
<groupId>com.ctrip.framework.apollo</groupId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-biz</artifactId>
......
apollo-buildtools/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
......
apollo-client/README.md
......@@ -88,7 +88,7 @@ If you need this functionality, you could specify the cluster as follows:
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>0.1.1</version>
<version>0.2.0</version>
</dependency>
## III. Client Usage
......
apollo-client/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
......
apollo-common/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
......
apollo-configservice/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
......
apollo-core/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
......
apollo-demo/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<artifactId>apollo</artifactId>
<groupId>com.ctrip.framework.apollo</groupId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-demo</artifactId>
......
apollo-portal/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
......
apollo-portal/src/main/resources/static/config.html
......@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>apollo</title>
<title>Apollo配置中心</title>
<link rel="icon" href="./img/config.png">
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
......
apollo-portal/src/main/resources/static/index.html
......@@ -10,7 +10,7 @@
<link rel="stylesheet" type="text/css" media='all' href="vendor/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>apollo</title>
<title>Apollo配置中心</title>
</head>
<body>
......@@ -24,19 +24,19 @@
<h5>我的项目</h5>
</aside>
<aside class="media-body">
<div class="col-md-2 text-center" ng-click="goToCreateAppPage()">
<div class="app-panel col-md-2 text-center" ng-click="goToCreateAppPage()">
<div href="#" class="thumbnail create-btn hover cursor-pointer">
<img src="img/plus-white.png"/>
<h5>创建项目</h5>
</div>
</div>
<div class="col-md-2 text-center" ng-repeat="app in createdApps" ng-click="goToAppHomePage(app.appId)">
<div class="app-panel col-md-2 text-center" ng-repeat="app in createdApps" ng-click="goToAppHomePage(app.appId)">
<div href="#" class="thumbnail hover cursor-pointer">
<h4 ng-bind="app.appId"></h4>
<h5 ng-bind="app.name"></h5>
</div>
</div>
<div class="col-md-2 text-center" ng-show="hasMoreCreatedApps"
<div class="app-panel col-md-2 text-center" ng-show="hasMoreCreatedApps"
ng-click="getUserCreatedApps()">
<div href="#" class="thumbnail hover cursor-pointer">
<img class="more-img" src="img/more.png"/>
......
apollo-portal/src/main/resources/static/styles/common-style.css
......@@ -59,9 +59,7 @@ pre {
}
.logo {
width: 150px;
height: 50px;
background: url('../img/logo.png') no-repeat
font-size: 25px;
}
.i-20 {
......@@ -555,6 +553,10 @@ table th {
}
/*index page*/
#app-list h5{
word-wrap: break-word;
word-break: break-all;
}
#app-list .media-body {
padding-top: 15px;
}
......@@ -578,6 +580,7 @@ table th {
#app-list .app-panel {
position: relative;
height: 100px;
}
#app-list .operate-panel {
......
apollo-portal/src/main/resources/static/views/common/nav.html
......@@ -2,7 +2,9 @@
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand logo" href="/"></a>
<a class="navbar-brand logo" href="/">
<b>Apollo 配置中心</b>
</a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
......
pom.xml
......@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
<name>Apollo</name>
<packaging>pom</packaging>
<description>Ctrip Configuration Center</description>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment