 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 |
|
|
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 |
|
|
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
|
9408effb4e
|
Remove coffeescript dependency from website
|
2015-11-11 20:32:16 -06:00 |
|
|
Sabe Jones
|
f0a484bbe1
|
fix(strings): Variable population count
|
2015-11-11 21:10:24 -05:00 |
|
|
Blade Barringer
|
40fab075e2
|
Clean up linting for user model.
|
2015-11-11 19:53:22 -06:00 |
|
|
Blade Barringer
|
533440ce55
|
Merge pull request #6214 from HabitRPG/api-v3-add-password-tests
Add tests for password utilities
|
2015-11-11 19:43:50 -06:00 |
|
|
Blade Barringer
|
c5445dc426
|
Merge branch 'develop' into api-v3
|
2015-11-11 19:42:39 -06:00 |
|
|
Sabe Jones
|
52f9f03afb
|
fix(news): Link to Teespring storefront
|
2015-11-11 20:19:48 -05:00 |
|
|
Blade Barringer
|
6acd6460ea
|
Merge pull request #6218 from crookedneighbor/increase_code_coverage_for_clearflags_route
Increase code coverage for clearflags route
|
2015-11-11 18:49:37 -06:00 |
|
|
Blade Barringer
|
43064dcf9a
|
Wrap flag purcging code in check for flags object
|
2015-11-11 18:00:15 -06:00 |
|
|
Blade Barringer
|
13da95b552
|
Add tests for clearflags route
|
2015-11-11 17:58:41 -06:00 |
|
|
Sabe Jones
|
83b61f9aa3
|
Merge branch 'develop' into sabrecat/pet-201511
Conflicts:
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.css
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.css
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
|
2015-11-11 18:36:25 -05:00 |
|
|
Sabe Jones
|
06a5a1cb95
|
Merge pull request #6042 from HabitRPG/sabrecat/more-modals
More and better modals; Social Media sharing
|
2015-11-11 17:32:43 -06:00 |
|
|
Sabe Jones
|
b32ab5a587
|
chore(news): Pet quest Bailey
Also adds one missing sprite asset for the quest.
|
2015-11-11 18:31:22 -05:00 |
|
|
Blade Barringer
|
cdb05e1b42
|
Add analytics service to v3
|
2015-11-11 17:30:36 -06:00 |
|
|
Sabe Jones
|
3672601999
|
fix(chat): Handle nonexistent message.flags
|
2015-11-11 16:25:36 -05:00 |
|
|
Sabe Jones
|
cc92b985a2
|
fix(sharing): Translatable share strings
|
2015-11-11 13:35:14 -05:00 |
|
|
Sabe Jones
|
cc2a6d4db1
|
fix(sharing): Push ng-binding into Jade
|
2015-11-11 13:09:00 -05:00 |
|
|
Matteo Pagliazzi
|
ac4f26a94f
|
add tests for password utilities
|
2015-11-11 16:05:35 +01:00 |
|
|
Blade Barringer
|
117a254cc8
|
Patch exploit that would allow users to auto-delete messages
|
2015-11-11 06:46:11 -06:00 |
|
|
Matteo Pagliazzi
|
367223e15c
|
port password utilities to api v3
|
2015-11-11 13:05:46 +01:00 |
|
|
Matteo Pagliazzi
|
249037b80f
|
upgrade some deps, and remove unused qs module
|
2015-11-11 12:12:44 +01:00 |
|
|
Matteo Pagliazzi
|
8864508482
|
rewrite server.js in es6
|
2015-11-11 11:58:15 +01:00 |
|