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

16 commits

Author SHA1 Message Date
Blade Barringer
21ef62481d Removed step attribue from contributor input 2015-02-23 09:41:27 -06:00
Matteo Pagliazzi
397a293ca8 change text for recapture emails settings 2015-02-20 18:15:47 +01:00
Bill Parrott
3599eaefaf Merge branch 'develop' into bulk-add-tasks 2015-02-17 22:32:28 -06:00
Sabe Jones
0608ac5caa feat(quest): Pet Rocks 2015-02-17 20:02:06 -06:00
Blade Barringer
78430b1910 Collapsed 3 strings into single string 2015-02-17 15:26:42 -06:00
Bill Parrott
7042c97d5d removing export functionality to move to its own branch 2015-02-17 14:23:55 -06:00
remmz0r
2e98185c5d fixes #4670 
removed target="_blank" from archery link
 2015-02-18 00:03:37 +08:00
remmy poos
cfabb12b04 fixes #4670 
Replaced archery links in index.jade and tavern.jade

Let me know if this isn't all the links

Cheers
- remmz0r
 2015-02-17 23:52:48 +08:00
Blade Barringer
48e688d815 Merge branch 'bulk-add-tasks' of https://github.com/chimericdream/habitrpg into bulk-add 2015-02-17 08:05:36 -06:00
Bill Parrott
b1b478bc74 add task export functionality 2015-02-16 21:21:49 -06:00
Sabe Jones
130261dacf feat(event): End Valentine's 2015-02-16 18:15:09 -06:00
Blade Barringer
477d3d6085 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-12 13:32:23 -06:00
Blade Barringer
8ac9dc3ced Merge branch 'develop' into common-convert 2015-02-10 16:27:46 -06:00
Blade Barringer
75c9b5a978 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	src/controllers/groups.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/models/user.js
 2015-02-09 22:21:27 -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
Blade Barringer
8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00