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
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
bbff19920f
Merge pull request #6217 from HabitRPG/sabrecat/pet-201511
...
November pet quest: Snakes
2015-11-11 17:51: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
eba2ac386e
feat(pets): November quest
...
Fully functional commit. Missing only Bailey and the quest scroll sprite.
2015-11-11 17:23:16 -05:00
Sabe Jones
3672601999
fix(chat): Handle nonexistent message.flags
2015-11-11 16:25:36 -05:00
Sabe Jones
586edc03c6
WIP(pets): Incomplete cobra sprites
2015-11-11 16:23:38 -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
Blade Barringer
c91c3f78ed
Remove lodash.defaultsDeep dependency
2015-11-11 06:44:45 -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
Matteo Pagliazzi
4f21ee290b
finish upgrading to lodash 3
2015-11-11 11:08:16 +01:00
Matteo Pagliazzi
3795b1d151
wip: starts upgrading lodash to v3
2015-11-11 10:32:49 +01:00
Matteo Pagliazzi
8f9d2a5f9a
change to erro handler middleware to log full error object and support express-validator
2015-11-11 10:12:13 +01:00
Sabe Jones
63f00d3643
fix(sharing): Better Tweet syntax
...
Angular bindings would fail to parse in Tweets if the expression evaluated to something with a space in it. Adding quotes stretches the Tweet by two characters, but addresses the issue. Commit also takes out a spurious console message from the Notifications service.
2015-11-10 17:07:34 -05:00
Sabe Jones
a393cdc94b
fix(sharing): Correct Jade interpolation
2015-11-10 16:33:33 -05:00
Sabe Jones
ada7ca71ad
fix(sharing): Use env BASE_URL
2015-11-10 16:27:40 -05:00
Sabe Jones
23df5b608d
feat(sharing): Remaining cheevo modals
2015-11-10 13:43:37 -05:00
Blade Barringer
1fc21167dc
Send back flag data if user had flagged the message.
2015-11-10 08:15:54 -06:00
Sabe Jones
875f2ac552
feat(sharing): More achievements
2015-11-10 00:08:17 -05:00
Blade Barringer
e518e2795f
Correct setupConfig to use proper linting.
2015-11-09 19:11:25 -06:00
Blade Barringer
c8ee1eaaec
Add support for passing in custom env file to nconf.
2015-11-09 18:41:04 -06:00
Sabe Jones
eed4207c6d
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/dist/sprites/spritesmith-largeSprites-0.png
common/locales/en/front.json
2015-11-09 16:24:17 -05:00
Blade Barringer
d6764d4f37
Merge branch 'develop' into api-v3
2015-11-09 12:52:25 -06:00
Blade Barringer
6b7a757459
Run tests in sequence
2015-11-09 12:47:56 -06:00
Blade Barringer
851631e465
Fix build errors
2015-11-09 08:19:24 -06:00
Blade Barringer
bab41be646
Correct gruntfile to use babel require hook
2015-11-09 08:05:51 -06:00
Blade Barringer
84158c92f5
Remove extra space
2015-11-09 07:58:36 -06:00
