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
Alys
76799eee05
Merge pull request #6837 from zesme/fix-tavern-tier-1-icon
...
Changed tavern tier 1 text icon
2016-03-08 20:26:46 +10:00
Lucas Torroba
d502db71e5
Changed tavern tier 1 text icon
...
The icon for the text/description of the 1st tier contributor was
incorrect. It should be the boot icon, but the firefox icon was being
displayed.
2016-03-08 03:05:46 -03:00
Matteo Pagliazzi
eeebe4c342
wip: split shared ops
2016-03-07 23:02:42 +01:00
Matteo Pagliazzi
8437c21a51
start splitting ops (readCard has tests)
2016-03-07 19:32:49 +01:00
Phillip Thelen
36790592c6
add tests for improvement categories
2016-03-06 17:56:51 +01:00
Alys
34057c375b
Merge pull request #6819 from zesme/develop
...
Closed issue #6758 - prevent multiple confirm/cancel popups from group Leave button
2016-03-06 20:28:47 +10:00
Alys
87bd55cca1
Merge pull request #6780 from colwem/issue6774
...
Improve styling of markdown blockquotes - fixes #6774
2016-03-06 19:59:30 +10:00
Alys
e59f614568
Merge pull request #6786 from murraybd/use-level-style-in-modals
...
Use level style in modals
2016-03-06 18:52:21 +10:00
Alys
9cac8dd95e
Merge pull request #6741 from delftswa2016/fix-hidden-button-issue-6740
...
Fixed partially hidden button in chat box
2016-03-06 18:18:02 +10:00
Alys
612d455fe1
Merge pull request #6782 from andrewcham/issue6779
...
update community guidelines - fixes #6779
2016-03-06 17:42:08 +10:00
Matteo Pagliazzi
b5e1cd33e2
Merge branch 'develop' into api-v3
2016-03-05 19:29:02 +01:00
Matteo Pagliazzi
45e7609dd1
Merge branch 'piousbox-api-v3-email-3' into api-v3
2016-03-05 19:24:22 +01:00
Matteo Pagliazzi
6830a4464a
Merge branch 'api-v3-email-3' of https://github.com/piousbox/habitrpg into piousbox-api-v3-email-3
2016-03-05 19:24:11 +01:00
Matteo Pagliazzi
a266ffdabd
Merge pull request #6821 from HabitRPG/upgrade_babel_v3
...
Upgrade babel v3
2016-03-05 19:07:34 +01:00
Matteo Pagliazzi
863ca9954e
errors working with babel 6, export v3 shared modules in main common module
2016-03-05 18:58:40 +01:00
Blade Barringer
d82dd67930
chore: Upgrade node
2016-03-05 09:17:31 -06:00
Blade Barringer
b553a6c134
fix: Remove active handles (incompatible with node v4)
2016-03-05 08:11:21 -06:00
Blade Barringer
a007effddd
chore(i18n): update locales
2016-03-05 07:46:08 -06:00
Alys
9517920de6
fix error in nodemon command for running API tests individually
2016-03-05 15:51:54 +10:00
Keith Holliday
0e96840e3d
Added initial tests for get challenge tasks
2016-03-04 15:38:32 -06:00
Victor Piousbox
7dfdbb8b05
/user/update-email endpoint
2016-03-04 21:27:16 +00:00
Blade Barringer
b97511db31
fix: Use module.exports instead of export default
2016-03-04 13:29:51 -06:00
Blade Barringer
4cd0428f0a
Merge branch 'develop' into api-v3
2016-03-04 12:16:22 -06:00
Keith Holliday
bcc4d568df
Moved unlinkChallengeTasks to challenge model and added tests
2016-03-04 11:45:21 -06:00
Lucas Torroba
4f4ea8416c
Closed issue #6758
...
After some discussion on the thread, this is probably the neatest
solution to issue #6758 . I have also modified the code on the guild
controller, which displayed the very same problem when pressing the
'Leave' button to leave a guild.
2016-03-04 13:16:37 -03:00
Blade Barringer
511b003ec5
Merge pull request #6811 from crookedneighbor/upgrade_babel
...
chore: upgrade babel to v6
2016-03-04 08:36:08 -06:00
Blade Barringer
9447a6ce10
feat: pre-compile babel when used in production
2016-03-04 07:44:22 -06:00
