From fafac3b4128a0993b0de1c6e8ca3062bf1ccc14e Mon Sep 17 00:00:00 2001
From: Roald de Vries <rdevries@thoughtworks.com>
Date: Thu, 8 Dec 2016 16:59:09 +0100
Subject: Revert "[#801] Merge branch 'signup'"

This reverts commit d10f607a4d40587510b0dc31b31fe4750bf4a3a3, reversing
changes made to c28abba2f5b1186c671ebef508d40ffaae6d5bc5.
---
 web-ui/test/test-main.js | 54 ++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'web-ui/test')

diff --git a/web-ui/test/test-main.js b/web-ui/test/test-main.js
index ce76be9b..4396993f 100644
--- a/web-ui/test/test-main.js
+++ b/web-ui/test/test-main.js
@@ -19,34 +19,34 @@ requirejs.config({
   baseUrl: '/base',
 
   paths: {
-    'page': 'public/js/page',
-    'js': 'public/js',
-    'lib': 'public/js/lib',
-    'hbs': 'public/js/generated/hbs',
-    'flight': 'public/bower_components/flight',
-    'DOMPurify': 'public/bower_components/DOMPurify/dist/purify.min',
-    'he': 'public/bower_components/he/he',
-    'views': 'public/js/views',
-    'helpers': 'public/js/helpers',
-    'feedback': 'public/js/feedback',
-    'tags': 'public/js/tags',
-    'mail_list': 'public/js/mail_list',
-    'mail_list_actions': 'public/js/mail_list_actions',
-    'user_alerts': 'public/js/user_alerts',
-    'mail_view': 'public/js/mail_view',
-    'dispatchers': 'public/js/dispatchers',
-    'mixins': 'public/js/mixins',
-    'services': 'public/js/services',
-    'search': 'public/js/search',
-    'monkey_patching': 'public/js/monkey_patching',
-    'i18next': 'public/bower_components/i18next/i18next',
-    'i18nextXHRBackend': 'public/bower_components/i18next-xhr-backend/i18nextXHRBackend',
-    'i18nextBrowserLanguageDetector': 'public/bower_components/i18next-browser-languagedetector/i18nextBrowserLanguageDetector',
-    'quoted-printable': 'public/bower_components/quoted-printable',
-    'utf8': 'public/bower_components/utf8',
+    'page': 'app/js/page',
+    'js': 'app/js',
+    'lib': 'app/js/lib',
+    'hbs': 'app/js/generated/hbs',
+    'flight': 'app/bower_components/flight',
+    'DOMPurify': 'app/bower_components/DOMPurify/dist/purify.min',
+    'he': 'app/bower_components/he/he',
+    'views': 'app/js/views',
+    'helpers': 'app/js/helpers',
+    'feedback': 'app/js/feedback',
+    'tags': 'app/js/tags',
+    'mail_list': 'app/js/mail_list',
+    'mail_list_actions': 'app/js/mail_list_actions',
+    'user_alerts': 'app/js/user_alerts',
+    'mail_view': 'app/js/mail_view',
+    'dispatchers': 'app/js/dispatchers',
+    'mixins': 'app/js/mixins',
+    'services': 'app/js/services',
+    'search': 'app/js/search',
+    'monkey_patching': 'app/js/monkey_patching',
+    'i18next': 'app/bower_components/i18next/i18next',
+    'i18nextXHRBackend': 'app/bower_components/i18next-xhr-backend/i18nextXHRBackend',
+    'i18nextBrowserLanguageDetector': 'app/bower_components/i18next-browser-languagedetector/i18nextBrowserLanguageDetector',
+    'quoted-printable': 'app/bower_components/quoted-printable',
+    'utf8': 'app/bower_components/utf8',
     'test': 'test',
     'features': 'test/features',
-    'user_settings': 'public/js/user_settings'
+    'user_settings': 'app/js/user_settings'
   },
 
   deps: tests,
@@ -73,7 +73,7 @@ requirejs.config({
       .init({
         lng: 'en_US',
         backend: {
-          loadPath: '/base/public/locales/en_US/translation.json'
+          loadPath: '/base/app/locales/en_US/translation.json'
         }
       });
       Handlebars.registerHelper('t', i18n.t);
-- 
cgit v1.2.3