Commit Graph

11698 Commits

Author SHA1 Message Date
Matteo Pagliazzi ae656b044c firebase can be enabled when not in production 2015-11-14 14:52:10 +01:00
Matteo Pagliazzi cf4eb7c89b Merge pull request #6237 from HabitRPG/api-v3-firebase
port firebase lib to api v3
2015-11-14 13:14:50 +01:00
Matteo Pagliazzi d89b1cb60d port firebase lib to api v3 2015-11-14 02:50:58 +01:00
Blade Barringer 1e814058e1 Merge pull request #6224 from HabitRPG/api-v3-i18n
API v3 - i18n lib and getUserLanguage middleware
2015-11-13 19:37:28 -06:00
Blade Barringer 2e21d227e0 Simplify get language from user function. 2015-11-13 19:36:49 -06:00
Blade Barringer 4a52f22774 Correct path to old i18n file 2015-11-13 19:30:36 -06:00
Blade Barringer 1ae9b7aff0 Correct path to i18n 2015-11-13 18:40:46 -06:00
Blade Barringer 805d4bba24 Adjust for linter. 2015-11-13 18:29:19 -06:00
Blade Barringer 4cd4c588a8 Add tests for browser selection of language and refactor 2015-11-13 18:22:20 -06:00
Blade Barringer f672ac8c59 Port over change to v2 lib 2015-11-13 18:22:20 -06:00
Blade Barringer dc8d52e00a Correct paths in v2 lib 2015-11-13 18:22:20 -06:00
Blade Barringer 06dd343d47 Adjust i18n script to actually display zh_TW language. 2015-11-13 18:22:19 -06:00
Blade Barringer 8372a56d88 Adjust style of User.findOne call. 2015-11-13 18:22:17 -06:00
Blade Barringer 43058f1642 Add queries for which req pieces take precedence. 2015-11-13 18:22:17 -06:00
Blade Barringer 500c520c59 Move sandbox stub to test that uses it 2015-11-13 18:22:16 -06:00
Matteo Pagliazzi 0daa63c2ca Merge branch 'api-v3' into api-v3-i18n 2015-11-13 19:38:31 +01:00
Matteo Pagliazzi e84e3e1352 fix another require path 2015-11-13 18:06:50 +01:00
Matteo Pagliazzi 8fd82c6808 fix some requires 2015-11-13 17:50:34 +01:00
Blade Barringer 49a6a7167b Merge branch 'api-v3' into api-v3-i18n 2015-11-13 10:49:21 -06:00
Matteo Pagliazzi eede74758d Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2015-11-13 17:41:41 +01:00
Matteo Pagliazzi 879ec97408 fix some requires 2015-11-13 17:41:18 +01:00
Blade Barringer c6f059c1df Move delete cacth to afterEach 2015-11-13 10:40:31 -06:00
Blade Barringer 6bb107f9e0 Set up analytics middleware to test prod and non prod behavior. 2015-11-13 10:35:58 -06:00
Matteo Pagliazzi 38749eae1b fix i18n.js so that it supports lodash 3 2015-11-13 17:30:12 +01:00
Blade Barringer 810a818334 Add headers to req generator and unpend failing test. 2015-11-13 09:36:18 -06:00
Blade Barringer a6a9c3c74f Use context blocks instead of describe blocks. 2015-11-13 09:27:17 -06:00
Blade Barringer db67451a38 Add done callback to test. 2015-11-13 09:24:03 -06:00
Blade Barringer 939bc893c6 Correct test to check req status after function is finished. 2015-11-13 09:21:22 -06:00
Blade Barringer eab9d7b3ba Reorganize i18n tests. 2015-11-13 09:15:11 -06:00
Matteo Pagliazzi 79c20105a1 use new logger where possible 2015-11-13 15:16:00 +01:00
Blade Barringer be672e570c Merge branch 'api-v3' into api-v3-i18n 2015-11-13 07:44:48 -06:00
Blade Barringer 6e8e1648d9 Merge branch 'develop' into api-v3 2015-11-13 07:38:24 -06:00
Blade Barringer ada97c1f91 Add invite party to ios tutorial 2015-11-13 07:19:51 -06:00
Blade Barringer 27d3d9d296 Merge pull request #6229 from HabitRPG/emails
Adjust the way email invitations resolve.
2015-11-13 07:18:41 -06:00
Blade Barringer 565aaff976 Merge pull request #6219 from HabitRPG/js_ify_common
Js ify common
2015-11-13 06:49:54 -06:00
Blade Barringer e4679d6a63 Adjust the way email invitations resolve. 2015-11-12 18:58:01 -06:00
Blade Barringer 8e147d7b12 Allow users who register via facebook to see site tutorial. 2015-11-12 18:26:42 -06:00
Blade Barringer 71567be4a6 Merge pull request #6227 from crookedneighbor/fix_tutorial_flag
Fixes #6225
2015-11-12 13:05:18 -06:00
Blade Barringer abe778836d Fixes #6225 2015-11-12 12:52:35 -06:00
Blade Barringer 5fb585b896 Merge pull request #6226 from HabitRPG/fix_tutorial_flag
Move header assignment to app level
2015-11-12 12:37:31 -06:00
Blade Barringer 431bbd762f Move header assignment to app level 2015-11-12 12:23:42 -06:00
Matteo Pagliazzi de21b72027 move old i18n version to api-v2 folder and use new i18n where possible 2015-11-12 16:43:02 +01:00
Matteo Pagliazzi 60b51b8862 Merge branch 'api-v3' into api-v3-i18n 2015-11-12 16:36:19 +01:00
Matteo Pagliazzi 9516133bd8 Merge pull request #6223 from crookedneighbor/v3-port-webhooks
V3 port webhooks
2015-11-12 16:32:19 +01:00
Matteo Pagliazzi 4af8a8f7aa add tests for i18n and getUserLanguage 2015-11-12 16:24:08 +01:00
Blade Barringer 1e106b3c53 Move old webhooks to v2 lib 2015-11-12 09:08:36 -06:00
Blade Barringer a18c2f7444 Port v2 webhook lib to v3 2015-11-12 09:03:28 -06:00
Matteo Pagliazzi a07d4dad12 port i18n lib to es6 and extract middleware 2015-11-12 15:28:43 +01:00
Blade Barringer c77df40614 Merge pull request #6222 from crookedneighbor/move_logging_to_v2_directory
Move old logging lib v2 directory
2015-11-12 08:26:55 -06:00
Blade Barringer 858bf99930 Move old logging lib v2 directory 2015-11-12 08:18:23 -06:00