Commit Graph

11176 Commits

Author SHA1 Message Date
Sabe Jones 7637b55195 fix(style): Move accordion tweaks to static.styl 2015-09-04 17:50:01 -04:00
Blade Barringer f746f6375f Remove container class 2015-09-04 16:47:12 -05:00
Blade Barringer 1eac011d0e Remove padding rule 2015-09-04 16:46:16 -05:00
Blade Barringer 047a88cef5 Merge branch 'zedutchgandalf-develop' into gulp_build 2015-09-04 16:35:45 -05:00
Blade Barringer 53a03b4396 Hide older news link in older news page 2015-09-04 16:32:05 -05:00
Blade Barringer 3e03ff124d Remove trailing blank spaces 2015-09-04 16:24:27 -05:00
Blade Barringer f7df464ebd Remove unneeded class 2015-09-04 16:24:10 -05:00
Sabe Jones 0a71037095 fix(accordion): Move jQuery to static.js 2015-09-04 17:19:23 -04:00
Blade Barringer c8c9d6c892 Set different gulp tasks for production use 2015-09-04 15:53:07 -05:00
Blade Barringer 7aae3d6aa9 Move gulp-grunt to regular dependency 2015-09-04 15:44:18 -05:00
Blade Barringer 3434a13782 Move glob to normal dependencies 2015-09-04 15:40:57 -05:00
Blade Barringer bc9c12f253 Move static new stuff task to gulp 2015-09-04 15:32:08 -05:00
Blade Barringer cfae45a5f7 Move build task to gulp 2015-09-04 15:30:44 -05:00
Blade Barringer d3360ec403 Hide all npm-debug logs from source control 2015-09-04 15:22:59 -05:00
Sabe Jones 8213643485 fix(FAQ): Link from Help button
Also swaps a couple of URLs to use HTTPS.
2015-09-04 15:12:17 -04:00
Sabe Jones 869651f5a2 feat(FAQ): Static FAQ page
Introduces a new static page for Frequently Asked Questions, linked from the Help menu. Fixes #5773.
2015-09-04 15:05:15 -04:00
Blade Barringer 0d78c01de3 Merge pull request #5877 from TheHollidayInn/guilds-user-becomes-lead-when-joins-empty-group
Groups now make joining user the leader when they are empty
2015-09-04 09:43:26 -05:00
Robin Arys e6a0f405e3 Fix Bailey's news modal 2015-09-04 15:56:32 +02:00
Robin Arys 39df743693 Change headers to use the proper ones 2015-09-04 15:52:34 +02:00
Robin Arys 345ab4bdbe Move repeated classes up one level into a div 2015-09-04 15:34:03 +02:00
Robin Arys c5d1f37499 Add small margin to images so text doesn't stick to them 2015-09-04 10:42:05 +02:00
Robin Arys a497724d18 Fix Bailey's modal 2015-09-04 10:41:40 +02:00
Robin Arys c7dc8d551b Remove small_news_header and big_news_header CSS classes 2015-09-04 10:41:22 +02:00
Robin Arys 60d176d578 Add ability to add an extra class to the container 2015-09-04 10:40:24 +02:00
Robin Arys 39c85b9938 Make CSS statement more precise to make sure I'm not changing stuff I don't want to change. 2015-09-04 00:42:55 +02:00
Robin Arys 74dc455183 fix spacing 2015-09-04 00:22:51 +02:00
Robin Arys d03acee4bc Redesign static old news page per #5836 2015-09-04 00:22:41 +02:00
Sabe Jones b5124e6cd8 fix(warnings): Show modal only once
Also removes a random extra newline.
2015-09-03 11:12:54 -04:00
Sabe Jones d29c7ff1bb Merge pull request #5878 from HabitRPG/sabrecat/modal-warnings
Modal warning for low health
2015-09-02 16:14:52 -05:00
Sabe Jones e6068b23a7 feat(analytics): Track low health modal 2015-09-02 17:03:32 -04:00
Sabe Jones 1a675b8461 feat(warning): Revised low health modal 2015-09-02 16:31:56 -04:00
Sabe Jones e82f73c712 Merge branch 'develop' into sabrecat/modal-warnings 2015-09-02 15:17:33 -04:00
Sabe Jones c370344164 test(time-travel): TDD for pets/mounts 2015-09-02 15:03:57 -04:00
Sabe Jones 1d6bd8f392 fix(style): Decap guild/party/chat 2015-09-02 13:50:34 -04:00
Sabe Jones 9eaa35ba2f test(time-travel): Rename test 2015-09-02 13:47:37 -04:00
TheHollidayInn 0adfcc3415 Groups now make joining user the leader when they are empty 2015-09-02 12:36:13 -05:00
melarish b2bb6016fa Added +1 Hourglass to debug menu 2015-09-02 18:12:48 +01:00
Blade Barringer ceebb33daf Merge pull request #5872 from HabitRPG/paglias/firebase
Firebase changes
2015-09-02 08:35:47 -05:00
Sabe Jones 7765f9ca04 test(mystery): Time Travelers test WIP 2015-09-01 17:37:39 -04:00
Sabe Jones 5274fd236a WIP(time-travel): Time Travel pets/mounts
Also begins process of adding tests for Mystic Hourglass purchases.
2015-09-01 17:17:50 -04:00
Sabe Jones 2c0d59989a feat(groups): Hide sync button when irrelevant
Also extends the "your party chat is empty" message to have a counterpart in Guilds.
2015-09-01 15:14:38 -04:00
Sabe Jones 6f85fcfde2 Merge branch 'develop' into sabrecat/party-page
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
2015-09-01 13:40:20 -05:00
Sabe Jones 3ccf09ca27 feat(quests): Horse quest 2015-09-01 13:26:41 -04:00
Sabe Jones daf3a2d2bc feat(pets): Horse sprites 2015-09-01 12:07:21 -05:00
Sabe Jones 68fef118e1 Merge pull request #5866 from HabitRPG/sabrecat/content-201509
Content 201509
2015-09-01 10:56:24 -05:00
Matteo Pagliazzi 7acec14e6b do not allow leaders to kick themselves from group 2015-09-01 16:33:24 +02:00
Blade Barringer 41c38c6e63 Merge branch 'TheHollidayInn-directives-test-task-focus' into develop 2015-08-31 20:36:07 -05:00
Blade Barringer 1d8b10dc99 Adjust formatting 2015-08-31 20:35:23 -05:00
Blade Barringer f4ca8bb78d Rename task-focus focus-element 2015-08-31 20:31:03 -05:00
Blade Barringer d5bd5f281c Rename file names 2015-08-31 20:21:01 -05:00