Commit Graph

5324 Commits

Author SHA1 Message Date
Tyler Renelle 1706c29df7 Merge remote-tracking branch 'blixhavn/master' into translations
Conflicts:
	locales/no/app.json
2013-11-13 15:10:03 -08:00
Tyler Renelle 7eb7669cce Merge pull request #1111 from Noeska/translations
Dutch Translations
2013-11-13 15:00:04 -08:00
Tyler Renelle 20bb49253d translations: temporarily swap locales_old/locales so we can merge all
the PRs (will put back to normal after)
2013-11-13 14:54:17 -08:00
Matteo Pagliazzi d85084c165 translations: add italian sample for testings & fix 2013-11-13 23:21:09 +01:00
Matteo Pagliazzi 47a1605460 merge missing strings from english at server start up 2013-11-13 23:13:00 +01:00
Tyler Renelle 827be92fa1 Merge pull request #1802 from snicker/develop
case-insensitive highlighting for usernames in chat
2013-11-13 13:35:37 -08:00
Matteo Pagliazzi 1b0bed0428 translations: add check 2013-11-13 22:04:31 +01:00
Matteo Pagliazzi 83d9368c2e translations: move some computations to server start-up, remove console.log, add translations to $rootScope, update readme, update user.preference.language if not set 2013-11-13 22:01:02 +01:00
Nick Gordon 528fd5f067 case-insensitive highlighting for usernames in chat 2013-11-13 06:57:48 -08:00
Tyler Renelle 1db0ae9f76 Merge pull request #1801 from snicker/develop
support for npc styling in autocomplete list to match messages
2013-11-12 22:03:54 -08:00
Nick Gordon 0ac1f4e397 support for npc styling in autocomplete list to match messages 2013-11-12 21:45:31 -08:00
Tyler Renelle 56b1684a45 Merge pull request #1798 from snicker/develop
Fixed issues with positioning of userlist
2013-11-12 20:16:42 -08:00
Nick Gordon 66c0840e76 a few fixes and performance increases:
* username autocompletes on click now instead of showing undefined
* an adjustable 'update interval' stops the huge performance hit by delaying events from firing until the user has stopped typing for a while
* nested controllers can cause issues because of prototypal inheritance if the models are not defined correctly... with ChatCtrl._chatMessage, this was the case. Modified it to fit in better with "best practices". See blog post here: http://jimhoskins.com/2012/12/14/nested-scopes-in-angularjs.html
2013-11-12 20:04:37 -08:00
Nick Gordon f2aaf88b1c forked the angular-at-directive code and made changes to support minification
perhaps this is something that should be absorbed into habitrpg-shared
2013-11-12 16:47:36 -08:00
Matteo Pagliazzi 72207ac1e2 readme updated with all the info, @lefnire translations are ready! everything that you need to know is in the readme 2013-11-12 22:24:45 +01:00
Matteo Pagliazzi 22267805ee add support for getting strings under clientSideStrings and update sample 2013-11-12 22:23:47 +01:00
Matteo Pagliazzi be2010b0a2 add sample app.json for new translations, send client side strings to the browser, send languages to the browser with a language name and code 2013-11-12 22:01:27 +01:00
Matteo Pagliazzi 7351697cbb moves locales to locales_old 2013-11-12 21:18:40 +01:00
Nicole Foster 2318243ebd Translated medium to above average, avatar heading, and website heading 2013-11-12 10:56:06 -05:00
Nick Gordon edcafcc3ce Fixed issues with positioning of userlist 2013-11-12 07:41:26 -08:00
Matteo Pagliazzi 8a2059ee2f typo 2013-11-12 16:24:22 +01:00
Matteo Pagliazzi d797c21075 emit event when user is synced and update code to use it 2013-11-12 16:23:21 +01:00
Matteo Pagliazzi 5ddf54466c can change language from setting 2013-11-12 16:13:35 +01:00
Matteo Pagliazzi 154a652726 middleware.locals back to a middleware, use user specified language if avalaible, list of avalaible languages avalaible in window.env 2013-11-12 15:57:46 +01:00
Matteo Pagliazzi 6e33b88c85 remove middleware.splash 2013-11-12 15:10:16 +01:00
Matteo Pagliazzi 7eaed0348f git merge Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into translations 2013-11-12 14:54:17 +01:00
Matteo Pagliazzi 1d9148eebb move middleware.locals only where it is needed and transform it into a common function, simplify translations and adds automatic language detection 2013-11-12 14:49:01 +01:00
Adrien Lemaire 4980a2e6b5 remove groups websites 2013-11-12 22:25:40 +11:00
Tyler Renelle 32a94871d2 Merge pull request #1796 from snicker/develop
Autocompletion of nicknames in chat
2013-11-12 00:17:29 -08:00
Nick Gordon cd693835ce Autocompletion of nicknames in chat works. this commit will require a npm install to fetch new packages 2013-11-11 22:32:52 -08:00
Adrien Lemaire 2e0d83a9cb remove broken website field from profile
Websites can be added with markdown in the blurb field
2013-11-12 17:31:10 +11:00
Adrien Lemaire 4a42aaba42 more translations done 2013-11-12 16:39:10 +11:00
Tyler Renelle 9a5af96ba1 [#1763] migration to restore NaN tasks.value to 0 2013-11-11 20:17:14 -08:00
Tyler Renelle ed8e749b11 Merge pull request #1778 from nafoster/develop
Added even spacing between limited edition skins and rainbow skins
2013-11-11 19:25:28 -08:00
Tyler Renelle 2978842d23 [#1781] challenges: select-all / select-none buttons 2013-11-11 19:00:43 -08:00
Tyler Renelle dda3670d03 mounts: only show mount head in stable (fix later), use egg.mountText
for grown mount popovers. replace pet/mount tooltips with popovers
2013-11-11 13:50:11 -08:00
Matteo Pagliazzi b6adc8e1d8 translations try 2013-11-11 22:30:38 +01:00
Matteo Pagliazzi cb36881edd minimal translations 2013-11-11 22:22:25 +01:00
Matteo Pagliazzi 687ed0978a fix some json and rename a file to match the locales/lang/app.json format 2013-11-11 22:11:17 +01:00
Matteo Pagliazzi 363ade1c4c update readme with notice about translations 2013-11-11 21:44:59 +01:00
Matteo Pagliazzi d0b35cf067 solve conflicts 2013-11-11 21:36:59 +01:00
Matteo Pagliazzi de7ae2203f remove old files 2013-11-11 21:21:19 +01:00
Matteo Pagliazzi a1f9bf60fb try 2013-11-11 21:20:12 +01:00
Tyler Renelle 86f47cb6f1 halloween: remove "last day" bailey notif 2013-11-11 08:30:51 -08:00
Tyler Renelle 42534b5233 [#1792] put purchased limited skins back on avatar tab 2013-11-11 08:21:29 -08:00
Tyler Renelle cde96bf28b halloween: take down halloween skins 2013-11-11 00:27:20 -08:00
Tyler Renelle 72f64fa85c [#1751] /challenges/:cid/:mid task filtering by "in this challenge" at
application level, not Mongo. $elemMatch doesn't support returning
multiple items, see http://goo.gl/MxmWdQ & http://goo.gl/Iku44w
2013-11-10 23:41:42 -08:00
Tyler Renelle bfbc907fa1 mounts: show when selectedFood by green-circle highlighting pets 2013-11-10 22:53:20 -08:00
Tyler Renelle e990850b01 mounts: new saddle logic. saddles don't drop, can only purchase for
5G. Saddle instantly raises pet=>mount (full 50pts). Saddles no longer
required as "finisher" item. (@lemoness)
2013-11-10 20:23:14 -08:00
Tyler Renelle e6f524fce2 mounts: much cleaner inventory interface. Replace text (underneath) with
gem cost. Use popover instead of tooltip, show item.text & item.notes
for more details than before (especially useful for saddle). Screenshot: http://goo.gl/0AfLfG
2013-11-10 20:03:54 -08:00