810b2eaeb0
Merge remote-tracking branch 'Alys/patch-5' into develop
...
Conflicts:
locales/en/npc.json
2014-05-13 16:25:20 -06:00
7c17d0f493
Merge pull request #209 from Alys/patch-8
...
Tour - To-Dos: change "deadline" to "date" (2nd attempt)
2014-05-13 16:17:46 -06:00
6667853ee4
Tour - To-Dos: change "deadline" to "date" (2nd attempt)
...
Repeat of https://github.com/HabitRPG/habitrpg-shared/pull/207 but without conflicts.
"Deadline" (or even "due date") implies that something happens when the date is reached. "Date" implies that to a lesser degree. We get questions in the Tavern and Newbies Guild about the effect of dates on to-dos, so maybe this is a change worth making.
2014-05-13 21:15:16 +10:00
f0e49d75eb
Merge pull request #208 from Alys/patch-7
...
Tour: updates for new toolbar design
2014-05-12 11:57:01 -06:00
05727964d1
chore(i18n): update locales
2014-05-12 17:19:06 +02:00
f8912c8506
fix(i18n): mistery -> mystery
2014-05-12 17:16:11 +02:00
e16d48a6a9
Tour: updates for new toolbar design
...
I'm REALLY not happy with the way I've worded these changes because they sound clunky and messy, but the original text is wrong now, to the extent that it would induce frustration rather than being helpful. It might be better to just delete the two sentences I changed. The day start settings might be a bit advanced for an introductory tour? The "Social" thing that I wrote would be better on its own Tour page.
2014-05-12 21:30:20 +10:00
57a9ef2895
Tour - Avatar Customization: "scroll all the way down"
...
Added Leslie's requested text "Make sure you scroll all the way down - we have hairstyle and head accessories available as well!" from https://plus.google.com/u/0/107946115700776803839/posts/Tgob3LvHCMv
2014-05-12 21:08:43 +10:00
cc424dac03
chore(grunt): grunt
2014-05-11 21:10:17 -06:00
8e2f0a08e9
fix(tests): remove level 100 test
...
Keeps built from failing due to https://github.com/HabitRPG/habitrpg-shared/pull/203
2014-05-11 16:52:53 -07:00
8ca6ad47b5
Merge pull request #204 from deilann/scrollfix
...
if negative scrolls, allow purchase to work
2014-05-11 17:03:25 -06:00
629fec7b23
Merge pull request #203 from deilann/removingthelevelcap
...
Removing level cap, free rebirth at 100
2014-05-11 16:29:35 -06:00
ef06a2a9c6
fix(tests): for i18n on quests
2014-05-11 16:18:56 -06:00
6e94332b08
fix(tests): FIXME temporarily remove stats.mp checks from cron
2014-05-11 16:17:50 -06:00
072b0ab005
fix(tests): temporary fix to some i18n issues in habitrpg-shared algo tests
2014-05-11 15:56:40 -06:00
c72c8a948f
fix(cron): plan check so it passes tests
2014-05-11 15:35:35 -06:00
a68c3c3dad
chore(i18n): update locales
2014-05-11 21:47:49 +02:00
3dcd5e15bf
scroll quickfix
2014-05-11 09:30:43 -07:00
5fd1f2eb0f
level 100 modal strings and removing level cap
2014-05-11 07:53:31 -07:00
ca4f88754f
i18n(filters.jade): Edit and add to filter strings
2014-05-09 16:36:21 +01:00
2379de59d4
Merge pull request #168 from HabitRPG/paglias/translate
...
Translate content and api messages
2014-05-06 20:15:28 +02:00
4868d31496
chore(i18n): update locales & grunt
2014-05-06 20:11:02 +02:00
b83005b068
chore(i18n): update locales
2014-05-06 19:51:37 +02:00
190ad036cc
fix(i18n): two-handled
2014-05-06 19:51:36 +02:00
1d2ae52d26
fix(i18n): sync with develop
2014-05-06 19:51:36 +02:00
44688086ef
chore(i18n): update locales & add hebrew and czech
2014-05-06 19:51:36 +02:00
583e546ddf
fix(i18n): typo
2014-05-06 19:51:36 +02:00
30374eb9df
fix(i18n): typo
2014-05-06 19:51:36 +02:00
4083d62f16
chore(i18n): sync with develop
2014-05-06 19:51:36 +02:00
c503b61e33
fix(i18n): Iphone -> iPhone
2014-05-06 19:51:36 +02:00
a1c53ec2aa
fix(i18n): fix messages, pet and mount names and update locales
2014-05-06 19:51:36 +02:00
d077fe117a
fix(i18n): remove wizard
2014-05-06 19:51:36 +02:00
8060cac538
fix(i18n): missing strings
2014-05-06 19:51:36 +02:00
be27597f00
chore(i18n): update locales
2014-05-06 19:51:36 +02:00
17a221f475
chore(i18n): grunt and update locales
2014-05-06 19:51:35 +02:00
fcd33f32ee
fix(i18n): missing strings
2014-05-06 19:51:35 +02:00
fd1de129db
fix(i18n): missing strings
2014-05-06 19:51:35 +02:00
cde6a209f2
fix(i18n): end tour
2014-05-06 19:51:35 +02:00
b526489a18
fix(i18n): typo
2014-05-06 19:51:35 +02:00
17aaa13785
fix(i18n): rebase, fix and compile
2014-05-06 19:51:35 +02:00
a10ccc1228
chore(i18n): update locales
2014-05-06 19:51:34 +02:00
dc0a13ae34
refactor(i18n): add strings for features page
2014-05-06 19:51:34 +02:00
c897e08498
chore(i18n): update locales
2014-05-06 19:51:34 +02:00
edb194bbf0
fix(i18n): add new group name
2014-05-06 19:51:34 +02:00
a25e303bf7
fix(i18n)
2014-05-06 19:51:34 +02:00
34d731a5e6
chore(i18n): update locales
2014-05-06 19:51:34 +02:00
e1e6917db7
chore(i18n)
2014-05-06 19:51:34 +02:00
d97650de40
chore(i18n): update locales
2014-05-06 19:51:34 +02:00
c1a55d94b2
fix(i18n): better items strings
2014-05-06 19:51:34 +02:00
c57df7fbc4
fix(i18n): use right syntax and add a few strings
2014-05-06 19:51:33 +02:00
Tyler Renelle