Commit Graph

18018 Commits

Author SHA1 Message Date
Tyler Renelle 02215aeda0 Merge branch 'master' of github.com:lefnire/habitrpg 2013-05-14 18:10:47 +01:00
Tyler Renelle 0a0cf1d94e cron: fix repeat, for old users without default task.repeat={} 2013-05-14 18:10:24 +01:00
Tyler Renelle 5d421bdbd4 Merge pull request #962 from Celtis/patch-1
Minor grammatical fix
2013-05-14 10:05:44 -07:00
Celtis 0b8960470a Minor grammatical fix 2013-05-14 18:51:38 +02:00
Tyler Renelle 92b178b4a4 huge cron fixes which should solve streak, dayStart, "timezone" issues 2013-05-14 17:39:42 +01:00
Stan Lindsey ed0bbb782e Merge pull request #960 from LazuliKazeno/translations
French translation complete
2013-05-14 08:37:41 -07:00
Stan Lindsey 42056e6ed3 Merge pull request #955 from sorko/translations
Updated some Russian n Ukrainian Translations
2013-05-14 08:35:31 -07:00
Tyler Renelle 2c7492709c tags: make tag-selection checkboxes for now, peopel aren't
understanding combobox
2013-05-14 16:07:37 +01:00
sorko 96ebde3fa3 Update app.json
50%
2013-05-14 16:20:40 +03:00
LazuliKazeno 7f1527ed01 End of french translation 2013-05-14 14:17:55 +02:00
w13 213c2cbf51 Partially translated into Urdu language
This is a right-to-left language so I want to make sure it is properly supported first before translating more!
2013-05-14 18:36:56 +07:00
sorko 8e80c08dfe Update app.json 2013-05-14 14:24:47 +03:00
w13 71389c0b22 Partially translated to Urdu 2013-05-14 18:21:56 +07:00
w13 643606360f Partially translated to Urdu. 2013-05-14 18:13:21 +07:00
Daniel Saewitz dd6e090a1b Merge pull request #953 from cleave29/translations
Added German translation
2013-05-14 00:45:02 -07:00
cleave29 36f391a828 Update app.json 2013-05-14 01:42:10 -06:00
Daniel Saewitz 5628287368 Merge pull request #951 from WielebnyB/translations
Added Polish Translation
2013-05-13 16:45:06 -07:00
WielebnyB bcbbe4799b Update app.json 2013-05-14 01:23:49 +02:00
Tyler Renelle 4d5b87351f misspelled matt boch 2013-05-14 00:07:40 +01:00
WielebnyB c7a68c5a2e Update app.json 2013-05-14 00:33:42 +02:00
Tyler Renelle a8f9cc972f fix up stables / matt for smaller screens 2013-05-13 23:17:54 +01:00
WielebnyB cdcdc11849 Update app.json 2013-05-14 00:14:28 +03:00
Tyler Renelle 4a23ad4856 Merge branch 'develop'
Conflicts:
	locales/en/app.json
2013-05-13 21:31:18 +01:00
Tyler Renelle be08568c3b npcs: matt stable-master in the the pets tab (bravo @Shaners!). also
include link to the pets spritesheet, and some info on mounts
2013-05-13 21:29:27 +01:00
LazuliKazeno 35fe5dc68d Begin the french translation
From beginning to stable/tavern (i'm not convinced with my translation of "stable" yet)
2013-05-13 23:14:48 +03:00
Daniel Saewitz 90fca5c98a Remove translate middleware 2013-05-13 15:44:21 -04:00
Daniel Saewitz 017999d544 Merge 2013-05-13 15:42:39 -04:00
Daniel Saewitz 28adcc5b30 Merge pull request #948 from lancemanfv/translations
Translations
2013-05-13 12:36:17 -07:00
lancemanfv e98a9c7629 Update app.json 2013-05-13 21:07:13 +03:00
lancemanfv 02d13c5ddd Update app.json 2013-05-13 20:50:36 +03:00
Stan Lindsey c82e0651d1 Added other language folders with base json 2013-05-13 15:13:11 +01:00
Stan Lindsey cf68e9d2a7 Update app.json 2013-05-13 15:58:56 +02:00
Tyler Renelle dc7f80ceb9 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-13 11:02:20 +01:00
Daniel Saewitz d6b312eb13 Fix borked translations 2013-05-12 15:18:16 -04:00
Stan Lindsey 26e3a7d83c Additional Keys 2013-05-12 20:44:27 +02:00
Stan Lindsey 7c62c523b4 Additional Keys 2013-05-12 20:43:28 +02:00
Slappybag f781f644ab Incorporation of translation variables
@switz - can't seem to access a i18n translate function publically. =/
2013-05-12 19:28:53 +01:00
Daniel Saewitz b11df0a755 Merge branch 'locale/nl' of github.com:jbnicolai/habitrpg into develop 2013-05-12 14:20:11 -04:00
Joshua Boy Nicolai 27a3627fa0 Merge pull request #1 from xeross/locale/nl
Locale fixes/changes
2013-05-12 11:17:44 -07:00
Daniel Saewitz ce6914f0c8 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-12 14:00:33 -04:00
Daniel Saewitz 445a968a9b Merge 2013-05-12 13:58:50 -04:00
Tyler Renelle b162a43545 module.exports growl notifications so other files can use it 2013-05-12 16:47:31 +01:00
Slappybag 367c860ac8 syntax error on my part 2013-05-12 14:34:49 +01:00
Slappybag ae0dfa9ffe Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-05-12 13:33:40 +01:00
Slappybag 1079d060fc Final app.json english. 2013-05-12 13:32:41 +01:00
Tyler Renelle bb1ea755f1 tasks / rewards.html - pass in the actual list, and whether booleans
@editable and @main, which will allow for challenges lists & mngr
accounts / public lists
2013-05-12 13:12:13 +01:00
Slappybag a287160d3b Changed Tavern message to be less threatening & simplier. 2013-05-12 12:41:00 +01:00
Tyler Renelle f28a542aa4 small cleanup 2013-05-12 12:40:06 +01:00
Slappybag 7986464132 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-05-12 12:30:34 +01:00
Tyler Renelle 912b716a28 fix the reroll buy-button bug 2013-05-12 12:29:00 +01:00