Commit Graph

1781 Commits

Author SHA1 Message Date
Blade Barringer cc0eefd97d Remove coffeescript dependency 2015-11-15 15:45:30 -06:00
Blade Barringer 49fd6b9f5c Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2015-11-15 14:59:57 -06:00
Blade Barringer 00055ad055 Merge branch 'develop' into api-v3 2015-11-15 14:57:41 -06:00
Matteo Pagliazzi 83eb2308fb Merge pull request #6232 from HabitRPG/api-v3-utils
[API v3] Port Utils
2015-11-15 20:01:48 +01:00
Matteo Pagliazzi 1ccb9a5aaa move ported middlewares to /api-v2 2015-11-15 18:15:06 +01:00
Matteo Pagliazzi 5dc2fb0b6f port domainMiddleware 2015-11-15 18:12:55 +01:00
Blade Barringer a127bb8711 Switch to babel-core form babel.
Babel includes the CLI, which we don't need.
2015-11-15 08:59:57 -06:00
Blade Barringer ddeb0e7b23 Add babel register in the server file 2015-11-15 08:16:11 -06:00
Matteo Pagliazzi 19ce7c9b53 add tests for emails (wip) and encryption, misc fixes 2015-11-14 17:43:56 +01:00
Matteo Pagliazzi 170a25c712 remove v2 utils where possible 2015-11-14 17:43:56 +01:00
Matteo Pagliazzi b315d10c79 migrate utils to v3, uprade nodemailer 2015-11-14 17:43:56 +01:00
Matteo Pagliazzi 6343bc9f59 port buildManifest lib 2015-11-14 15:50:57 +01:00
Matteo Pagliazzi 9c8d4c383f fix eslint, remove unused constant 2015-11-14 15:37:02 +01:00
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 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 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 0a99361953 Adjust i18n script to actually display zh_TW language. 2015-11-13 15:52:52 -06:00
Matteo Pagliazzi 0daa63c2ca Merge branch 'api-v3' into api-v3-i18n 2015-11-13 19:38:31 +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 879ec97408 fix some requires 2015-11-13 17:41:18 +01:00
Blade Barringer 939bc893c6 Correct test to check req status after function is finished. 2015-11-13 09:21:22 -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 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 858bf99930 Move old logging lib v2 directory 2015-11-12 08:18:23 -06:00
Blade Barringer 9a3e4c8f8b Move old analytics lib to v2 directory. 2015-11-12 07:51:51 -06:00