You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/06 23:23:07 UTC
[22/28] git commit: USERGRID-86: Remove restriction on 10 apps in the
portal, add build files
USERGRID-86: Remove restriction on 10 apps in the portal, add build files
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/44805da2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/44805da2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/44805da2
Branch: refs/pull/70/merge
Commit: 44805da27273483d6bf89a7f42e92c87dd214b08
Parents: a339e4f
Author: Shawn Feldman <sh...@gmail.com>
Authored: Thu Mar 6 14:33:44 2014 -0700
Committer: Shawn Feldman <sh...@gmail.com>
Committed: Thu Mar 6 14:33:44 2014 -0700
----------------------------------------------------------------------
portal/index-debug.html | 16 ++++++++--------
portal/index.html | 16 ++++++++--------
portal/js/libs/usergrid-libs.min.js | 2 +-
portal/js/usergrid-dev.min.js | 2 +-
portal/js/usergrid.min.js | 2 +-
5 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/44805da2/portal/index-debug.html
----------------------------------------------------------------------
diff --git a/portal/index-debug.html b/portal/index-debug.html
index 7b8dcec..4e572c2 100644
--- a/portal/index-debug.html
+++ b/portal/index-debug.html
@@ -8,12 +8,12 @@
<meta name="description" content="">
<meta name="author" content="">
- <link id="libScript" href="2.0.36/js/libs/bootstrap/custom/css/bootstrap.min.css" rel="stylesheet">
- <link id="libScript" href="2.0.36/css/dash.min.css" rel="stylesheet">
+ <link id="libScript" href="1.0.2/js/libs/bootstrap/custom/css/bootstrap.min.css" rel="stylesheet">
+ <link id="libScript" href="1.0.2/css/dash.min.css" rel="stylesheet">
<!--styles for jquery ui calendar component-->
- <link id="libScript" rel="stylesheet" type="text/css" href="2.0.36/js/libs/jqueryui/jquery-ui-1.8.9.custom.css">
- <link id="libScript" rel="stylesheet" type="text/css" href="2.0.36/js/libs/jqueryui/jquery-ui-timepicker.css">
+ <link id="libScript" rel="stylesheet" type="text/css" href="1.0.2/js/libs/jqueryui/jquery-ui-1.8.9.custom.css">
+ <link id="libScript" rel="stylesheet" type="text/css" href="1.0.2/js/libs/jqueryui/jquery-ui-timepicker.css">
</head>
<body ng-controller="PageCtrl">
<!-- Google Tag Manager -->
@@ -115,14 +115,14 @@
</div>
</div>
</section>
-<script id="libScript" src="2.0.36/js/libs/usergrid-libs.min.js"></script>
-<script id="libScript" src="2.0.36/js/libs/bootstrap/custom/js/bootstrap.min.js"></script>
+<script id="libScript" src="1.0.2/js/libs/usergrid-libs.min.js"></script>
+<script id="libScript" src="1.0.2/js/libs/bootstrap/custom/js/bootstrap.min.js"></script>
<!--todo - remove this. temporarily including jquery ui for calendar in push-->
-<script id="libScript" src="2.0.36/js/libs/jqueryui/jquery.ui.timepicker.min.js" type="text/javascript"></script>
+<script id="libScript" src="1.0.2/js/libs/jqueryui/jquery.ui.timepicker.min.js" type="text/javascript"></script>
<!-- In dev use: <script src="js/libs/angular-1.1.5.js"></script> -->
<!--<script type="text/javascript" src="js/libs/angular-ui-ng-grid/ng-grid-2.0.2.debug.js"></script>-->
<script src="config.js"></script>
-<script id="main-script" src="2.0.36/js/usergrid-dev.min.js"></script>
+<script id="main-script" src="1.0.2/js/usergrid-dev.min.js"></script>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/44805da2/portal/index.html
----------------------------------------------------------------------
diff --git a/portal/index.html b/portal/index.html
index 95b6eb8..558e6a9 100644
--- a/portal/index.html
+++ b/portal/index.html
@@ -8,12 +8,12 @@
<meta name="description" content="">
<meta name="author" content="">
- <link id="libScript" href="2.0.36/js/libs/bootstrap/custom/css/bootstrap.min.css" rel="stylesheet">
- <link id="libScript" href="2.0.36/css/dash.min.css" rel="stylesheet">
+ <link id="libScript" href="1.0.2/js/libs/bootstrap/custom/css/bootstrap.min.css" rel="stylesheet">
+ <link id="libScript" href="1.0.2/css/dash.min.css" rel="stylesheet">
<!--styles for jquery ui calendar component-->
- <link id="libScript" rel="stylesheet" type="text/css" href="2.0.36/js/libs/jqueryui/jquery-ui-1.8.9.custom.css">
- <link id="libScript" rel="stylesheet" type="text/css" href="2.0.36/js/libs/jqueryui/jquery-ui-timepicker.css">
+ <link id="libScript" rel="stylesheet" type="text/css" href="1.0.2/js/libs/jqueryui/jquery-ui-1.8.9.custom.css">
+ <link id="libScript" rel="stylesheet" type="text/css" href="1.0.2/js/libs/jqueryui/jquery-ui-timepicker.css">
</head>
<body ng-controller="PageCtrl">
<!-- Google Tag Manager -->
@@ -115,14 +115,14 @@
</div>
</div>
</section>
-<script id="libScript" src="2.0.36/js/libs/usergrid-libs.min.js"></script>
-<script id="libScript" src="2.0.36/js/libs/bootstrap/custom/js/bootstrap.min.js"></script>
+<script id="libScript" src="1.0.2/js/libs/usergrid-libs.min.js"></script>
+<script id="libScript" src="1.0.2/js/libs/bootstrap/custom/js/bootstrap.min.js"></script>
<!--todo - remove this. temporarily including jquery ui for calendar in push-->
-<script id="libScript" src="2.0.36/js/libs/jqueryui/jquery.ui.timepicker.min.js" type="text/javascript"></script>
+<script id="libScript" src="1.0.2/js/libs/jqueryui/jquery.ui.timepicker.min.js" type="text/javascript"></script>
<!-- In dev use: <script src="js/libs/angular-1.1.5.js"></script> -->
<!--<script type="text/javascript" src="js/libs/angular-ui-ng-grid/ng-grid-2.0.2.debug.js"></script>-->
<script src="config.js"></script>
-<script id="main-script" src="2.0.36/js/usergrid.min.js"></script>
+<script id="main-script" src="1.0.2/js/usergrid.min.js"></script>
</body>
</html>