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
Kaitlin Hipkin
98497ea739
Merge branch 'develop' of https://github.com/khipkin/habitrpg into develop
2016-03-07 03:20:58 -05: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
Christopher Giroir
edce3d01a9
Resizing image to remove aliasing
2016-03-05 11:13:20 -08:00
Christopher Giroir
82cfd8afc8
Moving to new purple logo.png
2016-03-05 11:06:01 -08: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
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
Phillip Thelen
a1e1ac211f
improve improvement category validation
2016-03-04 14:00:26 +01:00
Blade Barringer
b61cfefc30
fix: fix issue where build would fail but exit as if oy passed
2016-03-03 21:05:06 -06:00
Blade Barringer
8c6d8163bc
refactor: adjust path to cron module in common code
2016-03-03 18:09:07 -06:00
Sabe Jones
ea983179a4
Merge pull request #6804 from HabitRPG/sabrecat/active-handles
...
Active handles logging
2016-03-03 13:55:14 -06:00
Blade Barringer
0406142e0e
chore: upgrade babel to v6
2016-03-02 21:36:27 -06:00
Alys
c3107ad3fb
improve commenting style
2016-03-03 13:35:55 +10:00
Alys
56e53cc95f
fix Burst of Flames / fireball skill - was doing too much boss damage; add human-friendly names to skills for ease of searching
2016-03-03 08:30:49 +10:00
Sabe Jones
af38e83e36
fix(logging): don't log without env var
2016-03-02 11:30:49 -05:00
Sabe Jones
c761944c35
feat(logging): timestamp active handles output
2016-03-02 10:22:46 -05:00
Matteo Pagliazzi
5b012750bb
convert spells to es6
2016-03-02 12:46:06 +01:00
Alys
f69a29c152
improve group invitation code and tests
2016-03-02 09:26:55 +10:00
Sabe Jones
a698559c04
fix(log-handles): don't log verbose code
2016-03-01 16:46:39 -05:00
Sabe Jones
bff5258a56
fix(logging): get interval from env var
2016-03-01 16:46:39 -05:00
Sabe Jones
078100aac8
chore(logging): output active handles per 10 minutes
2016-03-01 16:46:38 -05:00
Sabe Jones
2516eae8d3
Merge pull request #6799 from HabitRPG/sabrecat/armoire-201603
...
Armoire and BGs 2016-03
2016-03-01 15:34:50 -06:00
Sabe Jones
ea6abbfabc
feat(content): Armoire and BGs 2016-03
2016-03-01 15:59:25 -05:00
Blade Barringer
ae56dd5c2e
Merge pull request #6796 from crookedneighbor/refactor_remove_unused_common_src_files
...
refactor: Remove unused common script src files
2016-03-01 09:21:58 -06:00
Blade Barringer
c96ddaeebe
refactor: Remove unused common script src files
2016-03-01 08:49:25 -06:00
Matteo Pagliazzi
531d3969f4
fix cluster.fork
2016-03-01 09:15:13 +01:00
Alys
01b12cd8b4
Merge pull request #6793 from Sinble/develop
...
Change Menu Names
2016-03-01 15:43:27 +10:00
Nick Bunn
b6255e9240
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into menu_name_change
2016-02-29 20:23:24 -06:00
Nick Bunn
251dd3cb8e
Changed submenu from Hall of Heroes to Hall of Contributors
2016-02-29 20:23:05 -06:00
Alys
3464914655
Revert "remove common/script/src"
...
This reverts commit 7c5572608f
2016-03-01 05:30:44 +10:00
Matteo Pagliazzi
7c5572608f
remove common/script/src
2016-02-29 16:35:35 +01:00
Matteo Pagliazzi
cbb29eac55
update gitignore for elastic beanstalk
2016-02-29 16:28:08 +01:00
Josh Holland
fae0bbc8f6
Add Moonstone Chain quest art
2016-02-28 19:37:07 -06:00
