sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
10588 commits 3 branches 0 tags 1.6 GiB
Commit graph

10588 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sabe Jones
b5124e6cd8 fix(warnings): Show modal only once 
Also removes a random extra newline.
 2015-09-03 11:12:54 -04:00
Sabe Jones
d29c7ff1bb Merge pull request #5878 from HabitRPG/sabrecat/modal-warnings 
Modal warning for low health
 2015-09-02 16:14:52 -05:00
Sabe Jones
e6068b23a7 feat(analytics): Track low health modal 2015-09-02 17:03:32 -04:00
Sabe Jones
1a675b8461 feat(warning): Revised low health modal 2015-09-02 16:31:56 -04:00
Sabe Jones
e82f73c712 Merge branch 'develop' into sabrecat/modal-warnings 2015-09-02 15:17:33 -04:00
Blade Barringer
ceebb33daf Merge pull request #5872 from HabitRPG/paglias/firebase 
Firebase changes
 2015-09-02 08:35:47 -05:00
Sabe Jones
68fef118e1 Merge pull request #5866 from HabitRPG/sabrecat/content-201509 
Content 201509
 2015-09-01 10:56:24 -05:00
Matteo Pagliazzi
7acec14e6b do not allow leaders to kick themselves from group 2015-09-01 16:33:24 +02:00
Blade Barringer
41c38c6e63 Merge branch 'TheHollidayInn-directives-test-task-focus' into develop 2015-08-31 20:36:07 -05:00
Blade Barringer
1d8b10dc99 Adjust formatting 2015-08-31 20:35:23 -05:00
Blade Barringer
f4ca8bb78d Rename task-focus focus-element 2015-08-31 20:31:03 -05:00
Blade Barringer
d5bd5f281c Rename file names 2015-08-31 20:21:01 -05:00
Blade Barringer
c65ab56641 Remove focus-me directive 2015-08-31 20:17:30 -05:00
Blade Barringer
3e44c3a8ce Change focus-me to use task-focus 2015-08-31 20:16:14 -05:00
Blade Barringer
499e8578cd Merge branch 'TheHollidayInn-menu-fix-notification-menu-closing' into develop 2015-08-31 19:02:32 -05:00
Blade Barringer
dc5c35bb17 Merge branch 'develop' into TheHollidayInn-menu-fix-notification-menu-closing 2015-08-31 19:01:11 -05:00
Blade Barringer
ca49412313 Use === instead of == 2015-08-31 18:59:01 -05:00
Blade Barringer
dfaaed05a4 Switch double quotes to single quotes 2015-08-31 18:54:06 -05:00
Blade Barringer
0bed76d336 Restructure test 2015-08-31 17:42:33 -05:00
Blade Barringer
8e2247ab3e Remove extraneous white space 2015-08-31 17:28:47 -05:00
Sabe Jones
5ba6cfc2f5 feat(content): September content adds 2015-08-31 18:16:54 -04:00
Kevin Gisi
ae5ea39c58 Merge pull request #5864 from gisikw/develop 
Fixed the wrong redirect
 2015-08-31 17:59:54 -04:00
Kevin Gisi
69782b5bd1 Fixed the wrong redirect 2015-08-31 17:59:19 -04:00
TheHollidayInn
42066be2cf Fixed broken test by change element to a focusable element 2015-08-31 16:49:34 -05:00
Kevin Gisi
509f845389 Merge pull request #5862 from gisikw/develop 
Domain redirects -> 301
 2015-08-31 17:42:00 -04:00
Kevin Gisi
177c48820c Domain redirects -> 301 2015-08-31 17:34:18 -04:00
Sabe Jones
c0a47130e4 chore(content): Compile sprites 2015-08-31 15:54:08 -05:00
Sabe Jones
3ead359538 chore(news): August Last Chance Bailey 2015-08-30 21:06:25 -05:00
TheHollidayInn
1624fc4417 Adjusted var declration technique 2015-08-30 20:39:21 -05:00
Blade Barringer
ee0bcb5309 Correct class name 2015-08-30 17:52:16 -05:00
Blade Barringer
6e7787dcf5 chore(i18n): update locales 2015-08-30 10:25:55 -05:00
Blade Barringer
0b4c03a678 chore(i18n): update locales 2015-08-29 17:41:19 -05:00
Blade Barringer
19c3e22176 chore(i18n): update locales 2015-08-29 11:46:01 -05:00
Blade Barringer
cbea9f4200 chore(i18n): update locales 2015-08-29 07:38:54 -05:00
Blade Barringer
4af1a4d6ac Rename image rendering class 2015-08-28 21:48:42 -05:00
Blade Barringer
dd1e69b9d5 Merge branch 'RossBrunton-develop' into develop 2015-08-28 21:42:16 -05:00
Blade Barringer
df3c498fcc Add rasterize class 2015-08-28 21:41:53 -05:00
Sabe Jones
3ad95e1ab7 fix(tutorial): Unstick Justin head 
Fixes #5497.
 2015-08-28 16:12:45 -04:00
Sabe Jones
6ecf3a0e50 Merge pull request #5851 from HabitRPG/sabrecat/onboarding-tweaks 
Sabrecat/onboarding tweaks
 2015-08-28 13:50:42 -05:00
Sabe Jones
9e45017faa Merge branch 'develop' into sabrecat/onboarding-tweaks 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
 2015-08-28 13:24:10 -05:00
Sabe Jones
8d713a53c4 feat(tutorial): Splash screen overhaul complete 2015-08-28 13:58:30 -04:00
Sabe Jones
f308116c54 feat(tutorial): Moar avatars 2015-08-28 11:48:30 -05:00
Sabe Jones
f88c536836 chore(news): Back to School Bailey 2015-08-27 16:20:15 -05:00
Sabe Jones
f5c08c4ae5 WIP(tutorial): Gregarious Vice 2015-08-27 15:36:53 -05:00
Sabe Jones
f8994a3ee3 WIP(tutorial): Revised images 2015-08-27 15:21:09 -05:00
Sabe Jones
c4012ad762 WIP(tutorial): New intro splash 2015-08-27 16:04:59 -04:00
Ross Brunton
821d562998 Set image-rendering to pixelated 
Closes #5846

I explictly disabled it on img because most things that use the img tag
tend not to be pixel art.
 2015-08-27 19:17:42 +01:00
Sabe Jones
5c4ebef0a9 feat(tutorial): New intro images 2015-08-27 13:08:12 -05:00
TheHollidayInn
6fb29d8766 Added ability to close menu when a child element has closeMenu directive 2015-08-26 15:32:59 -05:00
Alys
049f9280a2 Merge pull request #5798 from Alys/rebirth-keeps-free-gear-2015-08-12 
prevent Orb of Rebirth from removing free gear (equipment that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750
 2015-08-26 22:01:29 +10:00