Tyler Renelle
ad0c953d0a
classes: misc spell-casting fixes, support party spells
2013-12-05 11:05:47 -07:00
Tyler Renelle
dde0655900
classes: fixes to class-selection & reroll, remove show/hide gear since
...
we're using costumes
2013-12-04 23:53:55 -07:00
Tyler Renelle
62d50a1f4d
classes: fixes to buying items
2013-12-04 23:10:14 -07:00
Tyler Renelle
5fea978e6b
costumes: add costume support in inventory
2013-12-04 22:50:20 -07:00
Tyler Renelle
88c64a6f80
classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9
2013-12-04 16:52:06 -07:00
Tyler Renelle
19b6eb73e0
Merge branch 'develop' into classes
...
Conflicts:
public/css/index.styl
src/models/user.js
views/options/profile.jade
views/shared/header/avatar.jade
views/shared/tasks/lists.jade
views/shared/tasks/task.jade
2013-12-02 18:24:33 -07:00
Tyler Renelle
91c141140d
classes: armory WIP
2013-11-30 16:33:21 -07:00
Nick Gordon
5b610bfc5c
small fix for sanity
2013-11-27 22:48:48 -08:00
Nick Gordon
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
Nick Gordon
1d03fee4e3
change reference to images directory for emoji, fixes #1935
2013-11-27 20:46:18 -08:00
Matteo Pagliazzi
a196cc0586
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-27 15:59:02 +01:00
Nick Gordon
13a7292377
emoji works, huzzah. addresses #681 , #1840 , and some discussion in #1908
2013-11-26 21:49:53 -08:00
Nick Gordon
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
Tyler Renelle
2b128f71f4
[ #1532 ] add better validation on preferences.dayStart, and a migration to
...
cleanup corrupt ones
2013-11-26 15:18:20 -07:00
Matteo Pagliazzi
860a084c69
fix for multiple guilds creation
2013-11-26 20:16:10 +01:00
Matteo Pagliazzi
c4e8de2ee0
fix language switching
2013-11-25 17:34:41 +01:00
Matteo Pagliazzi
2e8fc8d248
use script tag not eval to execute moment language code
2013-11-25 17:04:07 +01:00
Matteo Pagliazzi
d1698460e0
add momentjs translations, @lefnire this is a little cumbersome, the language is set server-side & momentjs languages are js functions so we can either load another javascript file in the browser or we can load the file content in window.env and execute it with eval which is what is used now. If you do not like this then feel free to revert the commit. It is useful for example for chat messages date and I will also add it to the repeat schedule so that we it is localized too
2013-11-24 21:45:24 +01:00
Nick Gordon
f4323ddc24
markdown links in chat will now open in a blank window.
...
* added `target` attribute for the markdown directive to specify. default behavior is `_self`.
2013-11-24 10:32:51 -08:00
Matteo Pagliazzi
fa2fb8e3fb
open named links in new window, @snicker this will not work for links auto detected by marked, we should override this piece of code https://github.com/chjj/marked/blob/master/lib/marked.js#L578 but i am not sure it is possible to do without overriding the whole function
2013-11-24 17:49:12 +01:00
Nick Gordon
0e7c7e439f
images shown with markdown now link to themselves in an external browser window
2013-11-23 19:33:41 -08:00
Tyler Renelle
e9467dc466
Merge pull request #1896 from Fandekasp/party_members_order
...
Party members order
2013-11-23 16:52:31 -08:00
Tyler Renelle
83e3a6aff2
classes WIP
2013-11-23 16:59:41 -07:00
Matteo Pagliazzi
1dfd3b8b05
remove code moved in previous commit
2013-11-23 17:45:03 +01:00
Matteo Pagliazzi
df5a436338
use countPets also for stats, fix #1898
2013-11-23 17:42:47 +01:00
Adrien Lemaire
b36a288f04
add sort by date joined option
2013-11-23 22:06:22 +11:00
Adrien Lemaire
dcd0e7e95b
add setting in Social→Party→Members
2013-11-23 21:59:58 +11:00
Adrien Lemaire
5579030d20
party.order set and cases added
2013-11-23 21:18:33 +11:00
Adrien Lemaire
be4691cf58
sort by level
2013-11-23 16:21:43 +11:00
Nick Gordon
2350e3d359
initial load of bindonce, implementation for chat. performance has improved noticibly, but I think we need to do this in a few other places
2013-11-22 14:23:47 -08:00
Matteo Pagliazzi
e722a064c8
revert drop notification change
2013-11-22 20:11:35 +01:00
Matteo Pagliazzi
a8578602d7
fix drops not showing until refresh
2013-11-22 19:21:34 +01:00
Matteo Pagliazzi
8955fb5a39
typo
2013-11-20 21:44:20 +01:00
Matteo Pagliazzi
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
Matteo Pagliazzi
4bedefbc57
use helpers.countPets on server, fix client side pet count
2013-11-20 18:48:48 +01:00
Nick Gordon
afc9b6f62b
chat highlights work properly when preceeded by spaces again
2013-11-20 06:46:07 -08:00
Adrien Lemaire
7c15f09e03
code logic to update preferences
2013-11-19 11:22:41 +11:00
Matteo Pagliazzi
557d65a626
do not count rare pets into pet counts & fix beast master achievement
2013-11-18 16:18:57 +01:00
Tyler Renelle
a262828e09
Merge pull request #1847 from HabitRPG/sabe_tweak_3
...
Work on standardizing terminology
2013-11-17 12:22:40 -08:00
Matteo Pagliazzi
a81e77f0ff
update chat messages timestamp
2013-11-17 20:52:39 +01:00
Sabe Jones
6cc41c47c7
Work on standardizing terminology
2013-11-17 09:36:38 -06:00
Matteo Pagliazzi
b83eb0ee28
moment is exported as an helper by habitrpg-shared
2013-11-17 13:28:57 +01:00
Matteo Pagliazzi
34d5eda736
[ #1832 ] remove relative-date, use moment instead
2013-11-17 13:21:21 +01:00
Nick Gordon
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
Tyler Renelle
b9d3b3a1a7
admin: refresh contrib list when saving a member
2013-11-15 20:06:18 -08:00
Tyler Renelle
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
Tyler Renelle
2b286ba889
[ #1821 ] [ #1723 ] fix pet counters (incl for member modals)
2013-11-15 17:51:00 -08:00
Tyler Renelle
05334550b0
[ #1837 ] separate groups filter from "create new challenge"-available groups
2013-11-15 17:36:36 -08:00
Nick Gordon
5116a99dce
moved UI stuff into the settings area, moved authWithSession to the Auth controller
2013-11-15 16:25:09 -08:00
Nick Gordon
b958103447
Merge branch 'develop' of https://github.com/snicker/habitrpg into develop
2013-11-15 06:20:37 -08:00
