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

59 Commits

Author SHA1 Message Date
Blade Barringer bdef56f7ae Changed api key input to password so password managers can recognize it 2015-02-19 14:07:28 -06:00
Blade Barringer c215b90869 Merge pull request #4699 from chimericdream/bulk-add-tasks 
Bulk add tasks (first version; seeking review & feedback)
 2015-02-18 16:41:31 -06:00
Blade Barringer 3784927ddb Added additional line breaks under date 2015-02-18 14:42:43 -06:00
Blade Barringer 87893ced0d Updated dates on terms and privacy pages 2015-02-18 14:39:06 -06:00
Blade Barringer e25f9cb183 Changed privacy link to relative link 2015-02-18 14:24:44 -06:00
Blade Barringer c24d85c21c Updated email and address 2015-02-18 14:23:53 -06:00
Blade Barringer dd6a8d35db Updated link to privacy policy 2015-02-18 13:52:20 -06:00
Matteo Pagliazzi 38af7ff3c1 emails: add optional reply_to_address variable 2015-02-18 19:31:02 +01:00
Bill Parrott 3599eaefaf Merge branch 'develop' into bulk-add-tasks 2015-02-17 22:32:28 -06:00
Sabe Jones 47f3122c2d chore(news): Pet rocks Bailey 
Also fixes incorrectly named golden rocks.
 2015-02-17 20:39:04 -06:00
Sabe Jones 0608ac5caa feat(quest): Pet Rocks 2015-02-17 20:02:06 -06:00
Blade Barringer 0d395295eb Merge branch 'archery' into develop 2015-02-17 15:27:19 -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
Bill Parrott 4563d22bf0 minor updates from code review 2015-02-17 14:05:09 -06:00
Blade Barringer 44b9ac7215 Fixed path to audio files. Closes #4704 2015-02-17 13:53:32 -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 a5ce3f58b1 Removed original user text from veteran achievement 2015-02-17 08:42:43 -06:00
Blade Barringer 6c85cd18a9 Adjusted style of bulk tasks 2015-02-17 08:37:26 -06: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 2de3a5dd55 first draft of bulk add 2015-02-17 00:25:56 -06:00
remmz0r 7a08ff360f possibly fixed - can't test it as I can't figure out how to make a user an 'originalUser' on mongodb 2015-02-17 13:36:12 +08:00
Bill Parrott b1b478bc74 add task export functionality 2015-02-16 21:21:49 -06:00
remmz0r feb1e01c4d Fixed original user code in achievements.jade 2015-02-17 10:48:27 +08:00
Sabe Jones 130261dacf feat(event): End Valentine's 2015-02-16 18:15:09 -06:00
Blade Barringer 0858b871ff Closes #4693 2015-02-16 16:04:51 -06:00
Blade Barringer 84ce4bb5d8 Corrected path to config.json 2015-02-13 09:45:18 -06:00
Blade Barringer 9dfd96b84f Moved and configured config.json to be in root of directory 2015-02-13 09:24:16 -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 df5ff3d5a1 Downgraded coffeescript module to 1.6 2015-02-12 13:31:21 -06:00
Blade Barringer a6a0282c82 Corrected common image paths 2015-02-12 12:05:38 -06:00
Blade Barringer 85817b2b4e Corrected path to habitrpg logo 2015-02-12 11:50:55 -06:00
Blade Barringer 8ac9dc3ced Merge branch 'develop' into common-convert 2015-02-10 16:27:46 -06:00
Blade Barringer 17032a4f13 Reverted changes back into website/src 2015-02-10 16:06:32 -06:00
Blade Barringer bf4f2299e2 Moved src to website/src (again) 2015-02-10 16:04:17 -06:00
Blade Barringer e243887563 Deleted website/src 2015-02-10 16:03:11 -06:00
Blade Barringer 6548db8095 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-09 22:41:52 -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 a1568b0c32 Corrected title on readme 2015-02-09 19:10:59 -06:00
Blade Barringer ac4dbf6eec Added /register. Required for newer version of coffee-script module 2015-02-09 13:37:30 -06:00
Blade Barringer 59a203e05c Corrected path to moment locale files 2015-02-09 13:36:15 -06:00
Blade Barringer 8a25a5a744 Corrected paths 2015-02-09 13:32:56 -06:00
Blade Barringer 67f478bb0e Adjusted paths to files 2015-02-05 16:37:22 -06:00
Blade Barringer dca2f13dda Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	bower.json
	public/manifest.json
	src/controllers/auth.js
 2015-02-05 11:20:40 -06:00
Blade Barringer 28b9ad11cb Added paths for common scripts 2015-02-04 13:22:41 -06:00
Blade Barringer 5d9cda3b76 Corrected some paths to serve files directly from comon 2015-02-04 12:25:14 -06:00
Blade Barringer a617bac139 Moved config.json.example to website folder 2015-02-04 10:18:42 -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 08daed21ce Removed register task from coffee script require 2015-02-03 19:40:23 -06:00