Tyler Renelle
680f0e974e
mounts: bailey notif
2013-12-07 11:56:34 -07:00
Tyler Renelle
79e8b2f4a5
Revert "mounts: temporarily remove mounts code from views. merging to master so"
...
This reverts commit d245c87f29
2013-12-07 11:34:53 -07: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
Tyler Renelle
7c20988c41
Merge branch 'thanksgiving' into develop
2013-11-27 11:53:18 -07:00
Tyler Renelle
db5befb570
thanksgiving turkey & npcs
2013-11-27 11:50:18 -07:00
Tyler Renelle
962b854f87
Merge remote-tracking branch 'origin/sabe_tweak' into develop
...
Conflicts:
views/options/social/tavern.jade
2013-11-27 11:28:31 -07:00
Tyler Renelle
aca122d6de
fix up CONTRIBUTING.md, update "submit bugs" links with this change
2013-11-26 17:09:13 -07: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
Nick Gordon
a4fb0b42ad
well, this wasn't the fix i was thinking of for #1893 , but it works and I don't know why I didn't do it in the first place
2013-11-26 12:06:48 -08:00
Nick Gordon
15f3907f00
fix for #1920
2013-11-26 11:51:21 -08:00
Matteo Pagliazzi
d1240473dd
use bindonce for days of the week, thanks @snicker!
2013-11-25 17:38:07 +01:00
Matteo Pagliazzi
a47a32dbd6
translate days of the week, @snicker here I would like to use bo-text but does not work
2013-11-25 17:30:35 +01:00
Nick Gordon
c0a02eeef8
support for xml and json export of all user data
2013-11-25 08:06:27 -08:00
Sabe Jones
780b0a3593
Change Markdown help link to point at HabitRPG wiki
2013-11-24 13:13:21 -06: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
6736da36d4
use jade class syntax
2013-11-24 17:49:25 +01:00
Sabe Jones
f7908ddbcb
Correct and clarify some details on contributor rewards
2013-11-24 09:50:21 -06:00
Sabe Jones
c51a34730d
Tweak shop wording to remove "yet": eggs/potions/food might be used up or sold off.
2013-11-24 08:53:48 -06:00
Sabe Jones
9086ccffcd
Consistent formatting of markdown hint in group edit fields
2013-11-24 07:41:41 -06:00
Sabe Jones
2101fe255f
Place link to Markdown help prominently in Tavern chat ( fix #1906 )
2013-11-24 07:35:12 -06:00
Nick Gordon
aa91d21189
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-23 17:39:19 -08:00
Nick Gordon
38225896f4
fix for https://github.com/HabitRPG/habitrpg/issues/1860 change tags to scroll horizontally rather than stack floating left
2013-11-23 17:37:20 -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
Nick Gordon
b793d2b753
fix for https://github.com/HabitRPG/habitrpg/issues/1900
2013-11-23 16:45:14 -08:00
Adrien Lemaire
47cf0eb07d
add npc color, update leader background
2013-11-24 10:49:33 +11:00
Tyler Renelle
33c2c1db2d
Merge pull request #1888 from HabitRPG/sabe_tweak
...
Fix matters of colons
2013-11-23 14:45:45 -08:00
Tyler Renelle
c5a42cbf5a
Merge pull request #1899 from Fandekasp/header_colors
...
change avatars lvl colors
2013-11-23 13:12:36 -08:00
Nick Gordon
4453ac9fb8
removed comments from testing.
2013-11-23 11:14:16 -08:00
Nick Gordon
52145a479e
testing completed, committing test results in comments
2013-11-23 10:55:56 -08:00
Nick Gordon
40de2f3bf0
manual testing of bindonce commencing -____-
2013-11-23 09:26:39 -08:00
Matteo Pagliazzi
df5a436338
use countPets also for stats, fix #1898
2013-11-23 17:42:47 +01:00
Sabe Jones
0d6f3dd5e6
Make number format consistent between current exp and exp TNL ( fix #1827 )
2013-11-23 09:46:28 -06:00
Adrien Lemaire
d4b25fdc5f
change avatars lvl colors
2013-11-24 01:04:27 +11:00
Sabe Jones
983df5c97c
Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list.
2013-11-23 06:54:00 -06:00
Adrien Lemaire
dcd0e7e95b
add setting in Social→Party→Members
2013-11-23 21:59:58 +11:00
Nick Gordon
90582c3709
more bindonce rollbacks... bo-if seems to work sometimes, othertimes not
2013-11-22 22:57:41 -08:00
Nick Gordon
2a7adf7285
reverting more bindonce changes...
...
* challenges are not showing, this could be related to the bo-if directive being broken https://github.com/Pasvaz/bindonce/issues/29
* NPCs lost their color because bindonce seems to have a major issue on tags that are using both interpolation and the bo-class directives
2013-11-22 22:44:02 -08:00
Nick Gordon
f26cb2abf3
making it nicer to be in chat if someone decides to post spammy crap or huge images
2013-11-22 21:15:28 -08:00
Nick Gordon
dfb09b1f9b
Yeah, this didn't work with the achievements popup, because the same template is used for anyone's modal
2013-11-22 15:59:53 -08:00
Nick Gordon
b431336463
more optimizations with bindonce, replacing ngIf with boIf.
...
some of this was done with an axe rather than a fine brush, so there may be issues we need to be on the watch for.
2013-11-22 15:16:24 -08:00
Nick Gordon
0d19c0de21
Looked for opportunities to replace ngclass with boclass to improve performance, as well as replacing some instances of ng-if with bo-if
2013-11-22 14:40:44 -08: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
Nick Gordon
efe2ff5d70
super awesome mega-fix with unintended awesome collateral-fixes
...
* markdown supported in chat
* by proxy, paragraphs are *also* supported in chat now
* AND EVEN PROXIER, the issue with emoji not showing properly is fixed
2013-11-22 10:38:40 -08:00
Sabe Jones
e458b571dc
Move stat formulae to mouseover popup instead of inline
2013-11-21 20:37:55 -06:00
Tyler Renelle
44f33f7298
Merge pull request #1872 from bobbyroberts99/wikia
...
Add link to wikia Tags article when creating a new challenge
2013-11-20 13:14:21 -08:00
Bob Steffes
6b2a60330f
Add link to wikia Tags article when creating a new challenge
...
The ? icon now links to the wiki Tags article
2013-11-20 13:08:05 -08:00
Adrien Lemaire
e240a4404f
reorganize menus
2013-11-19 11:22:41 +11:00
Adrien Lemaire
7c15f09e03
code logic to update preferences
2013-11-19 11:22:41 +11:00
Adrien Lemaire
0ce0823de4
update ui to test hidable gears
2013-11-19 11:22:41 +11:00
Tyler Renelle
fc352ec2c4
[ #1732 ] temporarily allow restore-streak on challenge tasks
2013-11-17 22:23:22 -07:00
