4a37bec652
fix(pr): indentation and simplify
2014-12-29 21:21:54 +01:00
752161b284
Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat
2014-12-29 21:09:04 +01:00
1a4455550d
Remove duplicate equipment-tab classes
2014-12-27 17:49:58 -08:00
a082e88b5d
Filter Array only once and one time binding - closes #4429
2014-12-27 23:26:30 +01:00
72d4bf2bf5
Merge pull request #4423 from andyzinsser/fix-no-food-text-color
...
Add muted class when no food is in inventory
2014-12-26 20:47:15 -06:00
db6f52e4b5
Add muted class when no food is in inventory
2014-12-26 18:31:21 -08:00
af7e68259d
Merge pull request #4404 from sbreiler/develop
...
Fix #4296 (Subscription "Update Card" message is cut off)
2014-12-27 12:29:04 +10:00
7297429888
Make it possible to choose between MM/dd and dd/MM date format
2014-12-26 15:52:42 -05:00
f5a0bd6903
Added trasnparent class to seasonal items already owned
2014-12-25 21:32:07 -06:00
1b4843ff58
fix(event): Better quest text placement
2014-12-25 17:42:09 -06:00
f4c582eb24
fix(event): quest syntax
2014-12-25 17:40:49 -06:00
597793e3ca
feat(event): Quests and Bailey
2014-12-25 17:36:16 -06:00
1c90886548
fix(event): Better shop flow
2014-12-25 15:52:26 -06:00
0e28f04c90
feat(event): Implement Seasonal Shop
2014-12-25 14:33:11 -06:00
e1eaefa943
Fix #4296 (Subscription "Update Card" message is cut off)
2014-12-24 00:14:08 +01:00
84db289957
Merge branch 'develop' into add-flag-to-chat
2014-12-23 10:07:42 -06:00
bb89a10356
feat(event): Wintery Hair Colors
2014-12-21 13:58:47 -06:00
1675bb26b2
change link in gala page to gala wiki
2014-12-19 07:47:28 -08:00
7f10049b37
Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
...
Conflicts:
views/options/social/chat-message.jade
2014-12-18 21:55:50 -06:00
8ff0a4a4a4
fix(seasonal): Leslie link
2014-12-17 18:27:37 -06:00
eadedd5897
Merge pull request #4383 from SabreCat/seasonal
...
Seasonal Shop Basics
2014-12-16 21:51:02 -06:00
2822ce233f
fix(inn): see https://github.com/HabitRPG/habitrpg-shared/pull/231
2014-12-16 14:17:38 -07:00
d56eb1eeeb
Added last guild link, corrected hall links
2014-12-14 20:10:42 -06:00
63c2248b38
Corrected guild links
2014-12-14 20:07:46 -06:00
9f46e14cd6
fix(seasonal): missing bang
2014-12-14 14:18:57 -06:00
7988dfcf82
fix(seasonal): Corrections for Shop
...
Fix Jade indenting, add state control, add menu option
2014-12-14 14:01:25 -06:00
a98a685971
feat(seasonal): Seasonal Shop
...
Initial commit of frontend for Seasonal Shop feature.
2014-12-14 13:37:32 -06:00
35b02cfdd8
fix(I18N): Make Time Travel translatable
2014-12-14 12:59:45 -06:00
c287441cd9
Merge pull request #4378 from SabreCat/purchases
...
Hide "2/locked" as appropriate
2014-12-14 12:42:11 -06:00
dde3f5ffef
Adjusted tooltip wrapping so it would only affect long titles
2014-12-14 12:18:59 -06:00
e4df3435e1
fix(avatar): Correct "Facial Hair" text
...
Adjusts the text style of "Facial Hair" header in Avatar shop to follow the same scheme as Hair. Before, the text was less header-like than elements under it.
2014-12-13 16:07:58 -06:00
4ded747b88
fix(purchases): Correct hair path
...
Fixes https://github.com/HabitRPG/habitrpg/issues/4312 .
2014-12-13 15:53:39 -06:00
4adf95feb6
fix(purchases): Hide "2/locked" as appropriate
2014-12-13 12:05:17 -06:00
e1ea1a24c8
feat(challenges): optional checkbox on group create/edit:
...
restrict challenge-creation to leader. Commented-out code for similar
setup for member invites, shouldn't be hard
2014-12-12 11:37:00 -07:00
dff7a74135
Made flag number more helpful
2014-12-11 21:47:06 -06:00
a0a4378465
Admin can see flag on own message
2014-12-11 21:44:58 -06:00
3c2319b63c
Made it impossible to flag own message in inbox
2014-12-11 21:42:39 -06:00
c67da1804a
Changed transparent class for admin to only appear if it is hidden
2014-12-11 21:40:25 -06:00
6b8280ccbb
Adjusted spacing of chat buttons
2014-12-11 17:41:54 -06:00
f9c00003f3
Moved ng-class so it would update transparent class in real time after flaggging
2014-12-11 13:38:57 -06:00
db1f24e7b4
Added note about how many flags a message has
2014-12-11 13:12:50 -06:00
c8c64a1b81
Allow admin to see messages that have been flagged more than twice, but
...
make them semi-transparent
2014-12-11 13:09:00 -06:00
1fb73b35ab
Always show message if admin
2014-12-11 13:05:48 -06:00
4718641d3e
Hide message if flag count is 2 or higher
2014-12-11 13:01:50 -06:00
d24f6ad1ac
Converted sent transparency to ng-class instead of style
2014-12-11 12:45:25 -06:00
564677340c
User can only flag message after accepting community guidelines
2014-12-11 10:29:12 -06:00
0cf7bba822
Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
2014-12-11 10:21:19 -06:00
e79126bf59
Merge pull request #4372 from thehindenburg/optoutspace
...
added space in Jade to the arrow and opt out text in the inbox
2014-12-10 15:51:38 -06:00
799934c31b
added space in Jade to the arrow and opt out text in the inbox
2014-12-10 12:31:09 -08:00
7fb1e69927
Changed inbox text to use an env.t var
2014-12-10 10:47:05 -06:00
Matteo Pagliazzi