Commit Graph

6348 Commits

Author SHA1 Message Date
Sabe Jones de21ec8cf5 fix(event): Card notif display 2015-02-12 07:52:52 -06:00
Sabe Jones 37ae50a77a fix(event): Correct card notifs 2015-02-12 07:45:47 -06:00
Sabe Jones a5052b1f51 feat(event): Card notifs 2015-02-12 07:39:10 -06:00
Sabe Jones 894b3bf15e Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into valentines 2015-02-12 07:21:18 -06:00
Sabe Jones 9a44ab76ec fix(event): Line breakage II 2015-02-10 20:56:46 -06:00
Sabe Jones 9fddb08aeb fix(event): Localize poems 2015-02-10 20:47:40 -06:00
Sabe Jones 6a6a4a0e57 feat(event): Valentine's cards 2015-02-10 20:30:20 -06:00
Matteo Pagliazzi 9c6fc78a2f invite friend to guild: pass guild name 2015-02-10 22:07:36 +01:00
Matteo Pagliazzi be27646143 correctly fetch group.type 2015-02-10 21:53:26 +01:00
Matteo Pagliazzi 0d23ef94da fix when second email not defined 2015-02-10 21:42:43 +01:00
Matteo Pagliazzi 40210b8a4d Merge pull request #4664 from HabitRPG/paglias/invites-reworking
Invites refactor
2015-02-10 19:57:30 +01:00
Matteo Pagliazzi 06561bf70f finash invites reworking 2015-02-10 19:40:15 +01:00
Matteo Pagliazzi fdf0c1d3ec bring client side changes and cleanup 2015-02-10 17:35:50 +01:00
Matteo Pagliazzi b069529fe8 add todos 2015-02-10 17:35:50 +01:00
Matteo Pagliazzi 291b5eb1e7 partial 2015-02-10 17:35:49 +01:00
Blade Barringer b1d535874d Updated last revised date 2015-02-09 22:38:06 -06:00
Blade Barringer 7f29503ff2 Corrected names 2015-02-09 22:29:36 -06:00
Blade Barringer 64f24f051b Merge branch 'community-guidelines-updates-#4557' of https://github.com/ojintoad/habitrpg into comm-guide 2015-02-09 22:28:56 -06:00
ojintoad 5489c37a1e Updating blacksmiths list 2015-02-09 21:50:46 -05:00
ojintoad 1c3873647b Spacing out paragraphs 2015-02-09 21:45:09 -05:00
Lisa Marie 24a6b2f4cc migration(plans): sample code for plans which didn't get applied 2015-02-09 19:39:05 -07:00
Sabe Jones bf54bde207 feat(event): Valentine's Day 2015-02-09 20:17:49 -06:00
Matteo Pagliazzi 8bd116f2c5 fix gems gifting 2015-02-09 19:31:18 +01:00
Matteo Pagliazzi f303a71e66 site can be used when sessionPartyInvite is invalid 2015-02-09 19:11:14 +01:00
Matteo Pagliazzi 9dfe18bc70 typo 2015-02-09 17:43:14 +01:00
ojintoad 4ba7f9f7c8 moves dupes to the severe infractions list 2015-02-09 00:14:05 -05:00
ojintoad 2b0f667368 Adds language to Address PMs, explicitly forbid spamming, list sexism in the public spaces inappropriate behaviors, define duplicate accounts as severe infractions. 2015-02-09 00:08:36 -05:00
ojintoad a6106dc6ca removed space 2015-02-08 23:33:15 -05:00
ojintoad d3054a3c7b Adding blade to moderators list and graphic 2015-02-08 23:26:27 -05:00
Sabe Jones 4b96ee83b6 chore(news): 2/8 Bailey 2015-02-08 15:21:43 -06:00
Matteo Pagliazzi 8b88b34475 correctly redirect after authentication 2015-02-08 21:45:30 +01:00
Matteo Pagliazzi 58cec5259a enable quest invitation email 2015-02-08 20:33:03 +01:00
Matteo Pagliazzi 7d139b4adc add quest invitation email (disabled for now) and fixes 2015-02-07 22:20:16 +01:00
Matteo Pagliazzi 4f66d30441 implement quest started email 2015-02-07 21:36:38 +01:00
Alice Harris 468f414710 Merge pull request #4644 from Alys/develop
database script to identify and remove duplicate tasks for one user - use with caution!
2015-02-07 14:04:58 +10:00
Alice Harris 734227c472 improve spacing 2015-02-07 14:00:21 +10:00
Alice Harris ef8b783f2b add script that helps a database admin find and remove tasks with duplicated IDs for a single user 2015-02-07 13:51:22 +10:00
Tyler Renelle 2d44783d80 fix(tour): don't restart tour on userUpdated, fixes #4632 2015-02-05 15:46:20 -07:00
Blade Barringer 3897266ba6 Removed trailing comma from .jshintrc 2015-02-05 11:15:01 -06:00
Blade Barringer 3f064ee1bf Merge pull request #4566 from Verabird/fixDateFormat
Fix date format for charts (#4558)
2015-02-04 21:59:00 -06:00
Tyler Renelle 63320d3fe7 refactor(tour): small cleanup 2015-02-04 19:40:06 -07:00
Tyler Renelle 3916346308 fix(tour): misc tour fixes. uses backdrop, next/prev (important we've
found in user test vids), etc
2015-02-04 18:55:29 -07:00
Verabird d7b0bd5b72 Add access to .User in MemberModalCtrl 2015-02-04 20:15:18 -05:00
Verabird fecba8f9f5 Shorten dateFormat string in graphs 2015-02-04 13:38:24 -05:00
Verabird 3cb182fb53 Add dateFormat choice to charts and other hardcoded MM/DD/YYYY 2015-02-04 13:38:24 -05:00
Matteo Pagliazzi 637928371b better browser monitoring 2015-02-04 17:03:18 +01:00
Matteo Pagliazzi 9227c7b3d3 add new relic browser agent 2015-02-04 16:50:54 +01:00
Tyler Renelle c3bb42b108 fix(auth): search case-insensitive usernames when registering 2015-02-03 21:45:17 -07:00
Tyler Renelle 035fe8c0de Merge pull request #4625 from HabitRPG/lefnire/facebook-to-local
feat(facebook-to-local): allow users to move from facebook=>local
2015-02-03 19:27:20 -07:00
Tyler Renelle 5ec2c118a5 feat(facebook-to-local): allow users to move from facebook=>local 2015-02-03 19:23:49 -07:00