Commit Graph

5324 Commits

Author SHA1 Message Date
tcsantini 8af0bf1c26 Starts Portuguese translation.
Not translating things like:
-RPG (Jogos de Interpretação de Personagem) - that would sound pretty weird.
-Health (Saúde) - usually it's called Sangue (blood), but since it may have some strong connotation (for kids), I left it as HP.
2013-05-23 00:17:36 -03:00
Tyler Renelle 77e37804e8 habitrpg-shared: bug fixes on hydrate() 2013-05-22 13:57:10 +01:00
Tyler Renelle 258cf55abb fix int() view helper (restore streak) 2013-05-22 11:30:17 +01:00
Tyler Renelle 1596808c25 move everything to lodash, since we're using it for other things
anyway (cloneDeep, findIndex, etc). make sure to return `true`
explicitly after all _.each functions! if you accidently return
false (happens more often than you'd think), it kills the loop. As a
result, I'm using .forEach() native function where i can for
simplicity, but many of our _.each iterate object keys
2013-05-22 11:29:24 +01:00
Tyler Renelle a31eb184a2 habitrpg-shared: don't forget the package req! 2013-05-22 11:27:16 +01:00
Tyler Renelle 5a25244096 Merge branch 'habitrpg-shared' into develop
Conflicts:
	src/app/helpers.coffee
	src/app/items.coffee
2013-05-22 11:13:27 +01:00
Tyler Renelle 598f2f6c46 habitrpg-shared: don't cloneDeep our user object for the time being. we can't access __proto__ objects as a result (see https://github.com/codeparty/racer/issues/116), the negative side-effect is this cause certain notifications not to show, because model.on() listeners can't tell the difference between $spec object properties & model.get() 2013-05-22 11:08:05 +01:00
Tyler Renelle 2230ce6688 habitpg-shared: move viewHelpers to misc, add hydrate() function (see https://github.com/codeparty/racer/issues/116) to prevent data-loss on user.get() 2013-05-22 00:40:54 +01:00
Tyler Renelle bc49e4668c only show restore-streak on dailies 2013-05-21 14:39:23 +01:00
Tyler Renelle ff2fedda48 add ability to restore lost streaks, also add int() view helper
function (pretty cool actually, https://groups.google.com/forum/?fromgroups#!topic/derbyjs/otFCLu2p7yY)
2013-05-21 14:33:31 +01:00
Tyler Renelle e21bc9869d Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-21 12:57:40 +01:00
Tyler Renelle cc097c32f7 clean up of preen_cron, which I'm re-enstating 2013-05-21 12:54:06 +01:00
Stan Lindsey 32c2605106 Update app.json 2013-05-21 11:28:40 +02:00
Stan Lindsey cca6fc6d0e Merge pull request #1009 from theyliveforever/translations
Spanish Translation
2013-05-21 02:25:57 -07:00
theyliveforever 25b4e057e7 Update app.json 2013-05-20 23:05:34 -03:00
Hjalmberi 17e4578eb3 Update app.json 2013-05-21 05:58:12 +04:00
Stan Lindsey 99985be20a Merge pull request #1005 from LazuliKazeno/patch-1
Some minor changes
2013-05-20 14:26:49 -07:00
Philip How b77a62e915 Merge pull request #1002 from MrConcept/master
Merge Master
2013-05-20 11:09:37 -07:00
Philip How 105087c823 Removes +4 Gems on Reset exploit 2013-05-20 19:52:37 +02:00
Tyler Renelle f412a20203 habitrpg-shared: cron bug-fixes 2013-05-20 10:56:38 +01:00
Tyler Renelle 5776bec545 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-20 10:28:49 +01:00
Tyler Renelle ed057799a3 put coin_single_[silver|gold].png back in (thought we weren't using
anymore, i was wrong)
2013-05-20 10:27:53 +01:00
Stan Lindsey 9c173e3a08 HP potion description clarify.
People getting confused about its use.
2013-05-20 11:08:04 +02:00
Slappybag d870325169 Margin on Buttons for #996 & 128eb8a 2013-05-20 09:59:36 +01:00
Tyler Renelle 83ac2adb79 habithabitrpg-shared: cron mostly working wiht habitrpg-shared https://github.com/HabitRPG/habitrpg-shared/commit/7805a2ba264f48f0ac80bce552bec4fefdf109e9 2013-05-20 01:15:33 +01:00
Tyler Renelle 0b445df909 habitrpg-shared: *almost* working wth new scoring (https://github.com/HabitRPG/habitrpg-shared/commit/c0cf9780fe8e17211d4749b9c3eb2a0fd389db64) - need to fix for cron, API, and other misc bugs 2013-05-19 23:50:41 +01:00
Tyler Renelle 128eb8adb7 tavern: add submit bug / feature buttons up top, fixes #996 2013-05-19 20:43:48 +01:00
Tyler Renelle 6a36f4bd1d habitrpg-shared: helpers now working https://github.com/HabitRPG/habitrpg-shared/commit/d42ac5d53ca077ebc746d8d0f48cc1f51e37ae63 2013-05-19 18:53:13 +01:00
Tyler Renelle 5d1368e794 habitrpg-shared: got items working (see https://github.com/HabitRPG/habitrpg-shared/commit/1feb209c2486ff3dd3ebb84dccd4f300d1c31ed6) 2013-05-19 18:01:50 +01:00
Tyler Renelle 6a6a75edda Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-19 15:02:50 +01:00
Tyler Renelle ae4c5723e0 chat: allow admins to remove other people's messages 2013-05-19 15:02:04 +01:00
Tyler Renelle 9b46805452 Merge pull request #989 from Shaners/develop
Bacon Bacon
2013-05-18 01:09:05 -07:00
Shane Lister 5cff970947 Bacon Bacon
Putting some bacon into the tavern NPC graphic. The people demand bacon.
2013-05-17 16:42:26 -07:00
Shane Lister 081b5be657 Merge pull request #17 from lefnire/develop
Update my Develop
2013-05-17 16:36:30 -07:00
Tyler Renelle e7558139e6 challenges: require challenge title, when user subscribe add new tag of challenge name. unsubscribe deletes tasks 2013-05-18 00:09:52 +01:00
Tyler Renelle 9b41712ca6 challenges: fix to not apply user's active tags to new challenge
tasks, but also not apply filters except to main user's list
2013-05-17 23:32:24 +01:00
Tyler Renelle 6507795d99 challenges: prevent some task options (such as scoring, check-marking,
tags, etc) for challenge edits
2013-05-17 20:59:29 +01:00
Tyler Renelle 0a291bf892 challenges: add challenge.id to task so we can get the icon-bullhorn 2013-05-17 14:06:27 +01:00
Tyler Renelle ae8a283d0e challenges: chevron in collapsing title 2013-05-17 14:06:27 +01:00
Tyler Renelle 57f51048a1 challenges: basics for challenge subscription 2013-05-17 14:06:27 +01:00
Tyler Renelle b8ef0789df challneges: semi-functional challenge creation for parties 2013-05-17 14:06:27 +01:00
Tyler Renelle 5ea6e55e11 challenges: add assignTo option on challenge-creation 2013-05-17 14:06:27 +01:00
Tyler Renelle d28edaf30d challenges: list taken dynamically from scope so we can push/unshift to various task lists depending on location of add-task form. be careful with this commit, not the {{}} instead of {} - seems to be required otherwise things get weird 2013-05-17 14:06:27 +01:00
Tyler Renelle 0a37637daf challenges: fix up lists to use new list templates 2013-05-17 14:06:26 +01:00
Tyler Renelle 836787906d bstart building challenges 2013-05-17 14:06:26 +01:00
LazuliKazeno 9abed29386 double quote missing
thanks Elektro121!
2013-05-17 14:15:17 +02:00
Tyler Renelle 92e8e5b597 done trying to futz with user-menu css for maintaining visibility when
header hidden. Instead, just put it elsewhere in html if header
hidden. fixes #981
2013-05-17 12:09:43 +01:00
LazuliKazeno 274f74e9bb Small changes 2013-05-17 14:05:10 +03:00
Tyler Renelle 4c0fe42d4e only hide header bits with preferences.hideHeader, fixes #979 2013-05-17 10:22:21 +01:00
Tyler Renelle a6973e9ae2 back to websockets 2013-05-17 09:58:37 +01:00