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

11597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer d1c1940bde Merge pull request #6243 from crookedneighbor/lint 
Lint  Common Files
 2015-11-15 12:36:36 -06:00
Blade Barringer f7c88478bc Explicitly bump ampitude version 2015-11-15 10:48:46 -06:00
Blade Barringer b13b2d0f62 Remove coffee content index file 2015-11-15 09:28:26 -06:00
Blade Barringer a127bb8711 Switch to babel-core form babel. 
Babel includes the CLI, which we don't need.
 2015-11-15 08:59:57 -06:00
Blade Barringer 9ee56a5622 Remove rule 2015-11-15 08:52:29 -06:00
Blade Barringer 01946b64e6 Remove coffeescript from dependencies. 2015-11-15 08:29:54 -06:00
Blade Barringer 2e16bade2b Add lint task to test command. 2015-11-15 08:28:16 -06:00
Blade Barringer 037337d54f Remove extraneous anonymous function. 2015-11-15 08:24:42 -06:00
Blade Barringer 5be9b88cc6 Add babel compiler to mocha.opts 2015-11-15 08:24:19 -06:00
Blade Barringer da881153b9 Convert coffee tests to js 2015-11-15 08:19:41 -06:00
Blade Barringer e5d99ce271 Convert common files to es2015. 2015-11-15 08:16:55 -06:00
Blade Barringer ddeb0e7b23 Add babel register in the server file 2015-11-15 08:16:11 -06:00
Blade Barringer 6f11054994 Add trailing comma 2015-11-15 08:10:54 -06:00
Blade Barringer 6c5afb9369 Downgrade to babelify v6. (v7 uses babel v6) 2015-11-15 08:10:07 -06:00
Blade Barringer 351172d178 Correct common test command to compile with babel. 2015-11-14 21:52:59 -06:00
Blade Barringer 4a38c36cce Register babel in gruntfile 2015-11-14 21:51:02 -06:00
Blade Barringer c829eb21ed Removed unused mocha.opts 2015-11-14 21:50:47 -06:00
Blade Barringer bc90893284 Correct test to declare variable 2015-11-14 21:45:20 -06:00
Blade Barringer ff929b669d Convert common tests to js 2015-11-14 21:44:10 -06:00
Blade Barringer c3b4f03c35 Add linting for common files 2015-11-14 07:49:48 -06:00
Blade Barringer 7ec9687774 Add linting from api-v3 2015-11-14 07:40:05 -06:00
Blade Barringer d365868fdc Merge pull request #6235 from crookedneighbor/fix_ch_tw 
Adjust i18n script to actually display zh_TW language.
 2015-11-13 16:17:58 -06:00
Blade Barringer 0a99361953 Adjust i18n script to actually display zh_TW language. 2015-11-13 15:52:52 -06:00
Blade Barringer ada97c1f91 Add invite party to ios tutorial 2015-11-13 07:19:51 -06:00
Blade Barringer 27d3d9d296 Merge pull request #6229 from HabitRPG/emails 
Adjust the way email invitations resolve.
 2015-11-13 07:18:41 -06:00
Blade Barringer 565aaff976 Merge pull request #6219 from HabitRPG/js_ify_common 
Js ify common
 2015-11-13 06:49:54 -06:00
Blade Barringer e4679d6a63 Adjust the way email invitations resolve. 2015-11-12 18:58:01 -06:00
Blade Barringer 8e147d7b12 Allow users who register via facebook to see site tutorial. 2015-11-12 18:26:42 -06:00
Blade Barringer 71567be4a6 Merge pull request #6227 from crookedneighbor/fix_tutorial_flag 
Fixes #6225
 2015-11-12 13:05:18 -06:00
Blade Barringer abe778836d Fixes #6225 2015-11-12 12:52:35 -06:00
Blade Barringer 5fb585b896 Merge pull request #6226 from HabitRPG/fix_tutorial_flag 
Move header assignment to app level
 2015-11-12 12:37:31 -06:00
Blade Barringer 431bbd762f Move header assignment to app level 2015-11-12 12:23:42 -06:00
Blade Barringer 5ebead68ab Remove coffee version of i18n 2015-11-11 21:24:21 -06:00
Blade Barringer efd0e2333e Merge pull request #6200 from gauthamchandra/feature/quick-checkout-from-dailies 
User can now check out of inn from tasks page
 2015-11-11 20:49:35 -06:00
Blade Barringer 7559f14f4d Remove coffee from files 2015-11-11 20:40:26 -06:00
Blade Barringer 3a13a5ee2c Remove unneeded coffeescript requires in tests. 2015-11-11 20:32:17 -06:00
Blade Barringer 25ae2e4252 Move browserify task to gulp 2015-11-11 20:32:17 -06:00
Blade Barringer 9408effb4e Remove coffeescript dependency from website 2015-11-11 20:32:16 -06:00
Blade Barringer 774a42d67e Convert coffee files to JS 2015-11-11 20:32:00 -06:00
Blade Barringer 92a8c3d958 chore(i18n): update locales 2015-11-11 20:24:12 -06:00
Sabe Jones f0a484bbe1 fix(strings): Variable population count 2015-11-11 21:10:24 -05:00
Sabe Jones 52f9f03afb fix(news): Link to Teespring storefront 2015-11-11 20:19:48 -05:00
Blade Barringer 6acd6460ea Merge pull request #6218 from crookedneighbor/increase_code_coverage_for_clearflags_route 
Increase code coverage for clearflags route
 2015-11-11 18:49:37 -06:00
Blade Barringer 43064dcf9a Wrap flag purcging code in check for flags object 2015-11-11 18:00:15 -06:00
Blade Barringer 13da95b552 Add tests for clearflags route 2015-11-11 17:58:41 -06:00
Sabe Jones bbff19920f Merge pull request #6217 from HabitRPG/sabrecat/pet-201511 
November pet quest: Snakes
 2015-11-11 17:51:41 -06:00
Sabe Jones 83b61f9aa3 Merge branch 'develop' into sabrecat/pet-201511 
Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.css
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.css
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.css
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.css
	common/dist/sprites/spritesmith-main-9.png
 2015-11-11 18:36:25 -05:00
Sabe Jones 06a5a1cb95 Merge pull request #6042 from HabitRPG/sabrecat/more-modals 
More and better modals; Social Media sharing
 2015-11-11 17:32:43 -06:00
Sabe Jones b32ab5a587 chore(news): Pet quest Bailey 
Also adds one missing sprite asset for the quest.
 2015-11-11 18:31:22 -05:00
Sabe Jones eba2ac386e feat(pets): November quest 
Fully functional commit. Missing only Bailey and the quest scroll sprite.
 2015-11-11 17:23:16 -05:00