Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit 3e1281f

Browse files
committed
Merge branch 'dev'
2 parents 7d8483d + e69fbc7 commit 3e1281f

32 files changed

+2595
-398
lines changed

assets/images/black_marker.png

547 Bytes
Loading

assets/images/info.png

451 Bytes
Loading

assets/images/loading_screen.png

-471 KB
Loading
27.7 KB
Loading
25.5 KB
Loading

assets/resources/de.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"Comment...": "Kommentieren...",
1010
"Please connect with your Facebook account to let your friend know who’s giving a heart.": "Bitte melde dich mit Facebook an, damit dein Freund oder deine Freundin sehen kann, wer hier ein Herz vergibt.",
1111
"Please connect with your Facebook account to let your friend know who’s commenting.": "Bitte melde dich mit Facebook an, damit dein Freund oder deine Freundin sehen kann, wer hier kommentiert.",
12-
"Sign In With Facebook": "Mit Facebook Anmelden",
12+
"Sign in with Facebook": "Mit Facebook anmelden",
1313
"Your closet is still empty? Fill it while shopping!": "Dein Kleiderschrank ist ja noch ganz leer! Füll ihn, wenn du shoppen gehst!",
1414
"No people found.": "Keine Leute gefunden.",
1515
"No Chus found.": "Keine Chus gefunden.",
@@ -140,5 +140,9 @@
140140
"Delete Comment": "Kommentar entfernen",
141141
"Delete": "Entfernen",
142142
"Confirm": "Bestätigen",
143-
"(tap to dismiss)": "(zum schließen antippen)"
143+
"(tap to dismiss)": "(zum schließen antippen)",
144+
"Stores": "Geschäfte",
145+
"People": "Leute",
146+
"No Stores found.": "Keine Geschäfte gefunden.",
147+
"Connect with Facebook now if you want to to use all of Chuisy's features! Don't worry, we won't post anything in your name without asking you!": "Melde dich an, um Chuisy uneingeschränkt zu nutzen! Keine Sorge, wir posten nichts in deinem Namen, ohne dich vorher zu fragen!"
144148
}

debug.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
1010
<!-- cordova iOS -->
1111
<script type="text/javascript" src="lib/cordova-2.2.0.js"></script>
12+
<!-- Google Maps -->
13+
<script src="https://maps.googleapis.com/maps/api/js?sensor=false"></script>
1214
<!-- cordova facebook connect plugin -->
1315
<script src="lib/cdv-plugin-fb-connect.js"></script>
1416
<script src="lib/facebook_js_sdk.js"></script>
@@ -29,16 +31,12 @@
2931
<!-- application (debug) -->
3032
<script src="source/package.js" type="text/javascript"></script>
3133
<!-- leaflet -->
32-
<script src="http://maps.google.com/maps/api/js?v=3.2&sensor=false"></script>
3334
<script type="text/javascript">
3435
touchMove = function(event) {
3536
// Prevent scrolling on this element
3637
event.preventDefault();
3738
}
3839
</script>
39-
40-
<!-- Google Maps API -->
41-
<!-- <script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false&libraries=places"></script> -->
4240
</head>
4341
<body class="enyo-unselectable">
4442
<script>

index.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<link href="build/app.css" rel="stylesheet"/>
1313
<!-- cordova iOS -->
1414
<script type="text/javascript" src="lib/cordova-2.2.0.js"></script>
15+
<!-- Google Maps -->
16+
<script src="https://maps.googleapis.com/maps/api/js?sensor=false"></script>
1517
<!-- cordova facebook connect plugin -->
1618
<script src="lib/cdv-plugin-fb-connect.js"></script>
1719
<script src="lib/facebook_js_sdk.js"></script>
@@ -27,15 +29,10 @@
2729
<script src="lib/PushNotification.js"></script>
2830
<!-- Keyboard remover plugin -->
2931
<script src="lib/keyboard_toolbar_remover.js"></script>
30-
<!-- leaflet -->
31-
<script src="http://maps.google.com/maps/api/js?v=3.2&sensor=false"></script>
3232
<!-- js -->
3333
<script src="build/enyo.js"></script>
3434
<script src="build/app.js"></script>
3535

36-
<!-- Google Maps API -->
37-
<!-- <script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script> -->
38-
3936
<!-- Touchmove handler for iOS -->
4037
<script type="text/javascript">
4138
touchMove = function(event) {

0 commit comments

Comments
 (0)