Commit graph

13857 commits

Author SHA1 Message Date
Blade Barringer
7e7fe3dfd6 3.6.1 2016-06-04 07:14:41 -05:00
Sabe Jones
7f722269bd fix(subscription): correctly award 3mo bennies (#7596) 2016-06-03 22:40:04 -05:00
Blade Barringer
96e9b83ca3 Merge pull request #7583 from crookedneighbor/fix_quest_modal_not_being_cleaned_up
fix: Cleanup quest progress for non-members when quest starts
2016-06-03 21:52:14 -05:00
Blade Barringer
434cac944c fix: Cleanup quest progress for non-members when quest starts 2016-06-03 21:51:18 -05:00
Blade Barringer
30d09c2e7f Merge branch 'slow_chat' into develop 2016-06-03 21:43:32 -05:00
Blade Barringer
8c81e02a87 refactor: Use stateChange hook for releasing keybinding 2016-06-03 21:33:15 -05:00
Blade Barringer
7536ba7aa2 Merge branch 'develop' into Sinble-bug/slow_chat 2016-06-03 17:24:52 -05:00
Sabe Jones
47f14a464a fix(bower): remove BrowserQuest dep (#7597) 2016-06-03 16:18:30 -05:00
MathWhiz
3589757763 fix: formatting issues in death modal
Closes #7156
2016-06-03 12:47:11 -05:00
MathWhiz
1fbd864a7f feat: Style fix character values modal for mobile
Closes #7157
2016-06-03 12:43:42 -05:00
MathWhiz
d072da3345 feat: change opacity of emoji in completed tasks
Closes #7184
2016-06-03 12:39:12 -05:00
Shervin Sarain
8c92ee6876 fix: correct param in tag sorting
Fixes #7593
2016-06-03 12:29:44 -05:00
Blade Barringer
75146417c4 Merge pull request #7590 from crookedneighbor/enable_randomdrop_tests
tests: Use dependency injection to re-enable randomdrop tests
2016-06-03 08:50:08 -05:00
Sabe Jones
7108b02f4d fix(profiles): public chairs
(cherry picked from commit 83366fa3a66afcc6f27d6fd987e55b565ad2af60)
2016-06-03 08:18:12 -05:00
Blade Barringer
d8440f8daa chore: Add migration helper functions 2016-06-03 06:36:20 -05:00
Sabe Jones
9828dfea21 chore(minor): Bump version to 3.6.0 2016-06-02 22:15:41 +00:00
Sabe Jones
21f3814368 feat(content): June Armoire and BGs (#7592) 2016-06-02 16:51:05 -05:00
Blade Barringer
c9d8c3ee40 tests: Use dependency injection to re-enable randomdrop tests 2016-06-02 12:57:59 -05:00
Sabe Jones
4ea52728ee fix(links): Report a Bug Guild 2016-06-01 22:12:02 +00:00
Sabe Jones
6084ea2017 Fix mystery set award to new subscribers (#7586)
* fix(mystery): flip da sign

* test(subscription): check mystery box
2016-06-01 15:34:57 -05:00
Sabe Jones
afea917409 chore(minor): Bump version to 3.5.0 2016-06-01 16:25:43 +00:00
Sabe Jones
271f4b760d chore(event): end Floral Potion availability 2016-06-01 15:08:35 +00:00
Matteo Pagliazzi
c33b7273fa 3.4.4 2016-06-01 08:59:22 +02:00
Blade Barringer
e8b1c937e4 Merge pull request #7568 from HabitRPG/fix_contributor_levels_watch
fix: Remove unnecessary flags.contributor property from user
2016-05-31 21:31:12 -05:00
Matteo Pagliazzi
d7cd2ce329 do not run cron when getting a group 2016-05-31 21:30:13 -05:00
Matteo Pagliazzi
e07ade5a4a cron: set lastCron at the beginning and misc fixes 2016-05-31 21:30:07 -05:00
Blade Barringer
52f0057c3d fix: Remove unnecessary flags.contributor property from user
Closes #7550
2016-05-31 21:10:58 -05:00
Blade Barringer
c0d9c54c44 test: Pend erronously failing test 2016-05-31 20:58:04 -05:00
Shervin Sarain
de21487038 Fix challenge sorting
Closes #7543
Closes #7507
2016-05-31 20:41:38 -05:00
Blade Barringer
a11a999839 chore: Add migration file for correcting users tasks
Fix for aftermath of https://github.com/HabitRPG/habitrpg/issues/7546
and https://github.com/HabitRPG/habitrpg/issues/7551
2016-05-31 18:04:53 -05:00
Sabe Jones
c746f643fd chore(patch): Bump version to 3.4.3 2016-05-31 20:14:20 +00:00
Sabe Jones
fcc14520c5 Don't $watch drops (#7547)
* WIP(drops): get drops out of _tmp

* fix(notifications): no watch for drops/mystery

* fix(ops): only two response values

* fix(test): update op expectation
Also update API docs for modified route.

* fix(lint): remove trailing space

* fix(test): update integration check
2016-05-31 14:56:33 -05:00
Sabe Jones
9b56c6f2ba Don't persist properties of tag filters (#7564)
* fix(filters): don't persist tag props
Partial fix for #7412

* fix(test): correct expectation
2016-05-31 14:55:59 -05:00
Lucas F T Hennigen
0b122f3b43 fix(tags): Fix tag removal functionality (#7553)
Tag removal functionality was broken. Turns out the issue was simply
that we weren't removing the tag from the local `task` object, so the
tag was removed, but readded upon sync/pressing save.

Closes #7412
2016-05-31 14:55:30 -05:00
Blade Barringer
b33505141b docs: Correct url for member routes 2016-05-31 13:03:45 -05:00
Matteo Pagliazzi
ee836c76a4 log req.method 2016-05-31 16:37:34 +02:00
Matteo Pagliazzi
bcbf00d42c fix api v2 tests, do not allow task.value to be updated 2016-05-31 11:32:33 +02:00
Matteo Pagliazzi
d9de6282a4 increase number of concurrent users that are synced when editing a challenge 2016-05-31 11:27:21 +02:00
Matteo Pagliazzi
87066ef6c7 do not allow casting on challenge tasks in v2 2016-05-31 11:13:28 +02:00
Matteo Pagliazzi
6b214e4e3f sanitize task when updating in v2 2016-05-31 11:09:32 +02:00
Blade Barringer
b1a2632319 fix: Use === in comparison 2016-05-30 17:22:53 -05:00
Blade Barringer
c387c6e0a5 Merge pull request #7400 from Atomk/patch-4
Update tasks.json
2016-05-30 15:23:56 -05:00
Blade Barringer
da12cb9f45 Merge pull request #7513 from zesme/fix-checklist-duplicates
Fix #7493 - prevent duplicate items when editing checklists
2016-05-30 15:22:07 -05:00
Blade Barringer
212395cef4 lint: Add missing semicolons 2016-05-30 15:16:46 -05:00
MathWhiz
7a9e50dbba Fix #7388 - Invert tag collapse when adding tasks 2016-05-30 15:09:08 -05:00
Blade Barringer
6e78a14f87 refactor: Move logger to separte file 2016-05-30 14:23:44 -05:00
Blade Barringer
038dd64b12 chore: Create broken challenges migration 2016-05-30 14:23:26 -05:00
Sabe Jones
d89b1e3b08 chore(patch): Bump version to 3.4.2 2016-05-30 18:07:32 +00:00
Sabe Jones
8520987afb chore(news): May Last Chance Bailey 2016-05-30 17:42:59 +00:00
Blade Barringer
c327baad41 Merge pull request #7538 from crookedneighbor/fix_invite_self_to_party
fix: Prevent user from inivting self to group
2016-05-29 10:37:48 -05:00