 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 |
|
|
Blade Barringer
|
3a1075a0e6
|
Merge pull request #6221 from crookedneighbor/move_analytics_to_v2_directory
Move old analytics lib to v2 directory
|
2015-11-12 08:02:25 -06:00 |
|
|
Blade Barringer
|
9a3e4c8f8b
|
Move old analytics lib to v2 directory.
|
2015-11-12 07:51:51 -06:00 |
|
|
Blade Barringer
|
5ebead68ab
|
Remove coffee version of i18n
|
2015-11-11 21:24:21 -06:00 |
|
|
Blade Barringer
|
efd0e2333e
|
Merge pull request #6200 from gauthamchandra/feature/quick-checkout-from-dailies
User can now check out of inn from tasks page
|
2015-11-11 20:49:35 -06:00 |
|
|
Blade Barringer
|
7559f14f4d
|
Remove coffee from files
|
2015-11-11 20:40:26 -06:00 |
|
|
Blade Barringer
|
3a13a5ee2c
|
Remove unneeded coffeescript requires in tests.
|
2015-11-11 20:32:17 -06:00 |
|
|
Blade Barringer
|
25ae2e4252
|
Move browserify task to gulp
|
2015-11-11 20:32:17 -06:00 |
|
|
Blade Barringer
|
9408effb4e
|
Remove coffeescript dependency from website
|
2015-11-11 20:32:16 -06:00 |
|
|
Blade Barringer
|
774a42d67e
|
Convert coffee files to JS
|
2015-11-11 20:32:00 -06:00 |
|
|
Blade Barringer
|
92a8c3d958
|
chore(i18n): update locales
|
2015-11-11 20:24:12 -06:00 |
|