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

87 commits

Author SHA1 Message Date
Kevin Gisi
ac01d9ad8b Sorted dated todos by date. 2015-04-06 03:47:00 -04:00
Alys
7d579ea08a Merge branch 'CancelSendOnBlankPM' of https://github.com/rdhammond/habitrpg into rdhammond-CancelSendOnBlankPM 
Conflicts:
	website/views/shared/modals/members.jade
 2015-04-05 23:24:46 +10:00
Alys
6199e1d843 Merge branch 'remove-interactivity-challenge-tasks' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-remove-interactivity-challenge-tasks 
Conflicts:
	website/public/css/tasks.styl
	website/views/shared/tasks/task.jade
 2015-04-05 22:01:10 +10:00
Alys
8033b129ff Merge pull request #4915 from gisikw/free_100_key_to_the_kennels 
Make Key to the Kennels free for Triad Bingoers.
 2015-04-04 10:48:15 +10:00
Alys
7a357933dc Merge pull request #4914 from gisikw/repair_ie_meters 
Fix broken meters in IE
 2015-04-04 01:54:24 +10:00
Alys
0e581444b7 Merge pull request #4887 from TheHollidayInn/focus-textarea-on-pm 
Added focus directive to focus textarea for a private message model box
 2015-04-04 01:45:30 +10:00
Alys
ab6d8d0821 Merge pull request #4950 from gisikw/force-latest-bailey 
Ensure Bailey always displays the most recent message.
 2015-04-04 01:29:32 +10:00
Kevin Gisi
7740f1969b Fix broken meters in IE 
Health, XP, and Mana bars were broken in IE, due to the use of {{ }} within
style attributes. Using Angular's string interpolation within style attributes
doesn't work in IE, as IE will actually strip the property immediately upon DOM
render. Using ng-style allows properties to be preserved, and renders
cross-browser correctly.
 2015-04-02 15:41:01 -04:00
Sabe Jones
d4329c7a5a fix(news): Corrections 2015-04-01 23:37:24 -05:00
Sabe Jones
b263ba3099 fix(seasonal): Sneaky floral 
Srsly, just don't say it.
 2015-04-01 23:19:54 -05:00
Sabe Jones
f0e7f0464c fix(seasonal): NO FLOWERS 
We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."
 2015-04-01 23:07:36 -05:00
Sabe Jones
b6a4d65d8c feat(seasonal): Shiny Seed 2015-04-01 22:36:07 -05:00
Sabe Jones
6e1024d8ed fix(flowers): FLOWERS ON FLOWERS 2015-03-31 20:17:01 -05:00
Kevin Gisi
79606736a1 Ensure Bailey always displays the most recent message. 
* Added a Grunt task to precompile website/views/shared/new-stuff.jade to a
  static html file.

* Updated the new-stuff.jade modal template to use a $rootScope property.

* Added a special case to openModal for the newStuff template, by which it
  fetches the flat file, marks it as trusted HTML, and sets it to the
  $rootScope property before rendering the modal.
 2015-03-31 20:38:15 -04:00
Sabe Jones
740ddefd76 fix(flowers): AND FIXES 2015-03-31 18:55:07 -05:00
Sabe Jones
1cc3c5539f feat(flowers): AND SLIMES 
AND BACKGROUNDS
 2015-03-31 18:41:50 -05:00
Sabe Jones
2acef4d42b feat(flowers): FLOWERS 2015-03-31 18:30:22 -05:00
Sabe Jones
9722af679d feat(customize): Spring Colors 2015-03-28 16:22:52 -05:00
Daniel Hammond
cea97e4da8 Documenting the (Bootstrap recommended!) wrapper workaround for tooltips 
on disabled elements. Added code to prevent user from posting blank
messages by using meta-enter as a workaround.
 2015-03-28 01:21:39 -04:00
Kevin Gisi
ca87a46b04 Adjusted Key to the Kennel logic so only *release both* is free with Triad Bingo achievement 2015-03-26 18:30:56 -04:00
Kevin Gisi
334393d33b Make Key to the Kennels free for Triad Bingoers. 
* Updated logic in `common/script/index.coffee` to accept Triad Bingo
  achievement in lieu of gems.

* Removed Gem cost on inventory page if user has achievement.

