96ebde3fa3
Update app.json
...
50%
2013-05-14 16:20:40 +03:00
8e80c08dfe
Update app.json
2013-05-14 14:24:47 +03:00
dd6e090a1b
Merge pull request #953 from cleave29/translations
...
Added German translation
2013-05-14 00:45:02 -07:00
36f391a828
Update app.json
2013-05-14 01:42:10 -06:00
5628287368
Merge pull request #951 from WielebnyB/translations
...
Added Polish Translation
2013-05-13 16:45:06 -07:00
bcbbe4799b
Update app.json
2013-05-14 01:23:49 +02:00
c7a68c5a2e
Update app.json
2013-05-14 00:33:42 +02:00
cdcdc11849
Update app.json
2013-05-14 00:14:28 +03:00
90fca5c98a
Remove translate middleware
2013-05-13 15:44:21 -04:00
017999d544
Merge
2013-05-13 15:42:39 -04:00
28adcc5b30
Merge pull request #948 from lancemanfv/translations
...
Translations
2013-05-13 12:36:17 -07:00
e98a9c7629
Update app.json
2013-05-13 21:07:13 +03:00
02d13c5ddd
Update app.json
2013-05-13 20:50:36 +03:00
c82e0651d1
Added other language folders with base json
2013-05-13 15:13:11 +01:00
cf68e9d2a7
Update app.json
2013-05-13 15:58:56 +02:00
f781f644ab
Incorporation of translation variables
...
@switz - can't seem to access a i18n translate function publically. =/
2013-05-12 19:28:53 +01:00
b11df0a755
Merge branch 'locale/nl' of github.com:jbnicolai/habitrpg into develop
2013-05-12 14:20:11 -04:00
27a3627fa0
Merge pull request #1 from xeross/locale/nl
...
Locale fixes/changes
2013-05-12 11:17:44 -07:00
ce6914f0c8
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-05-12 14:00:33 -04:00
445a968a9b
Merge
2013-05-12 13:58:50 -04:00
367c860ac8
syntax error on my part
2013-05-12 14:34:49 +01:00
ae0dfa9ffe
Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop
2013-05-12 13:33:40 +01:00
1079d060fc
Final app.json english.
2013-05-12 13:32:41 +01:00
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
a287160d3b
Changed Tavern message to be less threatening & simplier.
2013-05-12 12:41:00 +01:00
f28a542aa4
small cleanup
2013-05-12 12:40:06 +01:00
7986464132
Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop
2013-05-12 12:30:34 +01:00
912b716a28
fix the reroll buy-button bug
2013-05-12 12:29:00 +01:00
dcc4d0c93e
update Dailys => Dailies (we use dailys throughout the code so we can
...
easly switch between singular/plural, but for actual text we want Dailies)
2013-05-12 11:36:56 +01:00
4347ba52ba
overhaul tasks.html so we can start generalizing task-lists,
...
ground-work for challenges
2013-05-12 11:33:05 +01:00
f7145bb951
cleanup of the show-completed / show-remaining. That context-dependant
...
/ display-context-for stuff was bugging me out, and wasn't using Derby
to it's potential. also some tags & habit-wide cleanup in helpers:taskClasses()
2013-05-12 10:52:32 +01:00
a9d3348678
last of the tokens=>gems
2013-05-12 10:15:31 +01:00
2164e7322b
_partyMembers fetch as async to final 3-part subscription. test on
...
beta first
2013-05-12 00:56:02 +01:00
ca9d3bf2ed
small bailey about tokens => gems
2013-05-12 00:51:59 +01:00
e33eee4142
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-05-12 00:50:02 +01:00
d54afdcc3d
tavern: icon-eye-close instead of icon-glass (to signify resting)
2013-05-12 00:26:17 +01:00
8e7ab79098
Turn off locale set
2013-05-11 18:05:27 -04:00
0ca67bef95
wrap up some "token" => "gem" conversions, code-style
2013-05-11 19:19:09 +01:00
35342e8b71
Merge pull request #925 from SlappyBag/develop
...
Tokens = Gems for front-end display.
2013-05-11 10:43:45 -07:00
7131742524
update FAQ link
2013-05-11 15:29:27 +01:00
0421c2e61b
back to double _party - fetch then subscribe, separatated
...
subscriptions seem to be causing problems
2013-05-11 13:08:09 +01:00
e701d98bd7
make solo-user subscription a callback of unsubscribe
2013-05-11 12:32:36 +01:00
747b6e7930
BREAKING CHANGE - fetch _partyMembers, subscribe to _party, _user,
...
_tavern. Could cut back substantially on subscription overhead. fetch
is async to the subscriptions, need to test on beta that this is kosher
2013-05-11 12:13:48 +01:00
2fcf5632ef
add "resources" to tavern, n00000bs
2013-05-11 11:20:36 +01:00
e6cd061bfd
don't calculate dailies on cron when user is resting, this to prevent
...
abusing the inn. see https://trello.com/card/rest-in-tavern/50e5d3684fe3a7266b0036d6/14
2013-05-10 23:16:59 +01:00
fb29e35ffc
another attempted fix for chat dupes - model.unshift like usual,
...
callback checks for dupes and sets messages to unique. this way
minimizes the model.set() (which clobbers other chatters if you are the
duplicate bugger)
2013-05-10 19:20:53 +01:00
05de1364a8
apply active filters as tags to newly-created tasks
2013-05-10 18:35:14 +01:00
44bd61016f
tags: cleaner tag-deletion handling
2013-05-10 18:23:05 +01:00
eea9a2129f
tags: some corrupt-tags bug fixes
2013-05-10 18:06:35 +01:00
170213cd8e
Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop
2013-05-10 17:49:51 +01:00
sorko