Matteo Pagliazzi
|
f55df39fb7
|
Merge branch 'develop' into api-v3
|
2016-03-13 23:19:04 +01:00 |
|
Matteo Pagliazzi
|
e506864e00
|
Merge pull request #6877 from HabitRPG/v3-adapt-shared
Make shared code ready for API v3
|
2016-03-13 23:13:00 +01:00 |
|
Matteo Pagliazzi
|
f7c94ad854
|
Merge pull request #6875 from piousbox/api-v3-update-username-password-2
update username, password
|
2016-03-13 23:03:17 +01:00 |
|
Matteo Pagliazzi
|
f65a7321b7
|
fix common tests, explictly exclude tests from linting
|
2016-03-13 23:00:48 +01:00 |
|
Matteo Pagliazzi
|
70df1137a0
|
fix statsComputed getter
|
2016-03-13 22:39:14 +01:00 |
|
Matteo Pagliazzi
|
8e3284a4e3
|
wip(shared): adapt to v3
|
2016-03-13 22:26:32 +01:00 |
|
Victor Piousbox
|
0b25720232
|
cleanup
|
2016-03-13 14:01:53 -07:00 |
|
Matteo Pagliazzi
|
b948fc031f
|
fix typo in common code
|
2016-03-13 21:12:19 +01:00 |
|
Victor Piousbox
|
c61b10a6eb
|
resolve conflicts
|
2016-03-13 10:45:19 -07:00 |
|
Victor Piousbox
|
c14f0c4247
|
update username, password
|
2016-03-13 10:42:59 -07:00 |
|
Victor Piousbox
|
46322cfd38
|
update username, password
|
2016-03-12 23:32:20 -08:00 |
|
Matteo Pagliazzi
|
13a86c3858
|
Merge pull request #6869 from TheHollidayInn/api-v3-remove-challenge-checklist-item
Added initial test for removing challenge checklist item
|
2016-03-12 18:08:27 +01:00 |
|
Matteo Pagliazzi
|
ce916e31bd
|
Merge pull request #6866 from TheHollidayInn/api-v3-updated-checklist-item
Added initial checklist item update tests
|
2016-03-12 18:07:50 +01:00 |
|
Keith Holliday
|
152f7605cd
|
Added initial test for removing challenge checklist item
|
2016-03-12 10:55:12 -06:00 |
|
Keith Holliday
|
e4124f9e02
|
Added initial checklist item update tests
|
2016-03-12 10:38:40 -06:00 |
|
Matteo Pagliazzi
|
c02082a200
|
Merge branch 'develop' into api-v3
|
2016-03-12 16:00:24 +01:00 |
|
Matteo Pagliazzi
|
2fa361d9ea
|
Merge pull request #6865 from TheHollidayInn/api-v3-challenge-add-checklist-item
Add initial tests for add checklist item to challenge
|
2016-03-12 15:56:32 +01:00 |
|
Matteo Pagliazzi
|
8463abb830
|
Merge pull request #6853 from TheHollidayInn/api-v3-challenge-tasks-put
Added initial challenge task update tests
|
2016-03-12 14:52:54 +01:00 |
|
Keith Holliday
|
0af912bebb
|
Add initial tests for add checklist item to challenge
|
2016-03-11 14:19:46 -06:00 |
|
Matteo Pagliazzi
|
c6e5e3eb1f
|
Merge pull request #6787 from TheHollidayInn/api-v3-challenge-model-tests
Added initial challenge model tests
|
2016-03-11 19:17:09 +01:00 |
|
Matteo Pagliazzi
|
8ca4a7ce8a
|
Merge pull request #6824 from TheHollidayInn/api-v3-get-challenge-tasks
Added initial tests for get challenge tasks
|
2016-03-11 19:16:51 +01:00 |
|
Matteo Pagliazzi
|
6fa23ae49f
|
make sure to clone drop so original properties do not change
|
2016-03-11 19:11:46 +01:00 |
|
Matteo Pagliazzi
|
29b6e958c6
|
fix failing tests
|
2016-03-11 09:51:59 +01:00 |
|
Sabe Jones
|
d28219e90d
|
fix(content): Pfeffernusse typo, again
|
2016-03-10 17:35:36 -06:00 |
|
Sabe Jones
|
d608fdb437
|
fix(news): Pfeffernusse typo
|
2016-03-10 16:59:39 -06:00 |
|
Keith Holliday
|
61e360a1d8
|
Added initial challenge task update tests
|
2016-03-10 15:30:22 -06:00 |
|
Matteo Pagliazzi
|
78c1ee2053
|
Merge pull request #6858 from crookedneighbor/babel_fix
Add fix for running in dev and test mode
|
2016-03-10 19:38:32 +01:00 |
|
Blade Barringer
|
0f7a730a58
|
Add fix for running in dev and test mode
|
2016-03-10 12:16:19 -06:00 |
|
Matteo Pagliazzi
|
fbdbd8e006
|
Merge branch 'develop' into api-v3
|
2016-03-10 18:30:09 +01:00 |
|
Matteo Pagliazzi
|
a9c9d6d1cc
|
Merge pull request #6834 from HabitRPG/split-shared
Split shared ops
|
2016-03-10 17:34:46 +01:00 |
|
Matteo Pagliazzi
|
05676d834e
|
remove git conflict data
|
2016-03-10 17:13:13 +01:00 |
|
Matteo Pagliazzi
|
c39967767c
|
Merge branch 'develop' into split-shared
|
2016-03-10 17:00:59 +01:00 |
|
Matteo Pagliazzi
|
ec13a34228
|
Merge pull request #6842 from TheHollidayInn/api-v3-challenge-tasks-get
Added initial get challenge task by id
|
2016-03-10 16:53:14 +01:00 |
|
Sabe Jones
|
2a5011b648
|
fix(content): don't be clever with quest names
|
2016-03-09 16:57:43 -06:00 |
|
Sabe Jones
|
d92614844a
|
Merge pull request #6849 from HabitRPG/sabrecat/pets-201603
Pet quest March 2016
|
2016-03-09 15:11:14 -06:00 |
|
Sabe Jones
|
cc53e6e9dc
|
Merge pull request #6733 from vIiRuS/mobileStorage
Store data for next mobile update
|
2016-03-09 14:56:15 -06:00 |
|
Sabe Jones
|
45b8dbc1a6
|
feat(content): snails complete
|
2016-03-09 15:55:22 -05:00 |
|
Sabe Jones
|
d153df7805
|
feat(content): snail pet quest WIP
|
2016-03-09 15:34:57 -05:00 |
|
Keith Holliday
|
f96de74abd
|
Added test for incorrect task and id and renamed test file
|
2016-03-09 10:01:16 -06:00 |
|
Blade Barringer
|
3fa9d17ad4
|
Merge branch 'develop' into api-v3
|
2016-03-08 19:25:50 -06:00 |
|
Matteo Pagliazzi
|
582ded4494
|
disable rate limiting middleware
|
2016-03-08 23:21:11 +01:00 |
|
Sabe Jones
|
f5ea9c5524
|
fix(analytics): don't log chat messages
|
2016-03-08 15:19:39 -05:00 |
|
Blade Barringer
|
842d031d5b
|
Merge pull request #6828 from HabitRPG/upgrade_node
chore: Upgrade node
|
2016-03-08 13:09:59 -06:00 |
|
Keith Holliday
|
22e64bb88e
|
Added initial get challenge task by id
|
2016-03-08 12:42:05 -06:00 |
|
Matteo Pagliazzi
|
986bfd8035
|
split remaining utilities from shared
|
2016-03-08 19:35:02 +01:00 |
|
Blade Barringer
|
155cd6c626
|
fix: Correct how faq module is exported
|
2016-03-08 11:59:45 -06:00 |
|
Matteo Pagliazzi
|
bb6f0f4252
|
split user.fns
|
2016-03-08 18:58:39 +01:00 |
|
Matteo Pagliazzi
|
393a26e51a
|
fix typo: reroll -> rebirth
|
2016-03-08 18:02:23 +01:00 |
|
Matteo Pagliazzi
|
a351cb5f4e
|
change references to imported libs
|
2016-03-08 17:49:18 +01:00 |
|
Matteo Pagliazzi
|
5a2daabada
|
remove all changes from eslint --fix
|
2016-03-08 17:45:14 +01:00 |
|