1119 commits

Author	SHA1	Message	Date
Sabe Jones	f97012798e	WIP(party-page): Party preview graphic	2015-08-06 16:36:28 -05:00
Sabe Jones	f1704a6a92	WIP(party-page): Active party page	2015-08-06 12:13:50 -05:00
Sabe Jones	c275db6b4b	Merge branch 'develop' into sabrecat/party-page	2015-08-05 12:43:56 -05:00
Blade Barringer	3e5a3a00cb	Merge pull request #5741 from HabitRPG/use_base_url_for_redirect ... Adjust Force Habitica Code	2015-08-04 19:22:50 -05:00
Blade Barringer	82d2d6507f	Add missing space	2015-08-04 18:55:55 -05:00
Blade Barringer	e6c1b69cb0	Swap out isHabitrpg for ignoreRedirect	2015-08-04 18:55:26 -05:00
Blade Barringer	93a2d3d660	Use constants for is_prod and base_url	2015-08-04 18:30:27 -05:00
Blade Barringer	675808e54e	Catch habitrpg.com specifically	2015-08-04 18:16:36 -05:00
Sabe Jones	68cc0fd56a	fix(avatar): Delist Splashy Skins ... Also removes a style that was causing hair colors to be the only 40x40 buttons on a page full of 60x60 buttons.	2015-08-04 15:17:38 -05:00
Sabe Jones	bc11e03bef	fix(sharing): Localize Tweet text	2015-08-04 14:55:15 -05:00
Sabe Jones	60e65a8bea	feat(armoire): August additions ... Also includes the August backgrounds and upgrades the "restock Armoire" migration to use @Alys's progressive output script.	2015-08-04 12:45:01 -05:00
Blade Barringer	5731f00736	Add baseUrl variable	2015-08-04 12:09:54 -05:00
Sabe Jones	4d576acb57	WIP(party-page): Naming and LFG	2015-08-04 11:58:57 -05:00
Blade Barringer	0c92c4a048	Switch redirect to baseUrl	2015-08-04 08:42:53 -05:00
Blade Barringer	c402ec61b2	Remove checkmark from focused task, increase opacity of background ... Fixes #5682	2015-08-04 08:16:31 -05:00
Max Harmony	64a3009e7a	HabitRPG -> Habitica	2015-08-03 19:24:24 +00:00
Sabe Jones	cafdb4d57e	Merge branch 'develop' into sabrecat/party-page ... Conflicts: common/locales/en/groups.json	2015-08-03 12:45:32 -05:00
Matteo Pagliazzi	4f333c4f8a	fix(amazon-payments): swap colors between paypal and amazon	2015-08-03 18:41:34 +02:00
Blade Barringer	5ed5ca8126	Merge branch 'adjustments-to-challenge-participant-pr' into develop	2015-08-03 08:47:30 -05:00
Blade Barringer	01237df213	Add buttons to challenge participant modal	2015-08-03 08:40:33 -05:00
Blade Barringer	1b19cc1c4d	Merge branch 'teh-maxh-patch-1' into develop	2015-08-03 07:54:15 -05:00
Sabe Jones	af4bb5e23f	chore(news): End Summer Splash	2015-08-02 14:09:26 -05:00
Blade Barringer	68f5a162fd	Merge branch 'Lokeh_webhooks-more-details' into develop	2015-08-02 09:28:49 -05:00
Max Harmony	7c4331080c	add'l link changes	2015-08-02 01:03:34 +00:00
Blade Barringer	a960f5ef72	Revert back to toJSON()	2015-08-01 16:08:54 -05:00
Blade Barringer	c7e751d662	Adjsut formatting	2015-08-01 14:04:33 -05:00
Blade Barringer	b567a0d9a6	Refactor webhook and add tests	2015-08-01 14:03:45 -05:00
Simon Gabler	c9e7b4d73d	Make challenge participant's name clickable in progress modal. Fixes #5558	2015-08-01 16:12:58 +02:00
Simon Gabler	cba9752111	Add mod Cantras to community guidelines page. Fixes #5676	2015-07-31 23:05:17 +02:00
Max Harmony	7b5822be4d	new Habitica urls	2015-07-31 16:09:44 +00:00
Alys	07bdc89738	habitrpg.wikia.com -> habitica.wikia.com. Also a trello URL change.	2015-07-31 18:53:32 +10:00
Alys	c4c21a58c6	HabitRPG -> Habitica in header on static pages	2015-07-31 18:10:40 +10:00
Alys	798b2890d0	HabitRPG -> Habitica text changes	2015-07-31 18:05:10 +10:00
Sabe Jones	3dc78a86f6	fix(naming-day): Improved Habitica logo	2015-07-30 20:51:57 -05:00
Sabe Jones	65f21619ae	feat(naming-day): Bailey etc.	2015-07-30 19:46:04 -05:00
Kevin Gisi	85584eaa60	Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop	2015-07-30 19:32:37 -04:00
Kevin Gisi	efcf0a57d4	Change host check to proxy check	2015-07-30 19:27:00 -04:00
Kevin Gisi	339dec3ac0	Emergency fix	2015-07-30 19:10:14 -04:00
Sabe Jones	2a0a26e5ce	feat(naming-day): New logo ... Updates the static front page to use the purple gryphon icon, changes same to refer to "Habitica" instead of "HabitRPG", and updates the site favicon to the new logo.	2015-07-30 18:01:47 -05:00
Sabe Jones	1de80a3ed8	WIP(party-page): Revised invite modals	2015-07-30 16:48:08 -05:00
Kevin Gisi	cfdcadb2bc	Added redirects to habitica for non-API urls	2015-07-30 13:20:24 -04:00
Blade Barringer	1001cc8889	Refactor webhook section to be cleaner ... Added note to put webhook into own module	2015-07-30 08:19:22 -05:00
Will	7245ffa94a	refactor user.toJSON()	2015-07-30 00:21:41 -07:00
Will	4e5d630a87	remove profile object from webhooks	2015-07-29 21:43:13 -07:00
Will	b3ae6eef17	maxHEalth uses new shared.maxHealth	2015-07-29 21:43:13 -07:00
Will	f3829c8ce4	code cleanup and commenting	2015-07-29 21:43:13 -07:00
Will	a27f8d6705	add profile info and computed stats	2015-07-29 21:43:12 -07:00
Sabe Jones	f8d7547923	WIP(party): Incomplete no-party page	2015-07-29 16:28:23 -05:00
Sabe Jones	6946dd23e5	Merge branch 'develop' into sabrecat/party-page	2015-07-29 15:03:46 -05:00
Sabe Jones	b4e3efeab7	fix(news): Break before list ... For readability	2015-07-29 14:17:32 -05:00