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

8223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer cc767efa20 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js
 2015-02-03 21:13:55 -06:00
Tyler Renelle 035fe8c0de Merge pull request #4625 from HabitRPG/lefnire/facebook-to-local 
feat(facebook-to-local): allow users to move from facebook=>local
 2015-02-03 19:27:20 -07:00
Tyler Renelle 5ec2c118a5 feat(facebook-to-local): allow users to move from facebook=>local 2015-02-03 19:23:49 -07:00
Blade Barringer a59067def7 Corrected build directory path and clean sprites directory before 
generating sprites
 2015-02-03 20:13:29 -06:00
Blade Barringer afe6177da6 Added in comment about why images need to be broken up 2015-02-03 20:03:27 -06:00
Blade Barringer 916de09914 Updated images in shared 2015-02-03 19:57:58 -06:00
Blade Barringer 93d87ce336 Added additional css for sprite minification 2015-02-03 19:54:54 -06:00
Blade Barringer 08daed21ce Removed register task from coffee script require 2015-02-03 19:40:23 -06:00
Blade Barringer 450fdb1486 Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-02-03 19:29:54 -06:00
Blade Barringer 44a89dd0bd Corrected sprite task 2015-02-03 19:29:22 -06:00
Blade Barringer 47f05f452e Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-02-03 19:26:58 -06:00
Blade Barringer 6f4fbfeaeb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/img/sprites/spritesmith/npcs/npc_ian.png
	common/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
 2015-02-03 19:26:14 -06:00
Sabe Jones 7d63c9f8b2 Merge pull request #463 from SabreCat/feb-backgrounds 
February Backgrounds
 2015-02-03 19:14:11 -06:00
Sabe Jones 8aa74f07b4 Merge pull request #4623 from SabreCat/feb-backgrounds 
Feb backgrounds Bailey
 2015-02-03 19:13:41 -06:00
Sabe Jones a8fdeee069 chore(grunt): grunt 2015-02-03 19:13:00 -06:00
Sabe Jones 58af9622d6 chore(news): Feb backgrounds Bailey 2015-02-03 19:05:42 -06:00
Sabe Jones ca70254751 feat(February): Backgrounds 2015-02-03 19:00:19 -06:00
Blade Barringer bf6fdf8d9d Updated paths 2015-02-03 18:55:17 -06:00
Blade Barringer 14e5f475ab Moved config back 2015-02-03 16:58:03 -06:00
Blade Barringer 393d614c7f Moved scirpts back in place 2015-02-03 16:56:50 -06:00
Tyler Renelle b013c61b3b feat(change-email): remove blurb about changing email address 2015-02-03 15:46:51 -07:00
Blade Barringer 5ddb44a65b Corrected path to common module 2015-02-03 16:45:53 -06:00
Blade Barringer 277f7347ab Updated coffee script parser to parse the common scripts 2015-02-03 16:45:43 -06:00
Tyler Renelle ca2c7a99ed Merge pull request #4621 from HabitRPG/lefnire/change-email 
feat(change-email): allow changing email address
 2015-02-03 15:40:06 -07:00
Tyler Renelle ed0f406e2f Merge pull request #462 from HabitRPG/lefnire/change-email 
feat(change-email): allow changing email address
 2015-02-03 15:40:04 -07:00
Tyler Renelle 2331840386 feat(change-email): allow changing email address 2015-02-03 15:39:02 -07:00
Tyler Renelle 8852ac6b69 feat(change-email): allow changing email address 2015-02-03 15:35:48 -07:00
Blade Barringer fc6a4a70b9 Updated gulpfile 2015-02-03 16:19:37 -06:00
Blade Barringer 3e5663bebf Removed files 2015-02-03 16:17:03 -06:00
Blade Barringer 53b81ec0e8 corrected public directory path 2015-02-03 14:41:22 -06:00
Blade Barringer 220942fb9d Corrected path to common files 2015-02-03 14:17:21 -06:00
Blade Barringer 052d031752 Corrected missing slash 2015-02-03 14:11:39 -06:00
Matteo Pagliazzi fd900a5edc disabling loggly here and via configuration 2015-02-03 21:11:02 +01:00
Blade Barringer 8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00
Blade Barringer 576eec77f7 Removed extraneous img folder 2015-02-03 14:08:17 -06:00
Blade Barringer 9f420d0e7a Made symlink to audio folder 2015-02-03 14:06:04 -06:00
Blade Barringer 380dab7ae9 Moved audio out of common public folder 2015-02-03 14:04:53 -06:00
Blade Barringer d2eafdd021 Started moving public folder stuff back to website 2015-02-03 14:02:34 -06:00
Matteo Pagliazzi 3cde2aa485 chore(i18n): update locales 2015-02-03 19:54:38 +01:00
Blade Barringer 1e642fa4a8 Closed #4616. Added modal attribute habitrpg-tasks directive to 
determine whether modals should be appended to body or to the task
 2015-02-03 10:29:36 -06:00
Alice Harris 1a8a688c61 add link variables to seasonalShopClosedText 2015-02-03 18:06:41 +10:00
Alice Harris 162ea2fc05 convert date strings or empty string to date objects for auth.timestamps.created 2015-02-03 17:43:07 +10:00
Alice Harris f60cef4e16 updated for second phase of removal (commented-out code was first phase / notes) 2015-02-03 17:23:33 +10:00
Sabe Jones e1b5655ae5 Merge pull request #4614 from SabreCat/end-event 
End Winter event
 2015-02-02 19:12:57 -06:00
Sabe Jones 43c9a020b6 Merge pull request #461 from SabreCat/end-event 
End Winter event
 2015-02-02 19:12:49 -06:00
Sabe Jones c5691c6536 chore(grunt): grunt full 2015-02-02 19:09:00 -06:00
Sabe Jones 1b0cd6b073 chore(news): Feb 2 Bailey 2015-02-02 19:06:52 -06:00
Blade Barringer e55b8dd5bc Wrote first version of sprite gulp task 2015-02-02 19:00:51 -06:00
Sabe Jones 48246d6a72 feat(seasonal): Normal view 2015-02-02 18:55:06 -06:00
Sabe Jones c9b81414a4 feat(seasonal): Normal view 2015-02-02 18:53:54 -06:00