Skip to content

Commit e698f7d

Browse files
committed
get website running again
1 parent 99c2e0d commit e698f7d

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

app/changelog.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

app/headlines.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
{
2929
"title": "2.0.11 Documentation Added",
3030
"date": "Nov 30 2014",
31-
"content": "<p>All of the documentation has been updated to the 2.0.X API. We are still behind on documenting many updates and changes. As a community feel free to pull request (PR) changes to keep this websit up to date.</p>"
31+
"content": "<p>All of the documentation has been updated to the master API. We are still behind on documenting many updates and changes. As a community feel free to pull request (PR) changes to keep this websit up to date.</p>"
3232
},
3333
{
3434
"title": "1.1.0 Documentation Added",

app/views/demo.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ <h1 class="page-header">Demo</h1>
44
We are working on a live (self hosted) demo, but it is not quite yet ready :( . For now we are using
55
rawgithub.com to host our example. To run it yourself, execute "grunt example".
66
</div>
7-
<iframe src="//rawgit.com/angular-ui/angular-google-maps/2.1.X/example/example.html"
7+
<iframe src="//rawgit.com/angular-ui/angular-google-maps/master/example/example.html"
88
width="1400" height="1050" frameBorder="0">
99
</iframe>

app/views/examples/base/plnkr.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<link rel="stylesheet" href="style.css" />
88
<script src="https://code.angularjs.org/1.3.14/angular.js"></script>
99
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.js"></script>
10-
<script src="http://rawgit.com/angular-ui/angular-google-maps/2.0.X/dist/angular-google-maps.js"></script>
10+
<script src="http://rawgit.com/angular-ui/angular-google-maps/master/dist/angular-google-maps.js"></script>
1111
<!--script-->
1212
<!--css-->
1313
<style type="text/css">

karma-e2e.conf.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module.exports = (config) ->
3333
# - Safari (only Mac)
3434
# - PhantomJS
3535
# - IE (only Windows)
36-
browsers: [
36+
browsers: process.env.KARMA_BROWSERS?.split(',') ? [
3737
"Chrome"
3838
"PhantomJS"
3939
"IE"

karma.conf.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = (config) ->
1313
files: [
1414
"https://maps.googleapis.com/maps/api/js?sensor=false"
1515
"dist/vendor/scripts/jquery.js"
16-
"dist/vendor/scripts/lodash.compat.js"
16+
"dist/vendor/scripts/lodash.js"
1717
"dist/vendor/scripts/angular.js"
1818
"dist/vendor/scripts/*.js"
1919
"app/scripts/module.js"
@@ -46,7 +46,7 @@ module.exports = (config) ->
4646
# - Safari (only Mac)
4747
# - PhantomJS
4848
# - IE (only Windows)
49-
browsers: ["PhantomJS"] #, 'Chrome', 'IE'
49+
browsers: process.env.KARMA_BROWSERS?.split(',') ? ["PhantomJS"] #, 'Chrome', 'IE'
5050

5151
# Continuous Integration mode
5252
# if true, it capture browsers, run tests and exit

0 commit comments

Comments
 (0)