Commit Graph

11063 Commits

Author SHA1 Message Date
Mel Marley
2bddd79ffd Some things I tried 2015-09-08 13:59:34 +01:00
Sabe Jones
54fde74c29 feat(analytics): Track another partying button 2015-09-07 22:31:41 -04:00
Sabe Jones
f8ce7c2292 fix(analytics): Track modals correctly
Fixes #5879.
2015-09-07 22:23:42 -04:00
Sabe Jones
9421c63ac9 fix(FAQ): Remove sample task anchors 2015-09-07 21:58:56 -04:00
Sabe Jones
f044f83772 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2015-09-07 21:55:28 -04:00
Blade Barringer
bb06e95c4e Add emoji class to list of classes that should not use pixelated rendering 2015-09-07 15:29:24 -05:00
Blade Barringer
325fa976f6 chore(i18n): update locales 2015-09-07 15:27:52 -05:00
Sabe Jones
d6f416b6d3 feat(analytics): Track party buttons 2015-09-07 12:02:01 -04:00
Blade Barringer
168ba0c96c Merge pull request #5887 from HabitRPG/sabrecat/faq
Static FAQ page
2015-09-06 20:34:49 -05:00
Blade Barringer
31aace95ef Merge pull request #5894 from crookedneighbor/merge-faqs
Merge faqs
2015-09-06 20:32:05 -05:00
Blade Barringer
c9af8e60b8 Adjust formatting 2015-09-06 20:29:09 -05:00
Blade Barringer
82b7bb3a1b Add markdown to faq 2015-09-06 19:46:29 -05:00
Blade Barringer
205bbeee75 Add marked to jade rendering 2015-09-06 19:45:35 -05:00
Blade Barringer
1e29020df9 Add marked to packagejson 2015-09-06 19:44:55 -05:00
Blade Barringer
e32de87991 Adjust numbering of faq.js 2015-09-06 19:44:37 -05:00
Blade Barringer
ebc069747b Zero index faq strings 2015-09-06 19:43:52 -05:00
Blade Barringer
0b99f77a1c Simplify web faq 2015-09-06 18:30:01 -05:00
Blade Barringer
6fd2b9e537 Update content with web faq 2015-09-06 17:13:04 -05:00
Blade Barringer
6a1d4adcda Merge branch 'develop' into HabitRPG-sabrecat/faq 2015-09-06 17:10:45 -05:00
TheHollidayInn
82a3ca8a4d Merged changes to firebase branch 2015-09-06 16:58:44 -05:00
Blade Barringer
d02f2d34e3 Merge pull request #5893 from crookedneighbor/content-faq
Content FAQ for iOS
2015-09-06 16:38:18 -05:00
Blade Barringer
2fcc7df218 Change name of locales keys 2015-09-06 16:36:21 -05:00
Blade Barringer
1bce23c12b Transform magic number to constant 2015-09-06 16:22:06 -05:00
Blade Barringer
898ea845b3 Convert translation function to js 2015-09-06 16:20:14 -05:00
Blade Barringer
245c7d48c8 Simplify faq logic 2015-09-06 16:11:53 -05:00
Blade Barringer
4081a9a62a Add faq to content 2015-09-06 16:08:53 -05:00
Blade Barringer
6bad9623d8 Remove link 2015-09-06 16:08:22 -05:00
Blade Barringer
8a06514c72 Move translation function to separate module 2015-09-06 15:54:38 -05:00
TheHollidayInn
b839c0cd0c Change condition scope to fix updating for public guilds with a member count of 1 2015-09-06 15:31:41 -05:00
TheHollidayInn
700a6ddd9e Remove users inviations when guild is deleted 2015-09-06 15:31:40 -05:00
TheHollidayInn
e68e29db8f Delete private guilds or parties when last member leaves. 2015-09-06 15:31:40 -05:00
Blade Barringer
5045ce3b2f Add FAQ 2015-09-06 15:31:20 -05:00
Blade Barringer
b9bbc3f1ea Move content to own directory 2015-09-06 15:31:08 -05:00
Matteo Pagliazzi
15eef927a2 fix leaders migrations when there are no other members 2015-09-06 22:18:22 +02:00
Matteo Pagliazzi
ea477823f6 Merge pull request #5885 from HabitRPG/paglias/firebase-requirements
Changes necessary for Firebase
2015-09-06 21:29:43 +02:00
Matteo Pagliazzi
bfd6d055b0 merge into develop 2015-09-06 21:21:39 +02:00
Blade Barringer
82030a50fb Add faq to other languages 2015-09-06 13:54:40 -05:00
Blade Barringer
7bfa18fd05 chore(i18n): update locales 2015-09-06 13:33:29 -05:00
Blade Barringer
4177202cee Merge pull request #5855 from HabitRPG/sabrecat/party-page
Party Page Revamp
2015-09-06 13:28:14 -05:00
Blade Barringer
9896851001 Merge pull request #5890 from HabitRPG/change_custom_day_start
Change custom day start to ask for confirmation and prevent immediate cron
2015-09-06 13:28:04 -05:00
Matteo Pagliazzi
4600e96dc0 firebase can be enabled through config 2015-09-06 20:19:53 +02:00
Matteo Pagliazzi
607ddbb1f2 typos and disable firebase 2015-09-06 20:11:24 +02:00
Matteo Pagliazzi
ef9aecf531 disable firebase syncing for tavern 2015-09-06 20:08:31 +02:00
Matteo Pagliazzi
6e2b3a805e migration to sync groups with firebase 2015-09-06 19:44:55 +02:00
Matteo Pagliazzi
4bb2c33e40 fix problems with migrations and start firebase migration 2015-09-06 19:23:11 +02:00
Matteo Pagliazzi
45f2b093f8 add migrations to fix groups 2015-09-06 19:10:24 +02:00
Blade Barringer
346440d32c Disable cds button if cds == user's preference 2015-09-06 10:14:44 -05:00
Blade Barringer
ee50fec2c1 Tweak wording of custom day start warning 2015-09-06 10:11:28 -05:00
Blade Barringer
074e683ba7 Change formatting of cds modal 2015-09-06 09:57:44 -05:00
Blade Barringer
0508f77ed4 Change wording of cds modal message 2015-09-06 09:45:12 -05:00