Commit Graph

8488 Commits

Author SHA1 Message Date
Blade Barringer cb2af51faa Corrected ng-click to join 2015-02-25 14:45:04 -06:00
Blade Barringer 0d7b6b445e Added buttons for joining and leaving group. 2015-02-25 14:34:24 -06:00
Blade Barringer 30e158de48 Add _isMember attribute to groupSchema 2015-02-25 11:51:32 -06:00
Sabe Jones b4b56e87f0 Merge pull request #4751 from SabreCat/mystery
Mystery Feb 2015
2015-02-24 21:01:52 -06:00
Sabe Jones 3d3438e074 chore(grunt): Compile sprites 2015-02-24 20:45:50 -06:00
Sabe Jones 7d943d9007 fix(mystery): Last missing sprite 2015-02-24 20:40:32 -06:00
Sabe Jones f5f21718ae fix(mystery): Missing sprites 2015-02-24 20:33:02 -06:00
Sabe Jones 55066480fb feat(mystery): Migration 2015-02-24 20:19:20 -06:00
Sabe Jones d4f8acd0ef feat(mystery): February 2015 2015-02-24 20:15:31 -06:00
Blade Barringer 33bd640bdb Fixes #3054 won't show pets as able to be fed if egg has noMount propery 2015-02-24 19:10:45 -06:00
Blade Barringer 016e359690 Fixes #4749 2015-02-24 16:58:48 -06:00
Blade Barringer 6eeff5a0af Changed matt back to brown hair version 2015-02-24 13:37:14 -06:00
Matteo Pagliazzi 6d637e89a2 new bailey 2015-02-24 19:29:00 +01:00
Matteo Pagliazzi 45f2453a62 typo 2015-02-24 16:51:09 +01:00
Tyler Renelle 02901e52fd perf(auth): small register perf improvement. use $or in $regex query,
intead of two queries, so if first operand true we short-circuit second operand
2015-02-23 23:48:46 -07:00
Tyler Renelle 16c4c420bb chore(server): small updates to better support recent nodejs buildpack 2015-02-23 23:48:46 -07:00
Blade Barringer e9b72ad40d Merge pull request #4721 from crookedneighbor/fix-challenge-select-ios
Fixes #4719. Guild select for challenges pre-populates with first group
2015-02-23 22:09:17 -06:00
Matteo Pagliazzi 14d6a59e96 chore(i18n): update locales 2015-02-23 21:53:50 +01:00
Matteo Pagliazzi 4da8eb1d58 fix(typo) 2015-02-23 21:51:15 +01:00
Matteo Pagliazzi 4151b0733f add ability to unsubscribe from a single event using a dedicated link 2015-02-23 21:25:01 +01:00
Blade Barringer b010a53bed Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-02-23 11:11:38 -06:00
Blade Barringer 067f32a4ae Corrected paths in karma conf 2015-02-23 11:11:19 -06:00
Tyler Renelle a819f68fdf minor migration update 2015-02-23 09:50:28 -07:00
Blade Barringer 21ef62481d Removed step attribue from contributor input 2015-02-23 09:41:27 -06:00
Blade Barringer a2eda6c91a Merge pull request #4733 from remmz0r/gemDisplay
Gem Display Text in Modals (new) - Fixes #4645
2015-02-22 13:17:47 -05:00
Blade Barringer 5aa4015249 Refactored pet display name changes 2015-02-22 12:12:38 -05:00
Blade Barringer f355672b3b Merge pull request #4703 from scribblypanda/issue2825
added pet colour to feed/evolve notif
2015-02-22 12:12:23 -05:00
Bryce Wojtowicz 0931d52d56 Edit: fixed tabs instead of spaces issue 2015-02-22 13:39:19 +08:00
Bryce Wojtowicz 44478d3792 Fixes #4645
Fixes Gem Display in modals to say [Gem] You have [n] Gems
Modified code to use a translatable string!
Thanks for the tip :)
2015-02-22 13:35:50 +08:00
Matteo Pagliazzi 6d38086b66 use profile name in emails for fb users 2015-02-20 18:17:54 +01:00
Matteo Pagliazzi 397a293ca8 change text for recapture emails settings 2015-02-20 18:15:47 +01:00
Matteo Pagliazzi ba11d827bb chore(i18n): update locales 2015-02-20 18:04:01 +01:00
Blade Barringer 98ecd4b457 Fixes #4719. Guild select for challenges pre-populates with first group 2015-02-19 16:53:15 -06:00
Blade Barringer 78e124c576 Updated path to models on Github. Closes #4720 2015-02-19 15:49:26 -06:00
Blade Barringer a2783400ab Merge pull request #4716 from chimericdream/bulk-add-tasks
Bulk add tasks - auto-focus task box when toggling
2015-02-19 14:31:55 -06:00
Blade Barringer bdef56f7ae Changed api key input to password so password managers can recognize it 2015-02-19 14:07:28 -06:00
Bill Parrott 98c6526cf7 add auto-focus when single/multiple is toggled 2015-02-19 08:46:45 -06:00
Blade Barringer c215b90869 Merge pull request #4699 from chimericdream/bulk-add-tasks
Bulk add tasks (first version; seeking review & feedback)
2015-02-18 16:41:31 -06:00
Blade Barringer 0bd912be30 Merge pull request #4690 from chimericdream/task-difficulty-context-classes
Add difficulty context class to task list items
2015-02-18 16:37:53 -06:00
Blade Barringer 3784927ddb Added additional line breaks under date 2015-02-18 14:42:43 -06:00
Blade Barringer 87893ced0d Updated dates on terms and privacy pages 2015-02-18 14:39:06 -06:00
Blade Barringer e25f9cb183 Changed privacy link to relative link 2015-02-18 14:24:44 -06:00
Blade Barringer c24d85c21c Updated email and address 2015-02-18 14:23:53 -06:00
Blade Barringer dd6a8d35db Updated link to privacy policy 2015-02-18 13:52:20 -06:00
Matteo Pagliazzi 38af7ff3c1 emails: add optional reply_to_address variable 2015-02-18 19:31:02 +01:00
Matteo Pagliazzi 37433ee1aa chore(i18n): update locales 2015-02-18 17:41:31 +01:00
Bill Parrott 3599eaefaf Merge branch 'develop' into bulk-add-tasks 2015-02-17 22:32:28 -06:00
Bill Parrott 789575d6fb Merge branch 'develop' into task-difficulty-context-classes 2015-02-17 22:31:27 -06:00
Sabe Jones 7e3429c795 Merge pull request #4708 from SabreCat/pet-rocks
Pet rocks
2015-02-17 20:50:36 -06:00
Sabe Jones 87b13d5fc8 chore(grunt): compile sprites 2015-02-17 20:46:40 -06:00