Commit graph

81 commits

Author SHA1 Message Date
Blade Barringer
8cec2da905 Added button for jumping to inbox 2015-04-22 19:29:24 -05:00
Matteo Pagliazzi
37f7db3c4e feat(emails): add support for weekly recap emails 2015-04-22 16:30:53 +02:00
Alys
175ec9bb46 Merge pull request #5007 from stillsnowedin/develop
Updated the custom day start information in settings. (#5006)
2015-04-19 15:02:37 +10:00
hairlessbear
68486f7c42 Fixed display of Pet Hydra in Tavern (Tier 6)
In the Tier 6 contributor description, the Pet Hydra wasn't displaying. Changed `div` tag to `span` to fix the issue.
2015-04-16 07:48:15 -05:00
Blade Barringer
e1a623d3e0 Merge pull request #5031 from gisikw/guild-detail-join-leave
Join/Leave buttons on guild detail page. Addresses #4427
2015-04-15 22:46:33 -05:00
Sabe Jones
f13c6cba00 feat(pets): Slime Quest 2015-04-15 18:08:43 -05:00
Kevin Gisi
d455666650 Join/Leave buttons on guild detail page. Addresses #4427 2015-04-15 06:15:11 -04:00
Kathryn Norris
2fc01ee776 Simplified custom day start info in settings. (#5006) 2015-04-14 16:47:37 -07:00
Blade Barringer
fc979dfdaa create new string for quest participants to correct processing error
closes #5025, closes #5029
2015-04-14 17:52:08 -05:00
Kathryn Norris
6a461be0a4 Replaced toggleCustomDayStartInfo function with angular magic. (#5006) 2015-04-14 14:49:45 -07:00
Alys
6296a2f4df Merge pull request #4969 from Alys/explain-drops-2015-03-04
add text to Market for eggs, etc to explain to new users that the items will also drop
2015-04-14 18:22:47 +10:00
Kathryn Norris
ddb7643ff7 Updated the custom day start information in settings. (#5006) 2015-04-13 17:13:22 -07:00
Blade Barringer
24ef3aa012 Made uuid in hall of heroes populate the input box 2015-04-09 21:57:06 -05:00
Sphinx
69e1b4f8e6 Update challenges.jade
Additional changes in translations required before merging!

https://trello.com/c/SvTsLdRF/12-translations
"0leg
It would be great if we could have "%number_of% Participants" instead of just "Participants" in the source language so that we could translate it as "участников: %number_of%" which is the only correct way to translate it into Russian without grammatical mistakes. (This example is from Challenges tab.)"
2015-04-09 07:55:44 -05:00
Kevin Gisi
6cfdfc5225 Added group type to challenge API, link to guild/party on challenges 2015-04-06 02:44:43 -04:00
Kevin Gisi
145f4c0fa7 Check leader._id, rather than just leader for checking challenge ownership 2015-04-06 02:32:24 -04:00
Kevin Gisi
da81241ebe Transition Challenge -> Edit to the Singleton challenge view, to address issues associated with #4814 2015-04-06 02:18:29 -04:00
Kevin Gisi
3e653c9282 Reimplemented single challenge view code from #3319 2015-04-06 02:18:29 -04:00
Alys
934fd13042 update More Info challenges link to point to wiki instead of old trello card 2015-04-06 15:35:41 +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
43fdf939cc add text to the Market for eggs, hatching potions, and food to explain to new users that the items will also drop 2015-04-03 23:00:15 +10: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
9722af679d feat(customize): Spring Colors 2015-03-28 16:22:52 -05:00
Alys
1202c624f1 Revert "Added hide and error message when a user tries to create a challenge for..." 2015-03-27 20:11:12 +10:00
Alys
f16ef869a3 Merge pull request #4836 from TheHollidayInn/fix-max-value-0-challenges
Added hide and error message when a user tries to create a challenge for...
2015-03-27 19:21:51 +10:00
Alys
a3a1a92388 Merge pull request #4849 from TheHollidayInn/add-link-to-challenge-creator
Added link to challenge creator on challenges.
2015-03-27 18:13:33 +10: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
Sabe Jones
63d6a43702 fix(pets): Eggy eggy progress bar 2015-03-25 22:03:46 -05:00
Sabe Jones
77cc05a668 fix(pets): Eggy eggy feed 2015-03-25 22:01:42 -05:00
Sabe Jones
b24dbe9b86 feat(March): Eggy eggy mystery 2015-03-25 19:53:07 -05:00
Sabe Jones
dac292114c fix(shop): Open Shop 2015-03-20 15:15:27 -05:00
Sabe Jones
bd0d4c8b21 fix(shop): Remove br 2015-03-20 15:09:55 -05:00
Sabe Jones
621e5ba7d7 fix(shop): Indent +1 2015-03-20 15:07:12 -05:00
Sabe Jones
f3f5669ab2 feat(spring): Fling 2015-03-20 14:56:00 -05:00
Tyler Renelle
84a77695ea feat(ads): remove ads completely 2015-03-19 11:39:17 -06:00
Matteo Pagliazzi
9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Sabe Jones
4cb6783544 feat(quest): Bunny quest 2015-03-17 21:24:46 -05:00
Alice Harris
c47606c5b2 remove Show Tour button from Settings->Site; (unrelated to that) delete an outdated comment 2015-03-17 07:49:37 +10:00
Alice Harris
21a7e6193f add whitespace between delete and opt-out 2015-03-14 23:27:26 +10:00
Alys
94f9cff279 Merge pull request #4850 from stillsnowedin/develop
Added confirmation before deleting messages and moved buttons to top of ...
2015-03-14 22:32:46 +10:00
Alys
59f64830b1 Merge pull request #4799 from TheHollidayInn/add-dequip-button
Added dequip ability per ticket: 3730
2015-03-14 21:36:57 +10:00
Kathryn Norris
9d92bd384c Removed popover from delete messages button. (for #4848) 2015-03-13 05:05:54 -07:00
Kathryn Norris
47a05338e5 Added confirmation before deleting messages and moved buttons to top of Inbox. (fixes #4848) 2015-03-13 04:11:35 -07:00
kholliday
dd49b12bdb Added link to challenge creator on challenges. 2015-03-12 20:19:03 -05:00
kholliday
8a121a5dc3 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-03-10 22:15:24 -05:00
Blade Barringer
3830a39804 Removed invite button on challenges page. Closes #4796 2015-03-09 16:39:20 -05:00
kholliday
fc3e1c6c9b Added ability to remove pet, mount, and background. Also, changed text for all dequip buttons. 2015-03-08 15:35:37 -05:00
kholliday
cfaedb3ebd Added bootstrap styles to button. 2015-03-05 12:11:42 -06:00