sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-01 19:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14352 commits 1 branch 0 tags 1.6 GiB
Commit graph

1974 commits

Author SHA1 Message Date
Bryce Wojtowicz
0931d52d56 Edit: fixed tabs instead of spaces issue 2015-02-22 13:39:19 +08:00
Bryce Wojtowicz
44478d3792 Fixes #4645 
Fixes Gem Display in modals to say [Gem] You have [n] Gems
Modified code to use a translatable string!
Thanks for the tip :)
 2015-02-22 13:35:50 +08:00
Matteo Pagliazzi
397a293ca8 change text for recapture emails settings 2015-02-20 18:15:47 +01:00
Matteo Pagliazzi
ba11d827bb chore(i18n): update locales 2015-02-20 18:04:01 +01: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
0bd912be30 Merge pull request #4690 from chimericdream/task-difficulty-context-classes 
Add difficulty context class to task list items
 2015-02-18 16:37:53 -06:00
Matteo Pagliazzi
37433ee1aa chore(i18n): update locales 2015-02-18 17:41:31 +01:00
Bill Parrott
3599eaefaf Merge branch 'develop' into bulk-add-tasks 2015-02-17 22:32:28 -06:00
Bill Parrott
789575d6fb Merge branch 'develop' into task-difficulty-context-classes 2015-02-17 22:31:27 -06:00
Sabe Jones
87b13d5fc8 chore(grunt): compile sprites 2015-02-17 20:46:40 -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
78430b1910 Collapsed 3 strings into single string 2015-02-17 15:26:42 -06:00
Bryce Wojtowicz
3a86435655 fixes #4670 
edited groups.json (again)
sorry last edit
!!!
 2015-02-18 05:08:02 +08:00
Bryce Wojtowicz
9f49626156 fixes #4670 
edit: fixed the linkLFG so it included the entire Guild name
 2015-02-18 05:06:13 +08:00
Bryce Wojtowicz
33520fc64d Fixed groups.json 
fixes #4702

Cheers
 2015-02-18 05:03:34 +08: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
scribblypanda
d46633b089 added pet colour to feed/evolve notif 2015-02-17 12:54:34 -05: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
Bill Parrott
b1b478bc74 add task export functionality 2015-02-16 21:21:49 -06:00
Sabe Jones
e0cbeaadc5 chore(grunt): compile sprites 2015-02-16 18:31:00 -06:00
Sabe Jones
130261dacf feat(event): End Valentine's 2015-02-16 18:15:09 -06:00
Blade Barringer
6d26d3e053 Added original user achievement badge 2015-02-16 17:55:18 -06:00
Bill Parrott
9cf4d9086b be more explicit about priority value vs context class 2015-02-16 15:49:31 -06:00
Bill Parrott
812599cb77 add difficulty context class to task list items 2015-02-16 15:02:04 -06:00
Blade Barringer
16140089b0 Compiled sprites for bunny quest 2015-02-15 21:08:14 -06:00
Blade Barringer
c23f83c5ac Added new files for bunny quest 2015-02-15 21:05:03 -06:00
Matteo Pagliazzi
34d8a910e3 chore(i18n): update locales 2015-02-14 17:56:11 +01:00
Blade Barringer
28c648bb0b Compiled sprites for new backgrounds 2015-02-13 16:22:28 -06:00
Blade Barringer
235cf8cc24 Added new backgrounds 2015-02-13 16:20:49 -06:00
Blade Barringer
368d1b9941 Added instruction about compiling sprites 2015-02-12 21:58:44 -06:00
Blade Barringer
e605acffbe Corrected paths or nodemonignore 2015-02-12 21:45:37 -06:00
Blade Barringer
cb7f382a85 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/dist/sprites/habitrpg-shared.css
 2015-02-12 15:40:12 -06:00
Blade Barringer
51b90afb34 Compiled everything 2015-02-12 13:49:34 -06:00
Blade Barringer
4764d6d416 Mv images to correct place 2015-02-12 13:44:28 -06:00
Blade Barringer
7ec403a828 Remvoeding common/img folder to relink from shared 2015-02-12 13:42:39 -06:00
Blade Barringer
9ddb5e35fb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/dist/sprites/habitrpg-shared.css
	common/img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUred.png
 2015-02-12 13:42:11 -06:00
Blade Barringer
df5ff3d5a1 Downgraded coffeescript module to 1.6 2015-02-12 13:31:21 -06:00
Blade Barringer
a6b786a8e5 Compiled sprite css 2015-02-12 12:13:23 -06:00
Blade Barringer
3c60e7e079 Corrected paths to common folders in css 2015-02-12 12:10:19 -06:00
Blade Barringer
85bf2aced8 Wrote task to minify and concatenate spritesheet styles 2015-02-10 17:12:17 -06:00
Blade Barringer
557ccc7ec0 Added sprites build to build:prod task 2015-02-09 23:07:28 -06:00
Blade Barringer
4b8b7bc87d Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-09 22:40:15 -06:00
Blade Barringer
45d1fb4c6e Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
 2015-02-09 22:18:22 -06:00
Blade Barringer
fe6579937c Editted common readme 2015-02-09 19:06:13 -06:00
Blade Barringer
c8124f28ed Set it so compiled js and sprites are not ignored 2015-02-09 16:04:25 -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
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
0329f156e9 added watch tasks 2015-02-03 22:07:35 -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
916de09914 Updated images in shared 2015-02-03 19:57:58 -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
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
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
Blade Barringer
3e5663bebf Removed files 2015-02-03 16:17:03 -06:00
Blade Barringer
380dab7ae9 Moved audio out of common public folder 2015-02-03 14:04:53 -06:00
Blade Barringer
d2eafdd021 Started moving public folder stuff back to website 2015-02-03 14:02:34 -06:00
Blade Barringer
5a61f30138 Removed test sprite files 2015-02-02 18:27:39 -06:00
Blade Barringer
f5f1964249 Started organizing common folder 2015-02-01 23:09:07 -06:00
Blade Barringer
88be8f3274 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
	common/img/sprites/spritesmith/npcs/npc_bailey_broken.png
	common/img/sprites/spritesmith/npcs/npc_justin_broken.png
	common/img/sprites/spritesmith/npcs/npc_matt_broken.png
	img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png
	img/sprites/spritesmith/gear/events/birthday/shop_armor_special_birthday2015.png
	img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
	img/sprites/spritesmith/npcs/npc_bailey_broken.png
	img/sprites/spritesmith/npcs/npc_justin_broken.png
	img/sprites/spritesmith/quests/inventory_quest_scroll_penguin.png
 2015-02-01 14:07:18 -06:00
Blade Barringer
4588be29ee Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00
Blade Barringer
c91b0cd34a Moved folders into common directory 2015-01-21 10:34:04 -06:00