1198 Commits

Author	SHA1	Message	Date
Matteo Pagliazzi	7866f7393b	clean up code, add deleteSocial method	2015-11-21 12:03:08 +01:00
Matteo Pagliazzi	972cbbdaa6	try moving all the logic to the model	2015-11-19 21:09:39 +01:00
Matteo Pagliazzi	6451264572	start porting register local user handler, several bug fixes	2015-11-19 12:13:54 +01:00
Matteo Pagliazzi	d5d13477d7	wip user controllers: local login method	2015-11-18 18:02:35 +01:00
Blade Barringer	627da76b49	Merge branch 'develop' into api-v3	2015-11-18 09:09:49 -06:00
Blade Barringer	f94394127a	Remove unused var	2015-11-18 08:00:14 -06:00
Blade Barringer	9e557c43d3	Fix bug where seasonal items could not be purchased.	2015-11-18 07:58:01 -06:00
Blade Barringer	26b82dff4b	Fix bug where armoire items could not be repurchased.	2015-11-18 07:57:45 -06:00
Blade Barringer	08c4ec5557	Merge branch 'develop' into api-v3	2015-11-17 23:15:15 -06:00
Blade Barringer	94bf181301	Add noscript locales	2015-11-17 22:02:57 -06:00
Blade Barringer	0a7d7fc42d	Merge pull request #6251 from crookedneighbor/modularize-content-gear ... Pull out gear into separate modules	2015-11-17 21:57:13 -06:00
Blade Barringer	4d415ee9c1	chore(i18n): update locales	2015-11-17 21:54:30 -06:00
Blade Barringer	fba35ea491	chore(i18n): update locales	2015-11-17 21:48:55 -06:00
Blade Barringer	6bd0ed76cc	Fixes #6524. Correct spelling of community	2015-11-17 21:41:06 -06:00
Blade Barringer	71473a93ad	chore(i18n): update locales	2015-11-17 21:38:32 -06:00
Blade Barringer	1299afcb01	Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js	2015-11-17 21:28:22 -06:00
Gautham Chandra	37e08e8d5d	Converted noscript text into translatable strings	2015-11-17 22:22:55 -05:00
Blade Barringer	a11048b604	Split out wondercon gear into separate module	2015-11-17 17:16:38 -06:00
Blade Barringer	f58b3eee64	Move special gear into own subdirectory	2015-11-17 17:06:00 -06:00
Blade Barringer	195b39561b	Move contributor gear to own module	2015-11-17 09:01:38 -06:00
Blade Barringer	2bac9c3c17	Separate out backer gear into own module	2015-11-17 08:17:40 -06:00
Blade Barringer	03c1a957f6	Correct ownsItem function to allow owning item if user has ever previously owned the item.	2015-11-17 08:13:20 -06:00
Blade Barringer	3000517b06	Fix bug where any backer or contributor item could be purchased.	2015-11-16 21:47:46 -06:00
Blade Barringer	e6a5d08150	Merge branch 'develop' into api-v3	2015-11-16 17:34:30 -06:00
Blade Barringer	639dfb31d7	Pull out gear into separate modules	2015-11-16 17:29:13 -06:00
Sabe Jones	c352a30d4e	chore(news): Bailey 2015-11-16 ... Also sprite recompile to incorporate sticker promo image.	2015-11-16 17:26:44 -05:00
Sabe Jones	2d1ad12cbd	fix(strings): Make plural more greppable	2015-11-16 17:08:38 -05:00
Sabe Jones	16878af76f	fix(string): Contest to Contestant	2015-11-16 16:17:48 -05:00
Sabe Jones	e73c7be47a	fix(achievement): Make Costume Contest repeatable	2015-11-16 16:07:16 -05:00
Blade Barringer	61948e1ca5	Add filter to lodash import.	2015-11-16 12:22:00 -06:00
Blade Barringer	c3f8bb0726	Correct count module to use correct lodash 3 syntax	2015-11-16 12:10:58 -06:00
Blade Barringer	9bf1ebdb0f	Remove last of coffee files	2015-11-16 08:14:42 -06:00
Blade Barringer	f20336861a	Correct lodash syntax	2015-11-16 08:07:20 -06:00
Blade Barringer	00055ad055	Merge branch 'develop' into api-v3	2015-11-15 14:57:41 -06:00
Gautham Chandra	b5e10bf1e9	Added a helpful message for when JS is disabled	2015-11-15 14:12:12 -05:00
Blade Barringer	2a7dfe09a0	Move user can own quest categories constant to constants module.	2015-11-15 12:27:16 -06:00
Blade Barringer	40cee42e03	Remove unneeded return statement	2015-11-15 11:04:17 -06:00
Blade Barringer	6ec864ea4e	Remove unused src files in content directory	2015-11-15 11:03:30 -06:00
Blade Barringer	1a31c26330	Add item list to common constants module	2015-11-15 11:03:17 -06:00
Blade Barringer	411946e487	Modularize mystery sets	2015-11-15 10:08:40 -06:00
Blade Barringer	600f3e4554	Extract classes, events and gearTypes into constants file.	2015-11-15 09:47:06 -06:00
Blade Barringer	b13b2d0f62	Remove coffee content index file	2015-11-15 09:28:26 -06:00
Blade Barringer	e5d99ce271	Convert common files to es2015.	2015-11-15 08:16:55 -06:00
Matteo Pagliazzi	879ec97408	fix some requires	2015-11-13 17:41:18 +01:00
Matteo Pagliazzi	38749eae1b	fix i18n.js so that it supports lodash 3	2015-11-13 17:30:12 +01:00
Blade Barringer	6e8e1648d9	Merge branch 'develop' into api-v3	2015-11-13 07:38:24 -06:00
Blade Barringer	565aaff976	Merge pull request #6219 from HabitRPG/js_ify_common ... Js ify common	2015-11-13 06:49:54 -06:00
Blade Barringer	5ebead68ab	Remove coffee version of i18n	2015-11-11 21:24:21 -06:00
Blade Barringer	efd0e2333e	Merge pull request #6200 from gauthamchandra/feature/quick-checkout-from-dailies ... User can now check out of inn from tasks page	2015-11-11 20:49:35 -06:00
Blade Barringer	774a42d67e	Convert coffee files to JS	2015-11-11 20:32:00 -06:00