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
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
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
Sabe Jones
00db42b6c0
feat(backgrounds): May BGs
2015-05-06 19:41:54 -05:00
Matteo Pagliazzi
a91b544830
typo
2015-05-06 16:18:14 +02:00
Tyler Renelle
a090fed10b
feat(analytics): "motivate yourself" 3 variants @lemoness
2015-05-04 15:31:00 -04:00
Blade Barringer
41a6818ea8
Revert inn text
2015-05-03 20:21:53 -05:00
NotGonnaGitUs
a45390321e
Patched translation fixes and added a few phrases to locales.
2015-05-03 23:41:42 +05:30
Blade Barringer
b408f016fd
Merge pull request #5119 from NotGonnaGitUs/develop
...
Made front page translatable
2015-05-03 09:43:43 -05:00
NotGonnaGitUs
4d5ec83234
Removed objects not used anywhere by env.t function.
2015-05-03 14:33:46 +05:30
Blade Barringer
68aedda3bb
Merge branch 'develop' into hairlessbear-cron_dailies_fix
2015-05-02 22:10:58 -05:00
NotGonnaGitUs
0fc068ea93
Removed objects not used by front.jade, footer.jade or login-modale.jade
2015-05-02 20:02:20 +05:30
NotGonnaGitUs
21f470cd5a
Removed objects not used front.jade or shared/footer.jade
2015-05-02 17:42:38 +05:30
NotGonnaGitUs
9e88a55d54
Removed objects not used by front.jade.
2015-05-02 17:12:46 +05:30
NotGonnaGitUs
124df58644
Made front page translatable.
2015-05-01 21:18:25 +05:30
NotGonnaGitUs
02e7b52fbf
Adding environment variables to the static front page for translation. - Halfway done.
2015-05-01 20:14:19 +05:30
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
Alys
ffcb765b7f
change skill descriptions to new ones provided by Lemoness at https://github.com/HabitRPG/habitrpg/issues/3029#issuecomment-96103553
2015-04-26 16:58:09 +10:00
hairlessbear
3c366e9ad3
Changed tavern text to Lemoness's specifications
2015-04-25 13:09:16 -04:00
Negue
78dd949f20
copy chat messages as todo
2015-04-25 18:30:11 +02:00
hairlessbear
b87950d948
Updated tavern text to reflect modified dailies functionality
2015-04-25 12:15:15 -04:00
Sabe Jones
f9cf860ae8
Merge pull request #5058 from SabreCat/busy-bee
...
April 2015 Subscriber Items
2015-04-24 11:05:03 -05:00
Matteo Pagliazzi
37f7db3c4e
feat(emails): add support for weekly recap emails
2015-04-22 16:30:53 +02:00
Alys
7c36e49243
Merge pull request #5022 from gisikw/dated-tasks-correct-impl
...
Dated tasks correct impl
2015-04-22 16:56:03 +10:00
Sabe Jones
7a7fc96818
feat(mystery): April Subscribee Items
2015-04-21 21:14:19 -05: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
Sabe Jones
f13c6cba00
feat(pets): Slime Quest
2015-04-15 18:08:43 -05: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
8c45ab8dc4
Removed unused strings and altered custom day start text. ( #5006 )
2015-04-14 14:23:20 -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
Alys
00abf0d694
update Drop System explanation
2015-04-14 17:57:10 +10:00
Kathryn Norris
5dc1d58f8f
Altered custom day start text. ( #5006 )
2015-04-13 17:13:23 -07:00
Kathryn Norris
ea2ad4e4b5
Changed the text for custom day start info. ( #5006 )
2015-04-13 17:13:22 -07:00
Kathryn Norris
ddb7643ff7
Updated the custom day start information in settings. ( #5006 )
2015-04-13 17:13:22 -07:00
Alys
a7abbe0e05
changed drops Learn More link and added drop types to Drops Unlocked message
2015-04-14 08:01:32 +10:00
Kevin Gisi
02838214c7
Reimplement (broken) task ordering
2015-04-13 07:47:56 -04:00
Alys
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
Blade Barringer
9e118cbfcc
Added gem popover title back in
2015-04-09 17:19:58 -05:00
Blade Barringer
252e2d0768
Removed gem popover string
2015-04-09 08:09:09 -05:00
Sphinx
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
Blade Barringer
cdd0b29924
Merge branch 'develop' into gisikw-sort-dated-todos
2015-04-08 20:47:38 -05:00
Blade Barringer
3df45a8cb0
Merge branch 'TheHollidayInn-error-message-rewrite' into develop
2015-04-08 18:11:51 -05:00
Blade Barringer
553bd0d90b
Updated console message
2015-04-08 18:11:34 -05:00
Matteo Pagliazzi
e58521f416
Merge pull request #4968 from HabitRPG/paglias/emails-unsubscription-page
...
WIP Emails unsubscription page
2015-04-08 19:12:28 +02:00
TheHollidayInn
a317bc2920
Updated seeConsole message to be more helpful to the average user
2015-04-08 08:20:10 -05:00
Kevin Gisi
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
