fc910d70a8
Merge pull request #3752 from crookedneighbor/develop
...
Fixed issue with filters div that is bigger than containing div
2014-07-28 13:12:56 -06:00
6b8f2b10e1
Merge pull request #3789 from Alys/vagrantChanges
...
add vagrant installation steps to prevent warnings and errors
2014-07-28 09:54:53 -04:00
d7351932aa
Merge branch 'develop' of git://github.com/HabitRPG/habitrpg into develop
2014-07-27 19:56:09 -05:00
12a9adcfcd
make experimental changes to try to make vagrant install work better
2014-07-26 14:20:14 +10:00
a4ae9332bb
feat(block-user): show "blocked" status in an alert, log the user out
2014-07-25 12:14:48 -06:00
6e29facb98
feat(block-user): allow suspending user accounts (due to TOS violation or such) through Hall. @lemoness
2014-07-25 12:14:48 -06:00
1808dea9ec
bailey(mystery): july mystery item
2014-07-24 19:33:11 -06:00
5c309444e0
fix(coupons): fix to limit
2014-07-22 18:35:55 -06:00
ca31d46e0e
tmp(coupons): just export c._id to csv
2014-07-21 22:39:36 -06:00
439828d2b1
feat(coupons): update wording @veeeeeee
2014-07-21 22:27:25 -06:00
bf29a19d33
chore(errors): allow disabling error emails (getting too many
...
VersionError, which maxes our limit and people can't use "Forgot
Password" feature)
2014-07-21 19:09:05 -06:00
dbd8fddf9d
Merge pull request #3769 from thedavemarshall/fix_ci_karma_deps
...
Pin karma-mocha to 0.1.3, fixes CI
2014-07-21 14:57:48 -06:00
a1f2375b9d
feat(subscription): disable "update card" for paypal subscribers
2014-07-21 14:55:36 -06:00
3bbb4e6966
Exactly request karma-mocha 0.1.3, cause tilda was loading 0.1.6 on CI
2014-07-21 13:52:03 -07:00
dda7f86433
Merge branch 'thedavemarshall-update_billing_info' into develop
2014-07-21 14:48:17 -06:00
1361b71b6c
Pin karma-mocha to 0.1.3, fixes CI
2014-07-21 13:40:05 -07:00
5cc4c60329
Edit stripe cc subscriptions
2014-07-21 01:08:56 -07:00
e0764e02a6
Merge pull request #3760 from Skyyrunner/develop
...
Fixed #3756 ?
2014-07-20 02:21:02 -07:00
3ed977dad6
Fixed #3756 ?
...
It seems to be fixed, but I don't know the good development habits for
jade/whatever technology it is. Please comment & close if the fix is not
acceptable.
2014-07-20 16:54:18 +09:00
490b0d1b1b
Corrected gap in filters style
2014-07-19 18:19:50 -05:00
acc874c60d
Merge pull request #3597 from 3onyc/feature/username-change
...
Implement "Change username" feature
2014-07-19 16:48:20 -06:00
c3eb23612d
Merge pull request #3754 from vIiRuS/patch-3
...
remove beta from api call examples
2014-07-18 09:37:36 -06:00
a4b4063b8d
remove beta from api call examples
...
The API documentation examples used beta.habitrpg.com as url. Additionally, the base URL was specified including "/user/". removed both to avoid confusion and make copy-paste easier
2014-07-18 11:58:25 +02:00
b946338184
feat(dilatory): add dilatory achievement
2014-07-17 18:37:09 -06:00
34236536df
feat(admin): allow admins to update user's items (restoring lost items,
...
granting quest scrolls, etc). @deilann :)
2014-07-17 14:09:39 -06:00
7c51910835
Fixed over width issue caused by the filters div
2014-07-16 19:54:01 -05:00
17c6df4f6a
fix(bailey): add links to recent update
2014-07-16 13:56:26 -06:00
0e3e199acf
bailey(dilatory): mobile update, dilatory changes
2014-07-16 13:25:00 -06:00
016d99a4a7
fix(dilatory): dont' modify original user.progress on world boss dmg,
...
fixes #3737
2014-07-14 20:52:37 -06:00
d1a5ff0cef
fix(global-modules): prevent labels from hiding tooltips
...
– Remove overflow:hidden from label template as it obscured tooltips
applied to label’s children
– Style buttons correctly if they include an input element
2014-07-14 21:52:56 +01:00
4cf1030c85
refactor(game-pane.styl): tweak layout and colors
...
– Improve positioning and size of chat-box buttons
– Replace some px values with ems
– Replace contributor colors with variables (set in global-colors.styl)
2014-07-14 21:52:56 +01:00
f83f2acc1b
Merge pull request #3724 from Alys/optOut
...
make it clearer that you can choose a class later
2014-07-13 11:45:06 -06:00
f2a10f8fc1
feat(i18n): add notices
2014-07-13 18:00:35 +02:00
157acf9b6b
put Vagrantfile back the way it's meant to be
2014-07-13 16:14:46 +10:00
8cfcf8db10
make it really obvious that you can choose a class later
2014-07-13 16:09:43 +10:00
8f968d6c14
update Vagrantfile to use my habitrpg box and with performance improvements
2014-07-13 15:27:52 +10:00
bc8aed5897
bailey(dilatory): update on dilatory bug #3712
2014-07-12 16:18:31 -06:00
7dfce54454
Revert "fix(quests): prevent very high damage for all quests" (@lemoness
...
@deilann - now it's just world boss, capped 900)
This reverts commit 89369e21a3
2014-07-12 16:13:27 -06:00
89369e21a3
fix(quests): prevent very high damage
2014-07-12 15:16:32 -06:00
860b3acc52
fix(dilatory): tmp fix to prevent high damage #3712
2014-07-12 15:06:07 -06:00
d848faee8e
fix(quests): show completion dialog
2014-07-12 14:32:13 -06:00
496618c665
fix(quests): don't reset quest progress when world boss defeated
2014-07-12 14:32:12 -06:00
899581ee56
fix(package.json): relax and update bower version
2014-07-12 16:04:28 +02:00
4f0b4fd171
feat(directives): move directive to be used in mobile to habitrpg-shared
2014-07-12 15:53:47 +02:00
45ab28269a
feat(jade): split file to be used on mobile
2014-07-12 15:50:15 +02:00
80dbc1111e
fix(quests): when leaving group, if leader or quest.leader is leaving,
...
re-assign to most senior member. #3709
2014-07-11 16:29:42 -06:00
a8b2b32557
refactor(groups): cleanup leave-group code
2014-07-11 14:43:11 -06:00
95193f550d
fix(bailey): updated wording to save vicky
2014-07-11 10:29:25 -06:00
327482f0b0
fix(password): case-insensitive emails in forgot-password
2014-07-10 21:11:58 -06:00
acf6d30b1f
chore(bailey): gaymerx meetup
2014-07-10 13:08:06 -06:00
Tyler Renelle