74ef8cd443
Added filter by owner for challenges
2015-04-22 11:54:01 -05:00
7c36e49243
Merge pull request #5022 from gisikw/dated-tasks-correct-impl
...
Dated tasks correct impl
2015-04-22 16:56:03 +10:00
ee7ba19ed1
feat(i18n): upload japanese, serbian and chinese (taiwan)
2015-04-19 13:34:20 +02:00
662c8cd529
chore(i18n): update locales
2015-04-19 13:28:21 +02:00
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
f13c6cba00
feat(pets): Slime Quest
2015-04-15 18:08:43 -05:00
e474f0300c
chore(i18n): update locales
2015-04-15 17:13:07 +02:00
fc979dfdaa
create new string for quest participants to correct processing error
...
closes #5025 , closes #5029
2015-04-14 17:52:08 -05:00
8c45ab8dc4
Removed unused strings and altered custom day start text. ( #5006 )
2015-04-14 14:23:20 -07:00
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
00abf0d694
update Drop System explanation
2015-04-14 17:57:10 +10:00
5dc1d58f8f
Altered custom day start text. ( #5006 )
2015-04-13 17:13:23 -07:00
ea2ad4e4b5
Changed the text for custom day start info. ( #5006 )
2015-04-13 17:13:22 -07:00
ddb7643ff7
Updated the custom day start information in settings. ( #5006 )
2015-04-13 17:13:22 -07:00
a7abbe0e05
changed drops Learn More link and added drop types to Drops Unlocked message
2015-04-14 08:01:32 +10:00
4fe740a403
chore(i18n): update locales
2015-04-13 19:31:53 +02:00
02838214c7
Reimplement (broken) task ordering
2015-04-13 07:47:56 -04:00
8af1f0538b
revert PR #4996 (Sort dated todos) because of problems sorting other tasks - see comments in #4996
2015-04-13 20:16:24 +10:00
9b19bd5076
chore(i18n): update locales
2015-04-11 14:53:33 +02:00
9e118cbfcc
Added gem popover title back in
2015-04-09 17:19:58 -05:00
252e2d0768
Removed gem popover string
2015-04-09 08:09:09 -05:00
7efb594838
Pulling in commits from shared repo
...
Additional changes to other languages are 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.)"
Conflicts:
locales/en/challenge.json
2015-04-09 08:01:34 -05:00
cdd0b29924
Merge branch 'develop' into gisikw-sort-dated-todos
2015-04-08 20:47:38 -05:00
3df45a8cb0
Merge branch 'TheHollidayInn-error-message-rewrite' into develop
2015-04-08 18:11:51 -05:00
553bd0d90b
Updated console message
2015-04-08 18:11:34 -05:00
820909dd9b
chore(i18n): update locales
2015-04-08 19:15:03 +02:00
e58521f416
Merge pull request #4968 from HabitRPG/paglias/emails-unsubscription-page
...
WIP Emails unsubscription page
2015-04-08 19:12:28 +02:00
a317bc2920
Updated seeConsole message to be more helpful to the average user
2015-04-08 08:20:10 -05:00
f12d56e456
Revert "Merge pull request #4995 from HabitRPG/revert-4980-sort-dated-todos"
...
This reverts commit 33f928b6d876ef1fdd92
2015-04-07 22:38:43 -04:00
cc674f57cd
Revert "Sorted dated todos by date."
2015-04-07 19:51:27 -05:00
76ef1fdd92
Merge pull request #4988 from SabreCat/shiny-seed
...
April backgrounds
2015-04-07 19:12:34 -05:00
ab1b75b655
finalize unsubscription page
2015-04-07 14:04:03 +02:00
e470764b06
chore(i18n): update locales
2015-04-07 14:03:48 +02:00
616a7d9650
feat(backgrounds): April BGs
2015-04-06 19:03:24 -05:00
ac01d9ad8b
Sorted dated todos by date.
2015-04-06 03:47:00 -04:00
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
9a76552072
chore(i18n): update locales
2015-04-04 12:36:55 +02:00
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
6b52e00b37
Merge pull request #4972 from HabitRPG/lefnire/sugarfiend2
...
Static page redesign
2015-04-03 13:53:59 -06:00
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
61db64e963
chore(i18n): update locales
2015-04-03 13:28:45 +02:00
26f1d6bb39
feat(static): secondary statics reflect front. merge front.old into features
2015-04-02 17:41:38 -06:00
b263ba3099
fix(seasonal): Sneaky floral
...
Srsly, just don't say it.
2015-04-01 23:19:54 -05:00
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
b6a4d65d8c
feat(seasonal): Shiny Seed
2015-04-01 22:36:07 -05:00
6aea352309
chore(i18n): update locales
2015-04-01 18:07:14 +02:00
7d9728f2ff
Merge pull request #4939 from SabreCat/spring-customize
...
Spring customizations
2015-03-29 16:52:09 -05:00
2937c13f6b
chore(i18n): update locales
2015-03-29 22:30:53 +02:00
9722af679d
feat(customize): Spring Colors
2015-03-28 16:22:52 -05:00
7a220bee47
update Egg Hunt quest completion message with new content from Leslie
2015-03-28 05:37:42 +10:00
TheHollidayInn