Commit graph

10805 commits

Author SHA1 Message Date
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
1d6bd8f392 fix(style): Decap guild/party/chat 2015-09-02 13:50:34 -04:00
TheHollidayInn
0adfcc3415 Groups now make joining user the leader when they are empty 2015-09-02 12:36:13 -05:00
Blade Barringer
ceebb33daf Merge pull request #5872 from HabitRPG/paglias/firebase
Firebase changes
2015-09-02 08:35:47 -05: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
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
Blade Barringer
c65ab56641 Remove focus-me directive 2015-08-31 20:17:30 -05:00
Blade Barringer
3e44c3a8ce Change focus-me to use task-focus 2015-08-31 20:16:14 -05:00
Blade Barringer
499e8578cd Merge branch 'TheHollidayInn-menu-fix-notification-menu-closing' into develop 2015-08-31 19:02:32 -05:00
Blade Barringer
dc5c35bb17 Merge branch 'develop' into TheHollidayInn-menu-fix-notification-menu-closing 2015-08-31 19:01:11 -05:00
Blade Barringer
ca49412313 Use === instead of == 2015-08-31 18:59:01 -05:00
Blade Barringer
dfaaed05a4 Switch double quotes to single quotes 2015-08-31 18:54:06 -05:00
Blade Barringer
0bed76d336 Restructure test 2015-08-31 17:42:33 -05:00
Blade Barringer
8e2247ab3e Remove extraneous white space 2015-08-31 17:28:47 -05:00
Sabe Jones
5ba6cfc2f5 feat(content): September content adds 2015-08-31 18:16:54 -04:00
Kevin Gisi
ae5ea39c58 Merge pull request #5864 from gisikw/develop
Fixed the wrong redirect
2015-08-31 17:59:54 -04:00
Kevin Gisi
69782b5bd1 Fixed the wrong redirect 2015-08-31 17:59:19 -04:00
TheHollidayInn
42066be2cf Fixed broken test by change element to a focusable element 2015-08-31 16:49:34 -05:00
Kevin Gisi
509f845389 Merge pull request #5862 from gisikw/develop
Domain redirects -> 301
2015-08-31 17:42:00 -04:00
Kevin Gisi
177c48820c Domain redirects -> 301 2015-08-31 17:34:18 -04:00
Sabe Jones
c0a47130e4 chore(content): Compile sprites 2015-08-31 15:54:08 -05:00
Sabe Jones
3ead359538 chore(news): August Last Chance Bailey 2015-08-30 21:06:25 -05:00
TheHollidayInn
1624fc4417 Adjusted var declration technique 2015-08-30 20:39:21 -05:00
Blade Barringer
ee0bcb5309 Correct class name 2015-08-30 17:52:16 -05:00
Blade Barringer
6e7787dcf5 chore(i18n): update locales 2015-08-30 10:25:55 -05:00
Blade Barringer
0b4c03a678 chore(i18n): update locales 2015-08-29 17:41:19 -05:00