Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,824 Commits 64 Branches 1,256 Tags
fbfd2ef0eabea3714b3bdf36cfe63ed423b7b112
Commit Graph

10824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alys fbfd2ef0ea add a missing closing bracket to the end of webFaqAnswer6 2015-09-12 23:22:47 +10:00
Alys 365a58641d Merge pull request #5917 from Alys/audio-LuneFox-2015-09-09 
new audio theme from LuneFox
 2015-09-12 11:24:12 +10:00
Alys fbaa5d4321 add new audi theme from LuneFox, moved themes to alphabetical order, adjusted file permissions for Watts Theme 2015-09-12 11:05:31 +10:00
Matteo Pagliazzi e86809dc07 fix leaving group 2015-09-09 22:41:41 +02:00
Matteo Pagliazzi 0330735e8e fix migrations 2015-09-09 22:32:12 +02:00
Sabe Jones 3931894d97 Merge pull request #5897 from HabitRPG/sabrecat/pet-201509 
September 2015 Pet Quest
 2015-09-09 11:29:51 -07:00
Blade Barringer bd1ae09749 Simplify scripts (node scripts use ./node_modules version of things by default) 2015-09-09 09:04:10 -05:00
Blade Barringer addf19afc1 Add nvmrc file 2015-09-09 06:57:57 -05:00
Blade Barringer ddfb5c92ab Merge pull request #5899 from crookedneighbor/gulp-ify-start 
Gulp-ify the start process
 2015-09-09 06:46:06 -05:00
Matteo Pagliazzi d64ce2fcdf fix groups migration 2015-09-09 11:43:00 +02:00
Matteo Pagliazzi c292d7b438 Merge pull request #5888 from TheHollidayInn/groups-delete-when-last-member-leaves 
Groups delete when last member leaves
 2015-09-09 11:26:04 +02:00
TheHollidayInn ca37f4161c Removed firebase deleteGroup to post remove 2015-09-08 21:17:28 -05:00
TheHollidayInn cf2548693f Changed cb2 to cb and removed extra query when removing group 2015-09-08 20:12:58 -05:00
Blade Barringer 1406166823 remove unneeded require 2015-09-08 16:21:02 -05:00
TheHollidayInn c7d09acd74 Moved inivtation removal functions to group pre remove middleware 2015-09-08 15:58:53 -05:00
Blade Barringer a85116540c Move run:dev task to gulp 2015-09-08 15:45:09 -05:00
Sabe Jones 74cb7d7f04 chore(news): Horse Bailey 2015-09-08 14:56:49 -04:00
Sabe Jones 41b4d497f7 Merge branch 'develop' into sabrecat/pet-201509 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith2.css
	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-08 13:25:10 -05: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