Blade Barringer
c123ca6a42
Correct casing of translatable string
2015-05-10 09:13:05 -05:00
GihHubSphinx
6c5d9f3a6c
Tried to make line translatable
...
Tried to make the "Only group leader can create challenges" line in the
guild creation dialog translatable
2015-05-10 08:59:43 -05:00
Alys
5123bdb4c4
Merge pull request #5080 from joyclark/develop
...
Fixing the grid view for mounts so that the animals are aligned correctly.
2015-05-10 19:01:56 +10:00
Blade Barringer
71c65c7a73
change coupon route in angular router to promo
2015-05-08 21:24:57 -05:00
Blade Barringer
1bfc82c636
Merge branch 'develop' into NotGonnaGitUs-develop
2015-05-08 21:02:09 -05:00
NotGonnaGitUs
09a713dbde
Changed menu title to "promo codes" instead of "coupons".
2015-05-08 19:36:14 +05:30
Blade Barringer
8569f7b749
Merge branch 'joyclark-autocomplete-click-behavior' into develop
2015-05-08 08:45:06 -05:00
NotGonnaGitUs
ef0b96e5e4
Changed promo code text.
2015-05-08 10:33:26 +05:30
negue
e628dba5e8
Merge pull request #5087 from negue/copyMessageTodo
...
copy chat messages as todo
2015-05-07 22:21:42 +02:00
Blade Barringer
84a4c36c7e
Merge branch 'NotGonnaGitUs-RestingatInnText' into develop
2015-05-05 19:45:42 -05:00
Blade Barringer
d482fdcea5
Refactor tavern view
2015-05-05 19:45:05 -05:00
Matteo Pagliazzi
d2198c7572
remove invite friends from settings page
2015-05-05 19:52:06 +02:00
NotGonnaGitUs
25b63cfacd
Made daniel's text in the inn based on current rest status of the user.
2015-05-04 23:37:54 +05:30
NotGonnaGitUs
a45390321e
Patched translation fixes and added a few phrases to locales.
2015-05-03 23:41:42 +05:30
Joy Clark
4450a5d7c3
Fixes #5094 Now show list based on whether or not a search query is defined. The autocomplete function from the directive is encapsulated so that it can be called and then the query can be set to null.
2015-05-03 18:14:28 +02:00
Negue
b2bad4d77f
Update todo preview in dialog
2015-05-03 17:12:08 +02:00
Sabe Jones
6685e93554
fix(Spring): WHO IS LESLIE
2015-05-01 19:19:23 -05:00
Sabe Jones
d50d4ad8bb
feat(Spring): Flung
2015-05-01 19:09:28 -05:00
Blade Barringer
e4b21ac325
Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo
2015-04-29 17:19:24 -05:00
Negue
75579a7c36
add previewMarkdown / click as popover-trigger / misc changes
2015-04-27 19:23:56 +02:00
Blade Barringer
e8da13b9be
Merge branch 'joyclark-chat_match_users' into develop
2015-04-26 20:43:55 -05:00
Blade Barringer
dcd4be71ba
Merge pull request #5095 from hairlessbear/settings_button_name_change
...
Changed button title to match dropdown settings menu titles
2015-04-26 19:32:58 -05:00
hairlessbear
2f33fe6e38
Changed button title to match menu titles
2015-04-26 19:53:35 -04:00
Joy Clark
f214428411
Improved filter function as described in #5085 and added unit tests.
2015-04-26 17:50:53 +02:00
Negue
78dd949f20
copy chat messages as todo
2015-04-25 18:30:11 +02:00
Joy Clark
94c5da32d6
a proposed solution to issue #1866 Redefined the filter function to match based on prefix
2015-04-25 16:23:57 +02:00
Joy Clark
0aff0b0f22
mounts are wider than pets and the empty paw prints in the mount view are smaller than the mounts that have been found. This makes the grid view uneven. Adjusted the css so that the mounts and paw prints are aligned.
2015-04-24 19:57:15 +02:00
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