sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 08:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8403 commits 3 branches 0 tags 1.6 GiB
Commit graph

8403 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
28b9ad11cb Added paths for common scripts 2015-02-04 13:22:41 -06:00
Verabird
fecba8f9f5 Shorten dateFormat string in graphs 2015-02-04 13:38:24 -05:00
Verabird
3cb182fb53 Add dateFormat choice to charts and other hardcoded MM/DD/YYYY 2015-02-04 13:38:24 -05:00
Blade Barringer
5d9cda3b76 Corrected some paths to serve files directly from comon 2015-02-04 12:25:14 -06:00
Blade Barringer
aba56bd174 Moved hair files to correct location 2015-02-04 10:33:25 -06:00
Blade Barringer
5cf46f9f4a Corrected path for coverage 2015-02-04 10:26:54 -06:00
Blade Barringer
286e894e2f Removed package json from common 2015-02-04 10:21:23 -06:00
Blade Barringer
a617bac139 Moved config.json.example to website folder 2015-02-04 10:18:42 -06:00
Blade Barringer
250249dc57 Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-02-04 10:16:30 -06:00
Blade Barringer
a6d3857a1d Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	common/public/habitrpg-shared.js
 2015-02-04 10:15:23 -06:00
Blade Barringer
5d0defc685 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/public/habitrpg-shared.js
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
	dist/spritesmith5.css
	dist/spritesmith5.png
 2015-02-04 10:14:11 -06:00
Matteo Pagliazzi
637928371b better browser monitoring 2015-02-04 17:03:18 +01:00
Matteo Pagliazzi
9227c7b3d3 add new relic browser agent 2015-02-04 16:50:54 +01:00
Blade Barringer
ae36fc6890 Compiled sprite files 2015-02-04 09:29:40 -06:00
Blade Barringer
bb00e9d97c Added new hair types 2015-02-04 09:26:22 -06:00
Tyler Renelle
c3bb42b108 fix(auth): search case-insensitive usernames when registering 2015-02-03 21:45:17 -07:00
Blade Barringer
f2fc115034 Set default gulp to be dependant on NODE_ENV 2015-02-03 22:19:02 -06:00
Blade Barringer
27dbb30ce8 Added browserify to prod task 2015-02-03 22:13:48 -06:00
Blade Barringer
0329f156e9 added watch tasks 2015-02-03 22:07:35 -06:00
Blade Barringer
cac788e7db djusted paths 2015-02-03 21:43:10 -06:00
Blade Barringer
9b8f006064 Added sinon and corrected path 2015-02-03 21:30:43 -06:00
Blade Barringer
0f62845fb2 Moved tests into main test folder and corrected path to common files 2015-02-03 21:29:05 -06:00
Blade Barringer
9342e8095a REmoved unused favicon 2015-02-03 21:26:12 -06:00
Blade Barringer
632019c798 REmoved unused compiled file 2015-02-03 21:25:28 -06:00
Blade Barringer
01ab05ea35 Removed license 2015-02-03 21:25:20 -06:00
Blade Barringer
32dc8e112e Removed unused grunt file from common 2015-02-03 21:22:22 -06:00
Blade Barringer
f54b28e7bf Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 21:17:52 -06:00
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
af72ffbca6 Merge pull request #464 from HabitRPG/lefnire/facebook-to-local 
feat(facebook-to-local): allow users to move from facebook=>local
 2015-02-03 19:26:32 -07:00
Tyler Renelle
5ec2c118a5 feat(facebook-to-local): allow users to move from facebook=>local 2015-02-03 19:23:49 -07:00
Tyler Renelle
a4c2bf61b2 feat(facebook-to-local): allow users to move from facebook=>local 2015-02-03 19:13:32 -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