diff --git a/pages/common/img/spinner.gif b/pages/common/img/spinner.gif new file mode 100644 index 0000000..ae8e94d Binary files /dev/null and b/pages/common/img/spinner.gif differ diff --git a/pages/first_run/create_account.html b/pages/first_run/create_account.html index f2c1d4a..daf0325 100644 --- a/pages/first_run/create_account.html +++ b/pages/first_run/create_account.html @@ -98,8 +98,8 @@
diff --git a/pages/first_run/create_account.js b/pages/first_run/create_account.js
index b76595b..db1039a 100644
--- a/pages/first_run/create_account.js
+++ b/pages/first_run/create_account.js
@@ -1,6 +1,5 @@
$(document).ready(function() {
- //var server = 'https://gombot.org';
- var server = 'http://dev.tobmog.org';
+ var server = 'https://gombot.org';
var client = new GombotClient(server + '/api');
var busy = false;
@@ -48,7 +47,7 @@ $(document).ready(function() {
var ProgressIndicator = (function() {
var indicatorImage = $('')
.addClass('progress-indicator-image')
- .attr('src', '/images/spinny.gif').get(0);
+ .attr('src', '../common/img/spinner.gif').get(0);
return {
show: function() {
if ($('.progress-indicator').has(indicatorImage).length == 0) {
diff --git a/pages/first_run/sign_in.js b/pages/first_run/sign_in.js
index cd728a5..3b38df5 100644
--- a/pages/first_run/sign_in.js
+++ b/pages/first_run/sign_in.js
@@ -1,6 +1,5 @@
$(document).ready(function() {
- //var server = 'https://gombot.org';
- var server = 'http://dev.tobmog.org';
+ var server = 'https://gombot.org';
var client = new GombotClient(server + '/api');
var busy = false;
diff --git a/server b/server
index 49eb445..6723218 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 49eb4455703cbd4c6d7a0a66ad4fa69e179a9431
+Subproject commit 6723218fb5f59433fa2491f53d8fd88f62a9e38a