Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,097 Commits 64 Branches 1,256 Tags
2e5c7df94f1d0da4952cfcd074db0ffb53ea98be
Commit Graph

12097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Pagliazzi e6d9c978f7 change score task route 2015-12-11 11:41:46 +01:00
Matteo Pagliazzi 501a808893 move cron logic back to common 2015-12-11 11:21:36 +01:00
Sabe Jones f6cdf5d257 chore(news): Android Bailey 2015-12-10 17:00:48 -05:00
Alys cf01376f7d adjust forgot password text to specify that you must use the website - fixes https://github.com/HabitRPG/habitrpg-android/issues/170 2015-12-11 06:39:03 +10:00
Matteo Pagliazzi 9ffa0d5893 port cron and preening 2015-12-10 19:07:09 +01:00
Sabe Jones 33f5dda99a Merge pull request #6351 from HabitRPG/sabrecat/docker 
Overhauled Dockerfile
 2015-12-09 15:56:01 -06:00
Sabe Jones 1bd9582b2c refactor(Dockerfile): more readable comments re IP 2015-12-09 16:32:39 -05:00
Sabe Jones 816ce5b782 feat(Docker): overhauled Dockerfile 2015-12-09 16:23:47 -05:00
Matteo Pagliazzi c5b7873406 add support for habitica-android in x-client header 2015-12-09 11:02:26 +01:00
Matteo Pagliazzi 6a0f9564e0 begins testing score task route 2015-12-09 10:40:40 +01:00
Matteo Pagliazzi 0f3b307f40 port tests for score and randomDrop 2015-12-09 10:21:15 +01:00
Joy Clark 8756aeebfa fixing wolf sprite 2015-12-08 18:05:18 +01:00
Matteo Pagliazzi 72b2791bc4 refactor scoreTask 2015-12-08 14:41:42 +01:00
joyclark 91fe5fed97 Merge remote-tracking branch 'origin/new_mount_heads' into new_mount_heads 
Conflicts:
	common/dist/sprites/spritesmith-main-10.css
	common/dist/sprites/spritesmith-main-10.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-12-08 13:43:49 +01:00
joyclark faf2611ca3 making change for peppermit heads. 2015-12-08 13:36:25 +01:00
Joy Clark 1769fc15f7 css files and sprite sheets 2015-12-08 13:22:13 +01:00
Joy Clark 7628882f24 use new css class 2015-12-08 13:22:13 +01:00
Joy Clark d8b0774618 Add Mount_Icon images 2015-12-08 13:22:12 +01:00
Sabe Jones 3385cb807e Merge pull request #6334 from bennyty/develop 
Normalize theme audio volumes
 2015-12-07 18:33:39 -06:00
Sabe Jones 7472d17c3a Merge pull request #6335 from HabitRPG/sabrecat/peppermint-pets 
Peppermint Hatching Potions
 2015-12-07 15:18:42 -06:00
Sabe Jones dd4ca5c476 refactor(modals): More readable invalid hatch check 2015-12-07 16:00:52 -05:00
Matteo Pagliazzi 237be08a61 GET-tasks_id tests 2015-12-07 21:15:02 +01:00
Matteo Pagliazzi 3c4491606b finish PUT-tasks_id tests and fix some edge bugs 2015-12-07 21:00:15 +01:00
Matteo Pagliazzi 0272a36bac finish implementing tests for POST-tasks.test.js 2015-12-07 14:22:54 +01:00
Matteo Pagliazzi af1946dd7c starts implementing scoreTask 2015-12-06 18:03:51 +01:00
Matteo Pagliazzi 66a675c5b0 simplify some tests, replace tags when updating tags (like for checklist) 2015-12-06 17:29:14 +01:00
Matteo Pagliazzi 582aeafb4b Merge branch 'develop' into api-v3 2015-12-06 17:17:20 +01:00
Matteo Pagliazzi dc5a1d1438 Merge pull request #6309 from HabitRPG/api-v3-tasks 
[API v3] Port tasks and tags
 2015-12-06 17:14:44 +01:00
Matteo Pagliazzi 955b0f042b fix tests 2015-12-06 17:07:29 +01:00
Matteo Pagliazzi cb08c383b9 misc fixes, add tests for some tasks routes 2015-12-06 16:51:18 +01:00
Joy Clark 7f2496b397 css files and sprite sheets 2015-12-06 00:16:36 +01:00
Joy Clark 1b50197610 use new css class 2015-12-05 23:26:50 +01:00
Joy Clark 545a802a03 Add Mount_Icon images 2015-12-05 23:17:44 +01:00
Joy Clark 144e3003bb Add Mount_Icon images 2015-12-05 23:17:39 +01:00
Sabe Jones 0f578b79ff feat(pets): Peppermint Hatching Potions 
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
 2015-12-04 17:20:33 -05:00
bennyty ed944f83bf Rebalance audio themes 2015-12-04 13:39:29 -05:00
Blade Barringer 8a872bd8c0 tests: Add pending tests for scoring tasks 2015-12-04 11:12:25 -06:00
Blade Barringer 834ae123e8 tests: Add pending test for GET /tasks 2015-12-04 10:56:54 -06:00
Blade Barringer 431fc571fa tests: Add pending tests for getting a specific task in v3 2015-12-04 10:55:15 -06:00
Blade Barringer 5aca166837 tests: Add delete task integration test for v3 2015-12-04 10:50:41 -06:00
Blade Barringer 1a2cda0835 tests: Add additional pending tests 2015-12-04 10:39:20 -06:00
Blade Barringer 49cc6db05b tests(tasks): Rename test to conform to route style 2015-12-04 10:25:27 -06:00
Blade Barringer b0bcfff12d tests(tasks): Add pending tests for create task test 2015-12-04 10:24:40 -06:00
Blade Barringer c2ba90afcc tests(fix): Add return to expect promise in create task test 2015-12-04 09:13:50 -06:00
Matteo Pagliazzi 1e9386f7b6 create model for tags, add routes 2015-12-04 14:47:02 +01:00
Blade Barringer a3665e7095 chore(image): Add vice2 quest image 2015-12-04 07:46:02 -06:00
Sabe Jones aa00eae0d5 Merge pull request #6324 from ojeytonwilliams/unequip-notification-fix 
Unequip notification fix
 2015-12-03 14:01:45 -06:00
Matteo Pagliazzi a6648fc638 add tags routes, misc fixes 2015-12-03 19:19:53 +01:00
Matteo Pagliazzi c0a99eec8b fix user model, sanitize some fields on task creation, add some tests and comments 2015-12-03 18:15:22 +01:00
Matteo Pagliazzi 506609cc29 starts writing tests for tasks, fix errors in auth middleware and tasks methods 2015-12-03 17:48:32 +01:00