krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,560 Commits 64 Branches 1,226 Tags
d5148a7bf01f196d77c83a028190b277b51aaf47
Commit Graph

12560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sabe Jones
e638661c71 Merge pull request #6314 from TheHollidayInn/tasks-fix-delete-message 
Changed language when deleteing tasks to indicate type and text of task
 2015-12-14 14:30:06 -06:00
Daniel Van Camp
3c7ddf8df1 Merge branch 'develop' into static-page-merch 2015-12-14 21:27:50 +01:00
Matteo Pagliazzi
155719996d remove user.tasks getter on the server 2015-12-14 20:10:18 +01:00
Blade Barringer
6709c83804 tests(apiv3): Remove incorrect tests 2015-12-14 12:37:59 -06:00
Blade Barringer
3857316a1e fix(api): Correct sendTaskWebhook call 2015-12-14 12:23:13 -06:00
Blade Barringer
9205f01e01 tests(apiv3): Use lessThan and greaterThan expectation syntax 2015-12-14 12:13:02 -06:00
Blade Barringer
ac61809fc0 tests(apiv3): Remove user dependency 2015-12-14 12:00:23 -06:00
Blade Barringer
c20617e185 tests(apiv3): Remove unused dependency 2015-12-14 09:00:22 -06:00
Blade Barringer
f4af7309cb tests(helpers): Fix local doc update 2015-12-14 08:59:41 -06:00
Matteo Pagliazzi
409102ae19 wip score tests 2015-12-13 23:51:06 +01:00
Blade Barringer
850aeb6565 Merge branch 'develop' into api-v3 2015-12-13 16:41:08 -06:00
Blade Barringer
883fd14775 tests(lint): remove unused variables 2015-12-13 16:40:44 -06:00
Blade Barringer
65bb655a10 Merge branch 'develop' into api-v3 2015-12-13 16:39:59 -06:00
Blade Barringer
9ec26a8ee9 tests(common): Use generateUser helper in dailies test 2015-12-13 16:29:29 -06:00
Blade Barringer
b10c6f21a8 tests(common): Convert algos tests to use generateUser helper 2015-12-13 16:23:25 -06:00
Blade Barringer
e82085ac1b tests(helpers): Add common helpers for generating tasks 2015-12-13 16:22:58 -06:00
Blade Barringer
0f789ba780 Merge branch 'TheHollidayInn-skills-burst-backstap-leveling-fix' into develop 2015-12-13 15:38:03 -06:00
Blade Barringer
ce06d8a873 tests(common): Simplify spell tests 2015-12-13 15:37:18 -06:00
Alys
9edb0831c0 specify $ USD for subscription prices 2015-12-14 07:16:22 +10:00
Matteo Pagliazzi
9394fb0d94 use res.respond 2015-12-13 20:12:04 +01:00
Matteo Pagliazzi
a34f41f0f7 misc fixes, GET user (with tests), more comments for preenHistory 2015-12-13 20:08:14 +01:00
Keith Holliday
f152a352bb Merge pull request #4 from crookedneighbor/common_helper 
Common helper
 2015-12-13 12:06:22 -06:00
Blade Barringer
4ee21f2578 tests(common): Use helper to generate user 2015-12-13 10:40:50 -06:00
Blade Barringer
70751abe01 tests(helpers): Add helper to generate user for common and content tests 2015-12-13 10:40:00 -06:00
Blade Barringer
dafe014ec8 Merge branch 'develop' into TheHollidayInn-skills-burst-backstap-leveling-fix 2015-12-13 10:06:27 -06:00
Keith Holliday
beea6d920f Added tests for backstab and fireball 2015-12-13 09:19:20 -06:00
Blade Barringer
5fa91713f5 fix(favicon): Add 192x192 image 2015-12-12 20:11:25 -06:00
Blade Barringer
025b302ec6 Merge branch 'develop' into anilanar-favicon192 2015-12-12 20:08:34 -06:00
Blade Barringer
530babf516 chore(css): Add explanation for empty-task-notification rule 2015-12-12 17:27:43 -06:00
Blade Barringer
73c8db01ad chore(sprites): Update readme 2015-12-12 17:17:04 -06:00
Blade Barringer
81067efd19 Merge branch 'joyclark-new_mount_heads' into develop 2015-12-12 17:16:36 -06:00
Blade Barringer
ee87d1b4b7 chore(sprites): Compile 2015-12-12 17:12:53 -06:00
Blade Barringer
a7ffb41acd fix(sprites): Correct size of tiger mount icon 2015-12-12 16:04:03 -06:00
Blade Barringer
1f37338782 fix(sprites): Correct mount head icons for peppermint pets 2015-12-12 14:35:14 -06:00
Blade Barringer
6d6e1caf0f fix(sprites): Correct spooky pet mount icons 2015-12-12 14:20:38 -06:00
Blade Barringer
8ad2b07253 fix(sprites): Correct gryphon mount icon sizing 2015-12-12 11:09:27 -06:00
Blade Barringer
9aa73db281 fix(sprites): Correct size of tiger sprites 2015-12-12 11:02:54 -06:00
Blade Barringer
963995e42e refactor(css): Adjust mount heads pixel paw positioning 2015-12-12 10:50:05 -06:00
Alys
10a63a6cb7 make Android link in footer open in new tab 2015-12-12 18:59:44 +10:00
Alys
95dbcde4b6 change Android link in footer to point to Google Play 2015-12-12 18:33:36 +10:00
Blade Barringer
c0e2520bb3 Merge pull request #6365 from VirenMohindra/updated-readme 
removed gymnasium dependency status
 2015-12-11 20:29:11 -06:00
Alys
5d6c4d4dcd add Android app with Google Play logo to static apps page; remove mailing list signup form 2015-12-12 11:32:17 +10:00
Viren Mohindra
3c08a26312 removed gymnasium dependency status 
broken link- no point in keeping it in the readme
 2015-12-11 20:24:49 -05:00
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