Matteo Pagliazzi
0c40d44de7
remove clientSideStrings part, stringNotFound added to locales/en/app.json, should be added to other languages, readme updated, $rootscope.translations removed
2013-11-14 14:41:42 +01:00
Matteo Pagliazzi
c75bfaa4d9
remove $rootScope.translations, it should not be necessary, update readme
2013-11-14 14:16:46 +01:00
Tyler Renelle
10e9c205e6
Merge branch 'translations' into develop
...
Conflicts:
locales/bg/app.json
locales/nl/app.json
2013-11-13 23:37:29 -08:00
Tyler Renelle
aad8f80c9d
Merge pull request #1795 from Fandekasp/remove_website
...
remove broken website field from profile
2013-11-13 23:09:27 -08:00
Adrien Lemaire
153d1957a8
clean code from websites
...
Need review !
2013-11-14 15:20:35 +11: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
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
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
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
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
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
Nicole Foster
95031fb6ee
Even space between limited edition skins and rainbow skins
2013-11-09 15:25:31 -05:00
Matteo Pagliazzi
daf33f9174
remove console.log
2013-11-08 22:37:40 +01:00
Matteo Pagliazzi
9f326e7433
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-08 22:34:28 +01:00
Matteo Pagliazzi
3a332c4c45
port beastMaster achievement, @lefnire shown client side but not set, using user.pre("save") for setting
2013-11-08 22:33:48 +01:00
Tyler Renelle
4b35551afc
confirm "trigger new day"
2013-11-08 09:18:03 -08:00
Matteo Pagliazzi
02651d52a4
solve conflict
2013-11-08 17:05:03 +01:00
Matteo Pagliazzi
a78297f129
update chat if necessary after new message posted or deleted
2013-11-08 17:03:10 +01:00
Tyler Renelle
06d1f77ce5
contribu: cleanup tavern, add legend for contrib tiers
2013-11-07 17:25:58 -08:00
Tyler Renelle
962cf9a3be
contrib: add name-tag colors based on contributor level
2013-11-07 12:23:12 -08:00
Tyler Renelle
d679fa1e62
contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor
2013-11-06 15:59:56 -08:00
Matteo Pagliazzi
3b18c322bc
return whole group.chat after chat message is sent
2013-11-06 21:27:24 +01:00
Matteo Pagliazzi
36e45a36a2
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-06 20:33:10 +01:00
Matteo Pagliazzi
a4951e151c
use $resource class methods to avoid sending whole model to server & reduce some responses
2013-11-06 20:31:39 +01:00
Matteo Pagliazzi
21509047bb
ops, jquery.cookie is used by bootstrap-tour!
2013-11-06 20:12:58 +01:00
Tyler Renelle
22b70b9a0a
add message about clearing completed todos if length>100
2013-11-05 18:40:23 -08:00
Tyler Renelle
188db745fc
allow users to trigger "missed day" manually from Restore modal
2013-11-05 17:43:43 -08:00
Matteo Pagliazzi
d0c29eba78
move js & css files to public/manifest.json, allow for stylus files editing without restarting server on development, removed hashres from dev build
2013-11-04 22:13:03 +01:00
Matteo Pagliazzi
63b4e5152e
better fix #1740
2013-11-04 15:21:05 +01:00
Matteo Pagliazzi
774ded9fb2
fix #1740
2013-11-04 15:17:09 +01:00
Tyler Renelle
4f52c7e15d
[ #1722 ] have to click twice for options.profile.profile
2013-11-04 00:41:16 -08:00
Tyler Renelle
de05d7dfda
[ #1735 ] fix to 6f6df94
2013-11-03 18:00:26 -08:00
Tyler Renelle
6f6df94ce7
[ #1735 ] save timezone to userobj in browser as well as sending to server,
...
so we don't hit an infinite loop
2013-11-03 17:47:38 -08:00
Tyler Renelle
557ce59c71
back to non-halloween NPCs
2013-11-03 17:44:46 -08:00
Matteo Pagliazzi
33c78c7168
more fixes for guild leaving
2013-11-03 12:12:43 +01:00
Matteo Pagliazzi
126fd55ec6
update guild member count
2013-11-03 12:00:57 +01:00
Matteo Pagliazzi
06f6dc0a43
better guild join/leave
2013-11-03 11:58:42 +01:00
Tyler Renelle
646a5c942b
[ #1716 #1705 ] working modal for challenge.participants.stats! also don't
...
scroll to top of page. We'll want to test that this doesn't break
anything else in the app, @paglias looks like the guys on that thread
felt pretty dirty about this workaround for some reason
2013-11-02 16:07:12 -07:00
Matteo Pagliazzi
d024470abe
update gem count after guild creation
2013-11-02 10:04:31 +01:00
Matteo Pagliazzi
b08a30a76b
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-02 09:54:44 +01:00
Matteo Pagliazzi
5a103db716
upgrade lodash to 2.2.1
2013-11-02 09:52:48 +01:00
Tyler Renelle
08498e37ac
[ #1718 ] don't 404 for group not found
2013-11-02 01:38:51 -07:00
Matteo Pagliazzi
898adfdc13
fix when leaving public guild
2013-11-02 09:34:56 +01:00
