184 commits

Author	SHA1	Message	Date
Matteo Pagliazzi	85b547196e	chore(i18n): update locales	2015-02-28 18:23:17 +01:00
Sabe Jones	d4f8acd0ef	feat(mystery): February 2015	2015-02-24 20:15:31 -06:00
Blade Barringer	016e359690	Fixes #4749	2015-02-24 16:58:48 -06:00
Matteo Pagliazzi	14d6a59e96	chore(i18n): update locales	2015-02-23 21:53:50 +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	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	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	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
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
Sabe Jones	0608ac5caa	feat(quest): Pet Rocks	2015-02-17 20:02:06 -06:00
Blade Barringer	78430b1910	Collapsed 3 strings into single string	2015-02-17 15:26:42 -06:00
Bryce Wojtowicz	3a86435655	fixes #4670 ... edited groups.json (again) sorry last edit !!!	2015-02-18 05:08:02 +08:00
Bryce Wojtowicz	9f49626156	fixes #4670 ... edit: fixed the linkLFG so it included the entire Guild name	2015-02-18 05:06:13 +08:00
Bryce Wojtowicz	33520fc64d	Fixed groups.json ... fixes #4702 Cheers	2015-02-18 05:03:34 +08:00
Bill Parrott	7042c97d5d	removing export functionality to move to its own branch	2015-02-17 14:23:55 -06:00
Bill Parrott	4563d22bf0	minor updates from code review	2015-02-17 14:05:09 -06:00
scribblypanda	d46633b089	added pet colour to feed/evolve notif	2015-02-17 12:54:34 -05:00
Bill Parrott	2de3a5dd55	first draft of bulk add	2015-02-17 00:25:56 -06:00
Bill Parrott	b1b478bc74	add task export functionality	2015-02-16 21:21:49 -06:00
Matteo Pagliazzi	34d8a910e3	chore(i18n): update locales	2015-02-14 17:56:11 +01:00
Blade Barringer	9ddb5e35fb	Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert ... Conflicts: common/dist/scripts/habitrpg-shared.js common/dist/sprites/habitrpg-shared.css common/img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png common/img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png common/img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png common/img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png common/img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png common/img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png img/sprites/spritesmith/customize/hair/hair_base_10_TRUred.png img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png img/sprites/spritesmith/customize/hair/hair_base_11_TRUred.png img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png img/sprites/spritesmith/customize/hair/hair_base_12_TRUred.png img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png img/sprites/spritesmith/customize/hair/hair_base_13_TRUred.png img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png img/sprites/spritesmith/customize/hair/hair_base_14_TRUred.png img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png img/sprites/spritesmith/customize/hair/hair_base_9_TRUred.png	2015-02-12 13:42:11 -06:00
Blade Barringer	4b8b7bc87d	Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert	2015-02-09 22:40:15 -06:00
Blade Barringer	45d1fb4c6e	Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert ... Conflicts: common/dist/scripts/habitrpg-shared.js	2015-02-09 22:18:22 -06:00
Blade Barringer	f54b28e7bf	Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert	2015-02-03 21:17:52 -06:00
Blade Barringer	6f4fbfeaeb	Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert ... Conflicts: common/img/sprites/spritesmith/npcs/npc_ian.png common/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png dist/habitrpg-shared.css dist/habitrpg-shared.js dist/spritesmith1.css dist/spritesmith1.png dist/spritesmith2.css dist/spritesmith2.png dist/spritesmith3.css dist/spritesmith3.png dist/spritesmith4.css dist/spritesmith4.png	2015-02-03 19:26:14 -06:00
Blade Barringer	88be8f3274	Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert ... Conflicts: common/img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png common/img/sprites/spritesmith/npcs/npc_bailey_broken.png common/img/sprites/spritesmith/npcs/npc_justin_broken.png common/img/sprites/spritesmith/npcs/npc_matt_broken.png img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png img/sprites/spritesmith/gear/events/birthday/shop_armor_special_birthday2015.png img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png img/sprites/spritesmith/npcs/npc_bailey_broken.png img/sprites/spritesmith/npcs/npc_justin_broken.png img/sprites/spritesmith/quests/inventory_quest_scroll_penguin.png	2015-02-01 14:07:18 -06:00
Blade Barringer	4588be29ee	Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert	2015-01-23 15:29:56 -06:00
Blade Barringer	c91b0cd34a	Moved folders into common directory	2015-01-21 10:34:04 -06:00