Commit Graph

323 Commits

Author SHA1 Message Date
hairlessbear 6525cd6f8c Revert "First shot at modifying stats.jade attribute table to use ng-repeat"
This reverts commit 0d6bc403d0.
2015-07-18 16:00:03 -05:00
hairlessbear d8f74e5d9f First shot at modifying stats.jade attribute table to use ng-repeat 2015-07-18 16:00:03 -05:00
Matteo Pagliazzi 86eaff7cb0 fix(i18n): string for amazon payments 2015-07-17 15:28:55 +02:00
Sabe Jones 73a1c7c596 fix(style): Remove extra class 2015-07-16 11:29:04 -05:00
Sabe Jones e25819f6de feat(party): Conclude invite experiment 2015-07-16 11:22:19 -05:00
Matteo Pagliazzi 695c793f6e Merge pull request #5632 from HabitRPG/paglias/amazon-payments
Amazon Payments: implement one time purchases
2015-07-16 13:24:42 +02:00
Sabe Jones c15f2b1f80 Merge branch 'sabrecat/quests-page' into develop 2015-07-15 14:12:05 -05:00
Sabe Jones 4a54363966 fix(quests): Show info modal for Gold quests 2015-07-15 14:02:49 -05:00
Matteo Pagliazzi e0bfd60eb1 amazon payments: switch to green button 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi ecc98411c7 refactor amazon payments and add one time purchases once again 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi de32461787 feat(amazon-payments): WIP add donations 2015-07-15 20:07:17 +02:00
Sabe Jones 32a74471db Merge branch 'sabrecat/quests-page' into develop 2015-07-14 18:56:32 -05:00
Sabe Jones 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
Blade Barringer 60e92805dd Remove unneeded comment 2015-07-13 08:36:01 -05:00
Blade Barringer 316c3e9c2e Sort out conflicts from develop 2015-07-12 13:51:42 -05:00
Alys ef496525a1 change white "Report" button to red "Report Violation" button in chat message flag modal 2015-07-11 21:23:39 +10:00
Blade Barringer 305414e152 Merge pull request #5553 from Lokeh/Lokeh/maxHealth
maxHealth refactor
2015-07-11 00:18:15 -05:00
Blade Barringer c941511d11 Merge branch 'barbourkd-develop' into develop 2015-07-11 00:11:23 -05:00
Blade Barringer 50a924e470 Add space 2015-07-11 00:11:02 -05:00
Blade Barringer 09d85f39fc Merge pull request #5586 from GitHubSphinx/Sphinx-entry2
Introducing a class for buttons allowing wrapping
2015-07-11 00:07:26 -05:00
Blade Barringer ddf2489664 Merge pull request #5581 from barbourkd/bugfix/5552
Show Extra Notes icon regardless of task ownership.
2015-07-11 00:05:04 -05:00
GihHubSphinx 00f7af7807 Introducing a class for buttons allowing wrapping
New .btn-wrap class for buttons with long text allowing wrapping
2015-07-10 02:33:09 +05:00
Sabe Jones d5f97b2781 chore(news): Derby Day Bailey 2015-07-09 14:24:22 -05:00
Kevin Barbour 5a57895077 Show Extra Notes icon regardless of task ownership.
fixes #5552
2015-07-08 20:48:42 -04:00
Kevin Barbour d6aef8ee24 Prevent "Resting in the Inn" message when viewing challenges.
fixes #5559
2015-07-08 20:22:23 -04:00
Sabe Jones 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
Blade Barringer 7dc64f8448 Update iOS link to point to new app in footer 2015-07-07 21:30:08 -05:00
Sabe Jones 3dd2493fed chore(news): iOS release Bailey 2015-07-07 13:27:19 -05:00
Matteo Pagliazzi 3a2422086f fix(french): use env.t client side 2015-07-06 13:39:18 +02:00
Blade Barringer 1ae505eabd Adjust tags for bower; Set github link to main habitrpg org 2015-07-05 21:58:48 -05:00
Will a21f2427e9 jade syntax errors 2015-07-03 22:22:29 -07:00
Will b3a780b720 more places in header.jade needing maxHealth fix 2015-07-03 22:22:28 -07:00
Will 5f6ddd76a7 update view: stats box in header 2015-07-03 22:22:28 -07:00
Will 03eec12fdd update view: stats table 2015-07-03 22:22:28 -07:00
Sabe Jones 6845e8caf3 fix(experiment): Style fixes
Corrects the display of Google Experiment variants in the absence of an API callback, and widens the avatar stat bar for users who don't have a party.
2015-07-03 13:46:22 -05:00
Blade Barringer e924157fdf Merge pull request #5508 from Alys/trivial-difficulty
add Trivial difficulty/priority setting to task Advanced Options
2015-07-03 10:08:46 -05:00
Blade Barringer 95c29c5c97 Remove one-time bindings 2015-07-02 20:26:31 -05:00
Blade Barringer 33f2ef7cef Simplify start party button 2015-07-02 19:36:58 -05:00
Sabe Jones fb81c79b78 feat(analytics): Invite Friends experiment
Disables the prior landing page Google Experiment and begins a new one involving the placement and captioning of the button for inviting friends to the user's party.
2015-07-02 16:13:22 -05:00
hairlessbear ebbc6666a6 Modified broken challenge icon to cause cursor to show item as clickable 2015-07-01 18:00:49 -04:00
hairlessbear 6e5f741e4a Changed task notes from 'span' to 'a' element to cause cursor to show item as clickable 2015-07-01 17:53:45 -04:00
Sabe Jones d248b74569 fix(event): Splash visual tweaks 2015-07-01 14:21:37 -05:00
Sabe Jones 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
Matteo Pagliazzi ca36c5c632 Merge pull request #5531 from HabitRPG/paglias/amazon-payments
Amazon Payments Subscriptions
2015-07-01 01:40:27 +02:00
Sabe Jones f88c5fb8b5 chore(news): June 30 Bailey 2015-06-30 12:35:16 -05:00
Matteo Pagliazzi 65f4aac23c feat(amazon-payments): working subscriptions, put donations and gifts on hold 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 271245f1e6 feat(amazon-payments): finalize one time purchases 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 78cca423f0 feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi a377501f64 feat(amazon-payments): wip on donations 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 6faef6f737 wip amazon payments 2015-06-30 17:59:30 +02:00