311 Commits

Author	SHA1	Message	Date
Sabe Jones	f065feb6cb	fix(mouse): Missing ears	2015-03-20 15:50:22 -05:00
Sabe Jones	ae25af7c02	fix(shop): Enable head accessories	2015-03-20 15:27:56 -05:00
Sabe Jones	e2b1083088	fix(spring): Tweaks	2015-03-20 15:19:37 -05:00
Sabe Jones	f3f5669ab2	feat(spring): Fling	2015-03-20 14:56:00 -05:00
Matteo Pagliazzi	fa2c44a9c7	chore(i18n): update locales	2015-03-20 17:13:53 +01:00
Sabe Jones	7065b400bc	feat(surveys): Close out survey	2015-03-19 21:44:42 -05:00
Tyler Renelle	1e8265a9f1	feat(tour): add the other tour entries @lemoness	2015-03-19 15:53:12 -06:00
Alys	5198050cd2	Merge pull request #4863 from rdhammond/InstantPartySource ... Instant party source	2015-03-20 06:46:38 +10:00
Tyler Renelle	152853a877	feat(tour): update habits step wording @lemoness	2015-03-19 14:28:05 -06:00
Matteo Pagliazzi	4c3e7f897e	chore(i18n): update locales	2015-03-19 20:21:04 +01:00
Tyler Renelle	84a77695ea	feat(ads): remove ads completely	2015-03-19 11:39:17 -06:00
Alice Harris	c880c525b4	add missing closing li and ul tag, remove excess b tags to make life easier for translators	2015-03-20 00:27:54 +10:00
Matteo Pagliazzi	f243617ccf	chore(i18n): update locales	2015-03-18 20:01:29 +01:00
Matteo Pagliazzi	0be58eb403	fix(i18n): remove empty strings as they break transifex	2015-03-18 19:57:00 +01:00
Matteo Pagliazzi	75d1a766e5	chore(i18n): update locales	2015-03-18 19:37:26 +01:00
Matteo Pagliazzi	9e540e86af	add email with optional message when kicking user from group	2015-03-18 19:12:53 +01:00
Matteo Pagliazzi	0722a17897	start working on kick from group email & message	2015-03-18 17:31:07 +01:00
Matteo Pagliazzi	6d163ecb5d	chore(i18n): update locales	2015-03-18 12:13:36 +01:00
Alice Harris	4868a6facb	replace non-ascii punctuation with ascii versions (... and ' and -)	2015-03-18 19:30:00 +10:00
Alice Harris	833ba9ec4a	change Gully3 to Gully as requested by Gully in the Tavern and as confirmed by Lemoness	2015-03-18 19:13:39 +10:00
Sabe Jones	607286afa5	fix(quest): Typo	2015-03-17 21:59:08 -05:00
Sabe Jones	4c5f4377ff	fix(quests): Alternate unlock strings	2015-03-17 21:48:22 -05:00
Sabe Jones	b118d45bb3	fix(string): Missing comma	2015-03-17 21:28:50 -05:00
Sabe Jones	4cb6783544	feat(quest): Bunny quest	2015-03-17 21:24:46 -05:00
Alice Harris	fcc0b67426	updated survey badge message (Leslie made a trello card to close the survey on the 19th)	2015-03-17 14:03:25 +10:00
Alice Harris	c47606c5b2	remove Show Tour button from Settings->Site; (unrelated to that) delete an outdated comment	2015-03-17 07:49:37 +10:00
Matteo Pagliazzi	b0b6864f1c	chore(i18n): update locales	2015-03-16 19:56:35 +01:00
Tyler Renelle	9d5889c428	fix(interactive-tour): remove old unused strings	2015-03-16 12:38:22 -06:00
Matteo Pagliazzi	0d42a71517	chore(i18n): update locales	2015-03-16 15:33:42 +01:00
Alice Harris	44259925e4	re-add the dequip option for removing backgrounds with proper bug fix (ref 9199c6c7e2); make whitespace consistent	2015-03-16 19:27:44 +10:00
R. Daniel Hammond	a46c5c0225	We shouldn't need the "refresh to see changes" now.	2015-03-15 20:52:50 -04:00
George Millo	293f41d087	%w"" syntax is native Ruby, not Rails	2015-03-15 14:48:36 +01:00
Matteo Pagliazzi	475ee0160b	chore(i18n): update locales	2015-03-15 13:39:23 +01:00
Bill Parrott	45287f3e4d	merge upstream and fix leveling loop	2015-03-14 21:32:27 -05:00
Alice Harris	9199c6c7e2	remove unequip background feature temporarily - fixes https://github.com/HabitRPG/habitrpg/issues/4857#issuecomment-80722868	2015-03-15 07:44:36 +10:00
Sabe Jones	6aedfa7209	chore(grunt): compile sprites	2015-03-14 11:18:36 -05:00
Sabe Jones	1120d334c3	feat(pie): Add pie	2015-03-14 11:11:20 -05:00
Alys	94f9cff279	Merge pull request #4850 from stillsnowedin/develop ... Added confirmation before deleting messages and moved buttons to top of ...	2015-03-14 22:32:46 +10:00
Alys	59f64830b1	Merge pull request #4799 from TheHollidayInn/add-dequip-button ... Added dequip ability per ticket: 3730	2015-03-14 21:36:57 +10:00
Alice Harris	0ceceaac1f	compile javascript	2015-03-14 19:38:58 +10:00
Alice Harris	2f072d8e96	Merge branch 'StealthMod' of https://github.com/Verabird/habitrpg into rebalancing-2015-03-2 ... Conflicts: common/script/index.coffee	2015-03-14 18:54:18 +10:00
Verabird	627b07ef86	Rebalance stealth diminishing returns again	2015-03-13 16:45:00 -04:00
Matteo Pagliazzi	dba7d3b522	chore(i18n): update locales	2015-03-13 18:40:11 +01:00
Verabird	fbeb83e836	Rescale stealth to strengthen	2015-03-13 11:38:34 -04:00
Verabird	180d87e9c7	removed commented out old stealth code	2015-03-13 10:53:29 -04:00
Verabird	4a0f165af8	Modify daily checklists to stay checked at cron if inactive and Stealth to only apply to active dailys	2015-03-13 10:53:29 -04:00
Bill Parrott	df0bf3136f	move max level tweaks to rebalancing branch	2015-03-13 07:48:14 -05:00
Kathryn Norris	9d92bd384c	Removed popover from delete messages button. (for #4848)	2015-03-13 05:05:54 -07:00
Kathryn Norris	47a05338e5	Added confirmation before deleting messages and moved buttons to top of Inbox. (fixes #4848)	2015-03-13 04:11:35 -07:00
Alice Harris	f58e7ef931	compile habitrpg-shared.js	2015-03-13 20:58:43 +10:00