Commit Graph

10468 Commits

Author SHA1 Message Date
Alys 467f725ef8 Merge pull request #5302 from agentx999/text-improvements
Various text improvements
2015-05-30 15:24:29 +10:00
hairlessbear 4fc0234fd4 Added behavior from #5239 (make quest completion modal always display before quest invite modal) 2015-05-29 18:25:47 -04:00
Sabe Jones a2f9e0579d chore(npm): install mixpanel 2015-05-29 16:24:03 -05:00
Sabe Jones 726a8f1acb feat(analytics): Mixpanel implementation WIP 2015-05-29 16:22:35 -05:00
Sabe Jones 5127814f9e chore(grunt): compile sprites 2015-05-29 15:19:51 -05:00
Sabe Jones 7a8046317d feat(tour): Iteration 5/29 2015-05-29 15:14:19 -05:00
hairlessbear 177f835353 Merge pull request #4 from crookedneighbor/blade-hairlessbear-quest_invite_modal_on_user_sync
Blade hairlessbear quest invite modal on user sync
2015-05-29 15:36:21 -04:00
Sabe Jones 6af7342693 feat(tour): Revised intro tutorial 2015-05-29 14:03:42 -05:00
Blade Barringer e3bc8805fe Refactor quest functions and add tests 2015-05-29 09:13:36 -05:00
Blade Barringer 42b482cb7e Make user sync after accepting or rejecting a quest 2015-05-28 08:18:08 -05:00
agentx999 d172d1548c challenge task text 2015-05-27 16:14:24 -07:00
agentx999 2843d1d278 boss damage text 2015-05-27 16:12:37 -07:00
agentx999 5d37eb3c5f tavern and challenge pop-ups, pet and mount pages 2015-05-27 16:09:25 -07:00
agentx999 47134a7094 checklist hover text, difficulty hover text 2015-05-27 16:02:00 -07:00
hairlessbear dc8647d6ae Changed all party.quest.key instances in quest invite modal to user.party.quest.key and changed invite modal check 2015-05-27 18:49:35 -04:00
Blade Barringer dc4359ab6f Remove monthly option 2015-05-27 12:32:14 -05:00
hairlessbear 966f9d2aca Fixed tests using crookedneighbor's code 2015-05-27 12:06:19 -04:00
hairlessbear a0f3e02f74 Set party.quest.key to null on quest reject and quest cancel 2015-05-27 11:52:53 -04:00
hairlessbear cc3d63b858 Fixed rewards on quest invite modal 2015-05-27 10:05:03 -04:00
hairlessbear cfcfb8fd02 Changed invite to RSVPNeeded 2015-05-27 09:18:44 -04:00
TheHollidayInn 527f041b67 Added leaving and removing tests 2015-05-26 23:14:35 -05:00
Blade Barringer 39cb9bfb99 downcase beffymaroo 2015-05-26 22:42:17 -05:00
TheHollidayInn 9214861cbd Added group update tests 2015-05-26 22:32:50 -05:00
TheHollidayInn 424117dc80 Added join tests and edited tests based on @crookedneighbor 's note 2015-05-26 22:32:50 -05:00
TheHollidayInn 6ae1b644b7 Added tests for group create errors 2015-05-26 22:32:50 -05:00
TheHollidayInn 1a0c990f98 Added create, get, and list tests to groups 2015-05-26 22:32:50 -05:00
Blade Barringer 9793df87d1 Merge branch 'reyrodrigez-develop' into develop 2015-05-26 22:26:48 -05:00
Blade Barringer 0e2f0596f6 Remove explicit divs 2015-05-26 22:26:24 -05:00
Blade Barringer 85993d25cf Merge branch 'hairlessbear-move_flower_to_accessories' into develop 2015-05-26 22:20:21 -05:00
Blade Barringer 615c3f18a5 Adjust gruntfile regex and recompile 2015-05-26 22:19:45 -05:00
hairlessbear 0fa93506f5 Made quest invite modal pop-up on user sync (rewards display currently nonfunctional) 2015-05-26 23:01:29 -04:00
Laszlo Heves eb3f7829cf Update date 2015-05-27 02:22:35 +02:00
Laszlo Heves e0eab880a4 Define semantic classes with shorthand syntax 2015-05-27 02:21:48 +02:00
Laszlo Heves 72c1e9e137 Using shorthand id definitions 2015-05-27 02:07:13 +02:00
Laszlo Heves 020f7f1f5d Adding semantic ids to community guidelines 2015-05-27 01:39:40 +02:00
Laszlo Heves 17842d2103 Adding Beffymaroo to moderators 2015-05-27 01:25:40 +02:00
Blade Barringer 8b347bca8b Remove everyX check from weeklies; Change UI of frequency selection; Prep for monthlies in UI 2015-05-26 17:59:11 -05:00
Blade Barringer fce9d39f19 Added in one-time-bindings 2015-05-26 09:02:25 -05:00
GihHubSphinx a788d51aa5 Made gift dialog translatable
Addressing a bit beyond _#10 in the opening post of
https://github.com/HabitRPG/habitrpg/issues/4522

Screenshot of before-after-proof: http://oi57.tinypic.com/11c9ldi.jpg
2015-05-26 17:18:18 +05:00
hairlessbear 958068c2b0 Rebased to resolve merge conflicts 2015-05-26 00:19:35 -04:00
Sabe Jones 844c1ed178 Merge pull request #5288 from SabreCat/develop
May Mystery Items
2015-05-25 19:21:07 -07:00
Sabe Jones ed25cffaf7 chore(grunt): compile sprites 2015-05-25 21:10:37 -05:00
Sabe Jones 3098cacf03 feat(subscriber): May Mystery Items 2015-05-25 21:03:13 -05:00
Blade Barringer 0f096bd405 Merge branch 'improved_dailies' of git://github.com/fallenpanda1/habitrpg into blade-Finish_weeklies_pr 2015-05-25 08:49:36 -05:00
Blade Barringer 5d93f364c1 Merge branch 'blade-hairlessbear_markdown_help_table' into develop 2015-05-24 22:47:02 -05:00
Blade Barringer 9b2798ee71 Refine markdown help 2015-05-24 22:45:09 -05:00
Blade Barringer 690321baca Merge pull request #5270 from GitHubSphinx/Sphinx-i18n-db2
Made text on static/contact translatable
2015-05-24 22:17:10 -05:00
Blade Barringer a298393e04 Merge pull request #5275 from GitHubSphinx/Sphinx-entry1
Swap faq and overview in the top menu
2015-05-24 22:15:24 -05:00
Blade Barringer 466221f848 Correct test syntax 2015-05-24 22:13:51 -05:00
Blade Barringer 30ef563534 Merge branch 'negue-anonymizedUser' into develop 2015-05-24 22:04:18 -05:00