Commit graph

778 commits

Author SHA1 Message Date
Sabe Jones
833ff90a59 chore(news): Wonderland Bailey 1 2014-12-21 15:41:32 -06:00
Sabe Jones
eadedd5897 Merge pull request #4383 from SabreCat/seasonal
Seasonal Shop Basics
2014-12-16 21:51:02 -06:00
Sabe Jones
dbe608bc3a fix(news): correct link and awkward image 2014-12-16 20:24:04 -06:00
Sabe Jones
58957118c0 chore(news): Bailey for Seasonal Shop 2014-12-16 20:18:55 -06:00
Blade Barringer
d56eb1eeeb Added last guild link, corrected hall links 2014-12-14 20:10:42 -06:00
Blade Barringer
63c2248b38 Corrected guild links 2014-12-14 20:07:46 -06:00
Sabe Jones
071ac02ec2 chore(git): Resolve merge conflict 2014-12-14 14:55:37 -06:00
Sabe Jones
867f50b514 fix(seasonal): Add menu item 2014-12-14 14:12:20 -06:00
Sabe Jones
8cd1ea48db fix(I18N): Remove more hardcoded text 2014-12-14 14:10:39 -06:00
Sabe Jones
6dcbd329a5 fix(seasonal): Typo in string resource 2014-12-14 14:05:43 -06:00
Sabe Jones
7988dfcf82 fix(seasonal): Corrections for Shop
Fix Jade indenting, add state control, add menu option
2014-12-14 14:01:25 -06:00
Sabe Jones
29f693cd24 fix(I18N): Remove hardcoded text 2014-12-14 13:55:40 -06:00
Sabe Jones
506c396baf fix(I18N): Translate TT in menu 2014-12-14 13:53:00 -06:00
Blade Barringer
396176f14f Quest completion screen floats to right on everything but xs 2014-12-14 08:32:05 -06:00
Blade Barringer
41e1f4c75f Conditionally allow completed quest image to be centered if no
completion text is present
2014-12-14 08:13:50 -06:00
thehindenburg
2db80c6841 changed to style sheet 2014-12-12 10:26:55 -08:00
thehindenburg
375253fb84 changing the reward text to clear the image 2014-12-12 09:38:13 -08:00
thehindenburg
d70de5972e added the image to the end screen and made adjustments to the line 2014-12-11 22:28:07 -08:00
Blade Barringer
7fb1e69927 Changed inbox text to use an env.t var 2014-12-10 10:47:05 -06:00
Sabe Jones
2d9d8fe209 chore(Bailey): Announce Penguin 2014-12-09 20:20:17 -06:00
Tyler Renelle
bd5f8d79ea fix(bailey): mystery 3014 promo 2014-12-03 19:24:42 -07:00
Tyler Renelle
d2e230db1f fix(plans): various bug fixes 2014-12-03 18:34:26 -07:00
Tyler Renelle
e1492809fd bailey(plans): Gifting Subscriptions And Gems, New Subscription
Benefits, Mysterious Time Travelers, Steampunk Item Sets, And Block Subscriptions
2014-12-03 16:31:38 -07:00
Tyler Renelle
0a53a5717e refactor(payments): move payments into it's own service, out of rootCtrl 2014-12-03 14:17:08 -07:00
Tyler Renelle
0fffd66588 feat(plans): time travelers tab, 1 trinket to buy 1 set 2014-12-03 14:17:08 -07:00
Tyler Renelle
5b01fff700 feat(gifts): allow gifting subscriptions 2014-12-03 14:17:07 -07:00
Tyler Renelle
e8dbd5ca1a feat(gifts): allow gifting gems from paypal/stripe 2014-12-03 14:17:07 -07:00
Tyler Renelle
7e9b92fcad feat(gifts): allow gifting from balance 2014-12-03 14:17:07 -07:00
Tyler Renelle
66b4dae0d9 feat(news): move old news to /static/old-news, better use of content space 2014-12-03 13:49:24 -07:00
benmanley
073b338bde fix(tasks): stop reward values overflowing
Fixes #1993

* Restyle reward cost area to fit three digit rewards into default view
* Apply custom styles to rewards with higher values to prevent them
from overflowing
2014-12-03 15:40:08 +00:00
Sabe Jones
3cf6e84451 chore(Bailey): Outage announcement 2014-12-01 21:05:36 -06:00
Sabe Jones
1713843067 fix(Bailey): correct date 2014-11-30 23:06:00 -06:00
Sabe Jones
452b459d69 chore(Bailey): Announce December 2014-11-30 23:03:08 -06:00
Sabe Jones
2ee6f0ed61 feat(Bailey): November subscription reminder 2014-11-30 11:50:31 -06:00
Blade Barringer
44baa822c8 Adjusted ng-hide so users cannot block themeselves 2014-11-30 10:50:39 -06:00
Tyler Renelle
3204418af1 Revert #4291
This reverts commit a1ea6869b7.
2014-11-29 09:16:44 -07:00
Tyler Renelle
e63f2b6d97 Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
Conflicts:
	database_reports/count_users_who_own_specified_gear.js
2014-11-29 08:33:28 -07:00
Blade Barringer
9a1b209da1 Corrected indentation error 2014-11-28 19:41:11 -06:00
Matteo Pagliazzi
607c72049c Merge pull request #4291 from sbreiler/develop
Fix #4259
2014-11-28 20:51:04 +01:00
Steffen Breiler
a1ea6869b7 Fix #4259 (always 100% long bars in IE11)
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
Fixes health, level and mana bar.
2014-11-27 22:47:52 +01:00
benmanley
50b1cba0a6 refactor(tasks) improve UI consistency
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
Sabe Jones
be3342cb26 feat(event): Thanksgiving Bailey 2014-11-26 19:34:16 -06:00
Matteo Pagliazzi
afbd2199e8 fix(datepicker): fixes #4273 2014-11-26 11:51:44 +01:00
Tyler Renelle
0f7f30aa12 bailey: private messages & november mysteries 2014-11-24 19:36:44 -07:00
Tyler Renelle
5f654c4dad fix(private-messages): move PM buttons to bottom-left of modal 2014-11-24 19:11:49 -07:00
Tyler Renelle
478cba9a5a feat(members): add options: $modal.open({size, windowClass}). Use those
to make avatar modal wider, and "100% window height" (see code, it's kinda hacky)
2014-11-24 18:59:27 -07:00
Blade Barringer
7ea8ff70ae Added additional env.t declarations for pm modal 2014-11-23 21:33:14 -06:00
Blade Barringer
d8c30fc885 Added env.t for member modal to allow for translations 2014-11-23 21:19:40 -06:00
Alice Harris
19fb81aafd Merge pull request #4248 from crookedneighbor/add-uuid-to-user-data-link
Added uuid parameter to data link
2014-11-22 12:08:51 +10:00
Tyler Renelle
ecef457d2b fix(private-messages): glyphicon-ban-circle (@Alys @crookedneighbor) 2014-11-21 10:40:57 -07:00