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

8076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 4aef4dfd0f Merge branch 'develop' into common-convert 2015-01-29 09:23:10 -06:00
Blade Barringer 154b8a00e5 Merge pull request #4585 from crookedneighbor/quest-scroll-popover-and-modal-changes 
Quest scroll popover and modal changes
 2015-01-28 15:39:32 -06:00
Blade Barringer 5f1d138241 Added comment about questPopover function 2015-01-28 15:38:41 -06:00
Blade Barringer 275f55cbfe Removed extra space 2015-01-28 15:36:13 -06:00
Blade Barringer c328d0fd3c Removed hp from popover function 2015-01-28 15:11:32 -06:00
Blade Barringer 043baf4961 Removed hp from modals 2015-01-28 15:10:21 -06:00
Blade Barringer e6e1ea086e Fixed alignment of notes on tasks 2015-01-28 14:51:51 -06:00
Blade Barringer d3d12bc638 Added popover-append-to-body to inventory popovers 2015-01-28 14:23:38 -06:00
Blade Barringer 84552597d6 Adjusted hrs for popovers 2015-01-28 14:00:06 -06:00
Blade Barringer 4c6bf8f543 Added append to body to quest scroll popovers 2015-01-28 13:37:34 -06:00
Matteo Pagliazzi 50bc48f325 fix(share): addthis in static pages 2015-01-28 20:32:35 +01:00
Blade Barringer ca897d7cf3 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-28 10:56:57 -06:00
Blade Barringer 23c31083ef Fixed triad count to actually check and make sure count is 90 2015-01-28 10:56:16 -06:00
benmanley dc5f980083 fix(tasks): improve habit icon alignment 
See #4539

Align habit buttons using a different CSS technique to prevent plus
icon from being cropped on Chrome for Windows.
 2015-01-28 13:25:24 +00:00
Blade Barringer d8e09884a0 Added quest image and info to quest invitation modal 2015-01-27 20:37:09 -06:00
Blade Barringer a77a46c543 Added one time bindings to quest modals 2015-01-27 20:27:14 -06:00
Blade Barringer eaaa09c75a Added quest details to buy quest and show quest modals 2015-01-27 20:16:11 -06:00
Blade Barringer 4e1716a8db Added hp to quest popover 2015-01-27 20:15:28 -06:00
Blade Barringer b56c5af978 Changed popover text for quest scrolls. Closes #4575 2015-01-27 19:32:06 -06:00
Blade Barringer 0096873cf5 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-27 09:47:03 -06:00
Blade Barringer 58650baba3 Merge branch 'issue#4556' of https://github.com/matttelliott/habitrpg into border 2015-01-27 09:10:46 -06:00
Matteo Pagliazzi 42c0b443d7 fix(i18n): language selection working on static pages 2015-01-27 15:48:57 +01:00
Matt T Elliott 2c40097403 move from left div to right 2015-01-26 23:14:19 -08:00
Matt T Elliott 3a38bb849b add .border-left 2015-01-26 23:08:15 -08:00
Blade Barringer b9784fa4aa Added notice for rebirth in seasonal shop 2015-01-26 22:15:24 -06:00
Blade Barringer 07870e1c7c Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-01-26 19:36:38 -06:00
Blade Barringer 7eae5db256 Added comment describing the silly conditional for transparency in the 
seasonal shop
 2015-01-26 19:25:53 -06:00
Blade Barringer 3b1743dee8 Corrected ng-class condition to show transparent class 
on seasonal shop items after rebirth
 2015-01-26 18:55:10 -06:00
Blade Barringer eceaaef954 Merge pull request #4567 from crookedneighbor/add-audio-watts 
Added Watts' Theme to Audio Choices
 2015-01-26 11:27:27 -06:00
Sabe Jones 65af7f362e Merge branch 'scrolls' into develop 
Conflicts:
	views/shared/new-stuff.jade
 2015-01-26 11:18:48 -06:00
Sabe Jones ad08f1be9a fix(news): Errant parenthesis 2015-01-26 11:11:04 -06:00
Sabe Jones 524761f1cf feat(mystery): January subscriber set 2015-01-26 11:00:02 -06:00
Blade Barringer 5ced8800cd Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-01-25 21:01:18 -06:00
Blade Barringer 9b5b83871f Refined triad Bingo calculation 2015-01-25 21:00:34 -06:00
Blade Barringer 94ebf0db46 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-01-25 20:42:25 -06:00
Blade Barringer d9ecd41c1e Fixed mountCount calculation 2015-01-25 20:26:51 -06:00
Blade Barringer 08ab6eba71 Converted shared to common in api test 2015-01-25 15:54:19 -06:00
Blade Barringer 23f1dd59c5 Converted shared to common for controllers 2015-01-25 15:26:37 -06:00
Blade Barringer 6472e04bd0 Changed shared to common for payments 2015-01-25 15:22:04 -06:00
Blade Barringer af4f51857b Changed models to use common instead of shared 2015-01-25 15:10:15 -06:00
Blade Barringer c5c0125c49 Converted routes to use common instead of habitrpg-shared 2015-01-25 15:08:03 -06:00
Blade Barringer 1290581f39 Converted some files to use common instead of habitrpg-shared 2015-01-25 15:05:15 -06:00
Blade Barringer 001d5560b3 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-01-25 14:58:20 -06:00
Alice Harris 9ab86b536f adjusted comments 2015-01-24 16:46:18 +10:00
Alice Harris a95522e165 create script to convert false to null in items.mounts for https://github.com/HabitRPG/habitrpg/pull/4374#issuecomment-71038795 2015-01-24 16:16:05 +10:00
Blade Barringer dfb43af003 Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-01-23 15:30:28 -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 72bc1cf40c Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2015-01-23 15:29:36 -06:00
Blade Barringer 318dd506af Added watts theme string 2015-01-23 15:29:00 -06:00
Blade Barringer 9f38ac86f7 Replaced blank death sound with actual sound files instead of blank 
files
 2015-01-23 15:27:57 -06:00