603da697c1
Merge pull request #256 from lemoness/develop
...
Snowball and June Item Icons
2014-07-29 14:40:39 -06:00
982b29b443
Snowball and June Item Icon
...
Changes to a consistent 2x to avoid resizing issues
2014-07-29 13:36:24 -07:00
a2df27d7f2
fix(forgot-password): allow aliases (x+y@z.com) in email lookup, fixes #3805
2014-07-29 12:58:31 -06:00
c8f45b8be6
explains that Chilling Frost does not stop dailies from hurting you
2014-07-29 13:01:17 +10:00
a87b651caf
apply contributor tier color to avatar name
2014-07-29 08:53:23 +10:00
2fb4d2652d
Merge pull request #253 from lemoness/develop
...
gaymerx helm icon 2x
2014-07-28 16:06:04 -06:00
dfacae9b3f
gaymerx helm icon 2x
...
gaymerx helm icon 2x
2014-07-28 15:04:49 -07:00
8f6673a19b
Merge pull request #252 from lemoness/develop
...
test - icon gaymerx armor
2014-07-28 16:02:58 -06:00
0711b2ee85
test - icon gaymerx armor
...
test - icon gaymerx armor
2014-07-28 15:00:00 -07:00
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
4f5f479dc8
chore(i18n): update locales
2014-07-28 16:03:15 +02: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
a7502e10ea
display backgrounds in reverse chronological order (most recent at top)
2014-07-27 14:54:17 +10:00
1e797a0b05
show more avatar background (remove Lvl, hide avatar name)
2014-07-27 08:41:33 +10: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
75eb860650
feat(mystery): july mystery items
2014-07-24 19:40:27 -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
fe04f37118
Fixes #3260 : Buttonless habits full width
...
When the user has neither a plus nor a minus button on
one of their habits, the habit’s title will now span the entire
width of the task div instead of having a gap to the left.
2014-07-22 16:55:50 -04: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
9d5ac44e6a
change quest warning to match current behaviour
2014-07-22 11:26:00 +10: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
5a03c6f7ce
Merge pull request #248 from Omnomnobot/patch-2
...
Fixed a typo (chose --> choose)
2014-07-21 13:07:08 -06:00
695832f62c
Fixed a typo (chose --> choose)
2014-07-21 16:08:17 +02: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
9c50eb8b06
Merge pull request #226 from 3onyc/feature/username-change
...
Implement "Change username" feature
2014-07-19 16:48:24 -06:00
acc874c60d
Merge pull request #3597 from 3onyc/feature/username-change
...
Implement "Change username" feature
2014-07-19 16:48:20 -06:00
327a337a26
Merge pull request #234 from HabitRPG/sabe/crits
...
feat(crits): Make crit hits boost MP
2014-07-18 16:59:02 -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
c96ef70428
feat(dilatory): add dilatory achievement
2014-07-17 18:36:50 -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
f1db2bf1d5
refactor(dotSet): move dotSet & dotGet to exports
2014-07-17 12:55:45 -06:00
7c51910835
Fixed over width issue caused by the filters div
2014-07-16 19:54:01 -05:00
b449387cc0
fix(dilatory): add honey https://twitter.com/ogbajoj/status/489515513148497920
2014-07-16 15:50:42 -06: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
Tyler Renelle