5b610bfc5c
small fix for sanity
2013-11-27 22:48:48 -08:00
62aeb7087a
fixes #1936 . petCount was only being calculated for the current user, not for the profile being displayed. This data should probably be calculated in the model rather than in a controller
2013-11-27 21:22:15 -08:00
a196cc0586
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-27 15:59:02 +01:00
86f62ac2b2
fix for #1920 , again. this is very 'un-angular' but it *actually* works. the proper way to do this is make a directive for 'userlevel' or something and have that apply the proper styles
2013-11-26 14:56:24 -08:00
2b128f71f4
[ #1532 ] add better validation on preferences.dayStart, and a migration to
...
cleanup corrupt ones
2013-11-26 15:18:20 -07:00
860a084c69
fix for multiple guilds creation
2013-11-26 20:16:10 +01:00
c4e8de2ee0
fix language switching
2013-11-25 17:34:41 +01:00
e9467dc466
Merge pull request #1896 from Fandekasp/party_members_order
...
Party members order
2013-11-23 16:52:31 -08:00
1dfd3b8b05
remove code moved in previous commit
2013-11-23 17:45:03 +01:00
df5a436338
use countPets also for stats, fix #1898
2013-11-23 17:42:47 +01:00
b36a288f04
add sort by date joined option
2013-11-23 22:06:22 +11:00
dcd0e7e95b
add setting in Social→Party→Members
2013-11-23 21:59:58 +11:00
5579030d20
party.order set and cases added
2013-11-23 21:18:33 +11:00
be4691cf58
sort by level
2013-11-23 16:21:43 +11:00
e722a064c8
revert drop notification change
2013-11-22 20:11:35 +01:00
a8578602d7
fix drops not showing until refresh
2013-11-22 19:21:34 +01:00
8955fb5a39
typo
2013-11-20 21:44:20 +01:00
1a388fa994
fix #1803 , when getting a drop do not return whole user, @lefnire it is ok to change api return data or we need to annouce it before so that third parties can update their code?
2013-11-20 21:36:18 +01:00
4bedefbc57
use helpers.countPets on server, fix client side pet count
2013-11-20 18:48:48 +01:00
afc9b6f62b
chat highlights work properly when preceeded by spaces again
2013-11-20 06:46:07 -08:00
7c15f09e03
code logic to update preferences
2013-11-19 11:22:41 +11:00
557d65a626
do not count rare pets into pet counts & fix beast master achievement
2013-11-18 16:18:57 +01:00
6cc41c47c7
Work on standardizing terminology
2013-11-17 09:36:38 -06:00
b83eb0ee28
moment is exported as an helper by habitrpg-shared
2013-11-17 13:28:57 +01:00
34d5eda736
[ #1832 ] remove relative-date, use moment instead
2013-11-17 13:21:21 +01:00
55998085e3
fixed the issue with case insensitive highlighting highlighting short usernames
...
how this works:
* rather than throw an expensive regular expression at each chat message, we start by checking to see if the users name exists.
* then, by simple string manipulation we verify that the preceeding character before the alleged username is whitespace, the start of a line, or an '@' character.
* FINALLY, we verify the following character is a non-word character using a regular expression.
* then we cache the highlight status on the local `message` object, because for some reason, this function is called **every time a character is typed in the chatbox.** this seems like a hugh performance problem to me, need to see if there is a way to disable that or something
2013-11-16 09:24:01 -08:00
b9d3b3a1a7
admin: refresh contrib list when saving a member
2013-11-15 20:06:18 -08:00
b762ecba81
admin: add list of contributors. Add contributor.contributions, textarea for links of contributions for tracking. move all admin stuff to dedicated controller & routes
2013-11-15 19:27:23 -08:00
2b286ba889
[ #1821 ] [ #1723 ] fix pet counters (incl for member modals)
2013-11-15 17:51:00 -08:00
05334550b0
[ #1837 ] separate groups filter from "create new challenge"-available groups
2013-11-15 17:36:36 -08:00
3461d67995
challenges: include challenges that user created, or belongs to, even if
...
not in group anymore
2013-11-14 20:30:48 -08:00
4c3f04cc49
Merge branch 'mounts' into develop
...
Conflicts:
views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
c75bfaa4d9
remove $rootScope.translations, it should not be necessary, update readme
2013-11-14 14:16:46 +01:00
10e9c205e6
Merge branch 'translations' into develop
...
Conflicts:
locales/bg/app.json
locales/nl/app.json
2013-11-13 23:37:29 -08:00
aad8f80c9d
Merge pull request #1795 from Fandekasp/remove_website
...
remove broken website field from profile
2013-11-13 23:09:27 -08:00
153d1957a8
clean code from websites
...
Need review !
2013-11-14 15:20:35 +11:00
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
56b1684a45
Merge pull request #1798 from snicker/develop
...
Fixed issues with positioning of userlist
2013-11-12 20:16:42 -08:00
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
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
edcafcc3ce
Fixed issues with positioning of userlist
2013-11-12 07:41:26 -08:00
d797c21075
emit event when user is synced and update code to use it
2013-11-12 16:23:21 +01:00
5ddf54466c
can change language from setting
2013-11-12 16:13:35 +01:00
4980a2e6b5
remove groups websites
2013-11-12 22:25:40 +11:00
32a94871d2
Merge pull request #1796 from snicker/develop
...
Autocompletion of nicknames in chat
2013-11-12 00:17:29 -08:00
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
2978842d23
[ #1781 ] challenges: select-all / select-none buttons
2013-11-11 19:00:43 -08:00
bfbc907fa1
mounts: show when selectedFood by green-circle highlighting pets
2013-11-10 22:53:20 -08:00
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
543635dd37
mounts: change growth-points requirement to 50 (@lemoness)
2013-11-10 19:20:34 -08:00
Nick Gordon