* Updated Key to the Kennels modal to hide "Buy Gems" button if user has
  achievement.

* Removed Gem costs from buttons if user has achievement.

* Added new copy for Key to the Kennels modal that omits gem prices if the user
  has the achievement.
 2015-03-26 18:30:56 -04:00
Alys
e9062c31a2 Merge pull request #4913 from galarant/apply-level-cap-to-stats-display 
front end reflects level cap for stats bonus
 2015-03-26 17:49:45 +10:00
Sabe Jones
77cc05a668 fix(pets): Eggy eggy feed 2015-03-25 22:01:42 -05:00
Sabe Jones
354872decb feat(March): Eggy eggy cont'd 2015-03-25 20:46:27 -05:00
Alys
0fc158be2e Merge pull request #4893 from TheHollidayInn/checklist-removed-backspace-delete 
Removed delete function when user hits backspace/delete
 2015-03-25 18:00:31 +10:00
Alys
e7c0c370ee Merge pull request #4909 from TheHollidayInn/notify-user-empty-task 
Added tooltip for when a task is empty
 2015-03-25 17:59:20 +10:00
Jeff
a40a374eb5 front end reflects level cap for stats bonus 2015-03-24 19:53:13 -04:00
Tyler Renelle
560d51b2e2 feat(tour): esc force closes, but puts justin head in toolbar. clicking 
justin head brings tour back.
 2015-03-24 15:41:44 -06:00
Daniel Hammond
d537a7fee4 Tweaked copy on "enter a message" text for private message button popup. 
Added placeholder text for empty private message box.
 2015-03-24 00:10:44 -04:00
kholliday
e5cd319ef5 Changed empty task messageand added style. 2015-03-23 20:18:14 -05:00
kholliday
9a157eea8c Added tooltip for when a task is empty 2015-03-23 19:36:37 -05:00
George Tucker
84b2e39b0b Changed notification redirect to guilds/public instead of /guilds. Fixes #4902. 2015-03-23 17:59:38 +00:00
Daniel Hammond
d3b92a0a6c Added a tooltip to make it clear to the user to type something in! 2015-03-22 12:37:32 -04:00
Alys
849ef6d862 Merge pull request #4822 from benschenker/fix-stats-rounding 
Fix Mana rounding on the stats page. Fixes #4820
 2015-03-22 17:42:07 +10:00
Daniel Hammond
5f726eadbf Adding an extra check to disable "send" for private messages when textbox 
is empty.
 2015-03-21 22:54:28 -04:00
Alice Harris
5c2818e68a remove message about when the survey achievements badges will be awarded 2015-03-21 19:28:29 +10:00
Sabe Jones
e2b1083088 fix(spring): Tweaks 2015-03-20 15:19:37 -05:00
Sabe Jones
f3f5669ab2 feat(spring): Fling 2015-03-20 14:56:00 -05:00
kholliday
824561bb57 Removed delete function when user hits backspace/delete 2015-03-20 14:03:20 -05:00
Sabe Jones
7065b400bc feat(surveys): Close out survey 2015-03-19 21:44:42 -05:00
Tyler Renelle
84a77695ea feat(ads): remove ads completely 2015-03-19 11:39:17 -06:00
kholliday
ceb2639f81 Added focus directive to focus textarea for a private message model box 2015-03-19 11:49:46 -05:00
Brian Chen
9bab79790c Change task's bo-id to id with angular's {{::}}. Fixes #4430 2015-03-19 10:16:53 +08:00
kholliday
67b38f71f9 Removed styles and sorting ability for locked tasks (Challenge tasks) 2015-03-18 14:39:23 -05:00
Matteo Pagliazzi
9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Matteo Pagliazzi
0722a17897 start working on kick from group email & message 2015-03-18 17:31:07 +01:00
Alice Harris
833ba9ec4a change Gully3 to Gully as requested by Gully in the Tavern and as confirmed by Lemoness 2015-03-18 19:13:39 +10:00
Sabe Jones
c8db070b12 fix(quests): Reference string correctly 2015-03-17 21:51:28 -05:00
Sabe Jones
4c5f4377ff fix(quests): Alternate unlock strings 2015-03-17 21:48:22 -05:00
Sabe Jones
efdf591eae fix(quest): Different string format 2015-03-17 21:38:22 -05:00