Commit graph

2004 commits

Author SHA1 Message Date
Alice Harris
c68a061c0d experimental changes for indicating acceptance of guidelines 2014-09-07 15:14:58 +10:00
Alice Harris
87d8387640 change order of staff/moderator names at top of Tavern chat to staff, npc, moderator 2014-09-05 21:20:42 +10:00
Alice Harris
9457c844cc move Community Guidelines from an included html page in a modal to a static page with no modal 2014-09-05 21:17:57 +10:00
Alice Harris
cd7f87bbfe add glyphicons to admin names, refactor code to reduce duplication of contrib.level style assignments, sort moderator name list sensibly 2014-09-05 21:17:56 +10:00
Alice Harris
73cd71d74b add star/tower glyphicons for mods/staff in Hall; in Hall, change admin's description of levels; create migration script for increasing admin tiers 2014-09-05 21:17:55 +10:00
Tyler Renelle
6229b2c79e perf(auth): exclude unecessary auth fields 2014-09-02 15:54:56 -06:00
Tyler Renelle
772ea500a3 feat(auth): allow logging in with either username or email address 2014-09-02 12:23:29 -06:00
Negue
8fa565e9a0 get a list of buyable gear 2014-08-25 18:23:04 +02:00
Alice Harris
1ca981d90a allow notification icon to go grey by deleting seen message data instead of setting to false 2014-08-23 14:51:34 +10:00
Tyler Renelle
88d27e2153 Merge branch 'Fandekasp-sortable_tags' into develop
Conflicts:
	public/js/directives/directives.js
2014-08-19 15:00:36 -06:00
Tyler Renelle
ba8cda2e51 Merge pull request #3425 from denis-sokolov/user-findtask-patch
chore(user): tiny cleanup in findTask function
2014-08-19 13:12:51 -06:00
Matteo Pagliazzi
6340312695 fix(fbAuth): get user email @lefnire this should be all we need but not having the keys i can not test before going live 2014-08-19 04:41:04 +02:00
Matteo Pagliazzi
81b96b0f7e fix(i18n): add support for latin american spanish 2014-08-18 19:17:40 +02:00
Matteo Pagliazzi
15641b5f37 fix(i18n): add moment support for chinese 2014-08-16 20:16:44 +02:00
Tyler Renelle
39911ef8e0 feat(audio): refactor user.preferences.{sound,soundTheme} into just
user.preferences.sound. Fix audio dropdown bug by moving to list-items instead
2014-08-15 18:13:59 -06:00
Adrien Lemaire
e5bb299ad0 Make tags sortable with drag&drop 2014-08-10 23:00:27 +09:00
Adrien Lemaire
3d2d8fbfef clean branch from develop to add audio 2014-08-08 23:03:52 +09:00
Alice Harris
a8ad9f89e8 reinsert default blue flower https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-07 13:50:29 +10:00
Tyler Renelle
33b2e8c4fe fix(flower): remove default on flower for now, #1529 @Alys 2014-08-05 13:08:40 -06:00
Matteo Pagliazzi
40fb17fdaf fix(console): remove console.log 2014-08-03 18:32:25 +02:00
Matteo Pagliazzi
1d92ddd645 feat(i18n): add change language button on front page, fix #3530 2014-08-03 18:23:13 +02:00
Alice Harris
2c013ca73a de-aryanize default avatar https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-03 13:20:51 +10:00
Jeremy Lee
79bd088589 add correct styling to moderator names in message above Tavern chat 2014-08-02 07:28:29 +10:00
Tyler Renelle
a2df27d7f2 fix(forgot-password): allow aliases (x+y@z.com) in email lookup, fixes #3805 2014-07-29 12:58:31 -06:00
Tyler Renelle
a4ae9332bb feat(block-user): show "blocked" status in an alert, log the user out 2014-07-25 12:14:48 -06:00
Tyler Renelle
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
Tyler Renelle
5c309444e0 fix(coupons): fix to limit 2014-07-22 18:35:55 -06:00
Tyler Renelle
ca31d46e0e tmp(coupons): just export c._id to csv 2014-07-21 22:39:36 -06:00
Tyler Renelle
439828d2b1 feat(coupons): update wording @veeeeeee 2014-07-21 22:27:25 -06:00
Tyler Renelle
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
Tyler Renelle
dda7f86433 Merge branch 'thedavemarshall-update_billing_info' into develop 2014-07-21 14:48:17 -06:00
David Marshall
5cc4c60329 Edit stripe cc subscriptions 2014-07-21 01:08:56 -07:00
Tyler Renelle
acc874c60d Merge pull request #3597 from 3onyc/feature/username-change
Implement "Change username" feature
2014-07-19 16:48:20 -06:00
Tyler Renelle
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
Tyler Renelle
016d99a4a7 fix(dilatory): dont' modify original user.progress on world boss dmg,
fixes #3737
2014-07-14 20:52:37 -06:00
Tyler Renelle
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
Tyler Renelle
89369e21a3 fix(quests): prevent very high damage 2014-07-12 15:16:32 -06:00
Tyler Renelle
860b3acc52 fix(dilatory): tmp fix to prevent high damage #3712 2014-07-12 15:06:07 -06:00
Tyler Renelle
496618c665 fix(quests): don't reset quest progress when world boss defeated 2014-07-12 14:32:12 -06:00
Tyler Renelle
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
Tyler Renelle
a8b2b32557 refactor(groups): cleanup leave-group code 2014-07-11 14:43:11 -06:00
Tyler Renelle
327482f0b0 fix(password): case-insensitive emails in forgot-password 2014-07-10 21:11:58 -06:00
Tyler Renelle
b71767d1d8 Merge pull request #3686 from vIiRuS/apiDoc
document content of _tmp on task up/down fixes #3012
2014-07-07 13:59:31 -06:00
Tyler Renelle
973732421a fix(delete account): allow deleting account after they've canceled
subscription, before it terminates
2014-07-07 13:37:16 -06:00
Phillip Thelen
de7bfce953 document content of _tmp on task up/down fixes #3012 2014-07-06 15:01:46 +02:00
Matteo Pagliazzi
0efb74eaed fix(swagger): rollback unwanted changes 2014-07-03 18:51:40 +02:00
Matteo Pagliazzi
e72a6668fc fix(swagger): correct API docs, fix #3679 2014-07-03 18:44:56 +02:00
Tyler Renelle
e5c002bcdb feat(chat): dynamic list of tavern mods (see http://goo.gl/9XhIZ6) 2014-06-29 16:20:38 -06:00
Tyler Renelle
14c6019258 fix(dilatory): misc chat fixes for better formatting of neglect strikes 2014-06-25 21:35:22 -06:00
Tyler Renelle
9f1035c317 feat(dilatory): scene damage + boss def/str. bug fixes, tests 2014-06-25 14:12:30 -06:00