e0bfd60eb1
amazon payments: switch to green button
2015-07-15 20:07:17 +02:00
9ccab259b0
add message to Inventory/Market (drops) page to explain where quests have gone
2015-07-15 13:29:03 +10:00
0bc5db4885
Merge branch 'aedotj-patch-1' into develop
2015-07-14 21:10:05 -05:00
3437975ba3
Change order of quests
2015-07-14 19:44:55 -05:00
e5a740a74f
Adjust spacing
2015-07-14 19:32:45 -05:00
32a74471db
Merge branch 'sabrecat/quests-page' into develop
2015-07-14 18:56:32 -05:00
1adb3c479b
Merge branch 'blurbs' into develop
2015-07-14 18:21:37 -05:00
6cad2df6a3
test(quests): Add user.ops.buyQuest test
...
Also adds the Bailey announcement for the day and implements "locked" quest scrolls for the beginning quests in extant quest chains.
2015-07-14 17:34:01 -05:00
8f9fa7942a
fix(settings): use correct value for inactivity emails
2015-07-15 00:13:17 +02:00
1fe900db25
pets.jade: IE better support
...
It is currently impossible to see how fed a pet is in IE. The width of the .progress-bar-success is "{{user.items.pets["Wolf-Base"]/.5}}%".
Now, it works.
2015-07-14 22:58:24 +02:00
7ad2839f05
Adjust look of page blurbs
2015-07-14 08:18:02 -05:00
cdc54038ba
Remove bad file encoding
2015-07-14 07:56:53 -05:00
7e60864d41
Fixing color on blurbs
2015-07-14 07:46:57 -05:00
1789bf3c6a
Making suggests changes to issue 5513
2015-07-14 07:44:51 -05:00
a25296a855
adding more links to heroes blurb and links not included in json
2015-07-14 07:44:51 -05:00
65b7465081
adding blurbs to pages
2015-07-14 07:44:51 -05:00
b9f795529b
feat(quests): Dilatory Distress
...
Implements the "Dilatory Distress" quest chain, purchasable for Gold. Also adds four new items to the Enchanted Armoire.
2015-07-13 18:21:32 -05:00
87f5449267
Merge branch 'develop' into quests-fix-merge-coflicts
2015-07-13 08:20:52 -05:00
148e418c8a
Change file names to use hyphen syntax
2015-07-13 08:19:15 -05:00
fe5bbfadde
Remove credit
2015-07-12 14:35:08 -05:00
4e9c252367
Removed extraneous jade file
2015-07-12 14:27:53 -05:00
0b53da0798
Double-check seasonal shop jades
2015-07-12 14:24:18 -05:00
316c3e9c2e
Sort out conflicts from develop
2015-07-12 13:51:42 -05:00
6ac049cc71
Allow animal ears to be added to costume or equipped gear
2015-07-12 09:23:03 -05:00
92bfc66c67
fix a bug where if you had "Use Costume" ticked, any Battle Gear or Costume choice would be added to your costume, never to Battle Gear
2015-07-12 18:18:31 +10:00
87dddb178f
Merge branch 'duckspeaker-issue-5570-hall-of-heroes-table-resize' into develop
2015-07-11 16:53:09 -05:00
18ebbdac67
Remove extra class
2015-07-11 16:52:55 -05:00
c9ac32231d
Remove inventory again
2015-07-11 16:37:26 -05:00
4a9ea83d6b
Added whale quest back in, refactor
2015-07-11 16:35:16 -05:00
4acc0c03a8
Add in changes to equipment and seasonalshop
2015-07-11 16:16:29 -05:00
b71f68ef32
Merge branch 'develop' into equipment-refactor-merge-into-develop
2015-07-11 15:55:53 -05:00
74dee2727e
Remove out of date todo
2015-07-11 15:54:09 -05:00
dccc10aa4d
Refactor
2015-07-11 15:05:58 -05:00
eeae12b002
Refactore inventory pages
2015-07-11 13:50:30 -05:00
066206f41c
Refactored inventory into separate files
2015-07-11 13:13:00 -05:00
aabc50e992
surround tables in table-responsive class
2015-07-11 01:19:47 -04:00
48b520509c
fixes https://github.com/HabitRPG/habitrpg/issues/5555
2015-07-11 00:15:55 -05:00
3644d43f0a
Remove unnecessary duplication
2015-07-10 23:47:23 -05:00
cc00bd17b3
Don't show unneeded spaces between buttons in chat
...
Don't show spaces in front of a button in a chat message if button
itself is not shown
2015-07-10 20:47:24 +05:00
9367ff80b6
Use bootstrap table-responsive class instead of inline css.
2015-07-10 11:23:33 -04:00
b708095472
make sure hall of heroes table contents fit as table is resized
2015-07-10 00:23:07 -04:00
353dcff908
fix(Market): Sell whale eggs
2015-07-09 13:27:16 -05:00
c0d35dc472
WIP(quests): Quests page cont'd
...
Test fixes and addition of function for buying Quests with Gold
2015-07-08 17:43:08 -05:00
78d4989544
WIP(event): Summer Splash cont'd
...
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
2015-07-08 16:13:23 -05:00
d248b74569
fix(event): Splash visual tweaks
2015-07-01 14:21:37 -05:00
25dd82ffa0
feat(event): Summer Splash cont'd
...
Summer backgrounds, the Seafoam transformation item, and announcements for same.
2015-07-01 13:11:53 -05:00
851868296f
Merge branch 'Alys-guild-list-links-2015-06-28' into develop
2015-06-30 22:40:35 -05:00
a3f5f626a6
Put h3 and a on one line
2015-06-30 22:39:48 -05:00
ca36c5c632
Merge pull request #5531 from HabitRPG/paglias/amazon-payments
...
Amazon Payments Subscriptions
2015-07-01 01:40:27 +02:00
46a7591492
Merge branch 'release-june-30th-2015' into develop
2015-06-30 13:39:51 -05:00
Matteo Pagliazzi