Commit Graph

9900 Commits

Author SHA1 Message Date
Joe Gallo bd39d378fd update or pin unregistered bower packages 2015-07-04 20:08:21 -04:00
Joe Gallo 4c70cfd8d2 simplify github repo urls in bower packages file 2015-07-04 19:20:24 -04:00
Joe Gallo b8df812621 all possible unregistered packages in package.json replaced/upgraded
(upgrading swagger-node-express breaks api tests)
2015-07-04 19:17:23 -04:00
Blade Barringer 12d5515879 Change motivate message 2015-07-03 19:13:31 -05:00
Sabe Jones dc5b7f31d8 fix(build): Pin working zocial CSS commit 2015-07-03 18:19:39 -05: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
Matteo Pagliazzi fb912313b9 fix(amazon-payments): handle declined payments 2015-07-03 16:54:57 +02:00
Matteo Pagliazzi 313ac91020 improve(amazon-payments): do not redirect after cancellation with ?noRedirect=true 2015-07-03 14:56:19 +02:00
Matteo Pagliazzi f6480faf22 chore(i18n): update locales 2015-07-03 10:49:35 +02: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
Blade Barringer 4d7a3afc93 Merge branch 'LionC-develop' into develop 2015-07-02 07:58:59 -05:00
Blade Barringer 4bcff71859 Adjust login modal
* Rename loginForm
* Use larger buttons for logging in or registering
* Use fully translated placeholder text
2015-07-02 07:58:11 -05:00
Blade Barringer f2cd6f921c Merge pull request #5543 from hairlessbear/pointer_on_notes_icon
Changed task notes icon from 'span' to 'a' element to cause cursor to show icon as clickable
2015-07-02 07:40:12 -05:00
Blade Barringer fe7642e33a Add find the cub art
Closes #5545
2015-07-01 20:19:46 -05:00
Blade Barringer ba85487b29 Correct naming of backgrounds 2015-07-01 19:50:49 -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
Kevin Gisi 74d51e530f Merge pull request #5541 from alexbragdon/gulp_fail_fix
Gulp Tests now report summaries even when some tests fail.
2015-07-01 15:44:49 -04:00
Sabe Jones d248b74569 fix(event): Splash visual tweaks 2015-07-01 14:21:37 -05:00
Alexander Bragdon d6a7bc36c7 Changes hard tabs to double space soft tabs in the error throwing failure block. 2015-07-01 15:20:47 -04:00
Alexander Bragdon 45ddc77eaa Fixes a typo in test:api:safe, missed semicolon on line 97. 2015-07-01 14:45:27 -04:00
Alexander Bragdon 9b31cf462a Creates safe versions of tests for Common, API, Karma, and E2E that don't pass errors via callback. The summary information will check if any tests failed and throw an error after all tests have been run. 2015-07-01 14:42:43 -04:00
Lion Cilu 5cb6f0f482 Small login form attribute improvements
Added "spellcheck='false'" to username inputs to make it less annoying to use on some devices where some usernames will be "corrected" by default.
Added "required" to user/email and password inputs on the login form.
2015-07-01 20:38:57 +02:00
Sabe Jones d4b5620ada Merge branch 'sabrecat/summer-splash' into develop 2015-07-01 13:13:23 -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 0ea98880be Merge pull request #5537 from HabitRPG/paglias/amazon-payments
feat(amazon-payments): add a lastBillingDate attribute
2015-07-01 19:11:48 +02:00
Matteo Pagliazzi 4e7afcbe94 feat(amazon-payments): add a lastBillingDate attribute 2015-07-01 18:59:51 +02:00
Alexander Bragdon 75c25dc7a9 Rollback of /social/index.jade to reverse previous commits changes and return branch to upstream parity. 2015-07-01 10:13:10 -04:00
Alexander Bragdon cbb0988679 Adds a space to social/index.jade to test development platform and git tracking. 2015-07-01 09:59:48 -04:00
Blade Barringer 851868296f Merge branch 'Alys-guild-list-links-2015-06-28' into develop 2015-06-30 22:40:35 -05:00
Blade Barringer a3f5f626a6 Put h3 and a on one line 2015-06-30 22:39:48 -05:00
Alys eeb9793eb8 Merge pull request #5526 from Alys/cron-fix-yet-again-2015-06-30
make api.shouldDo use the day being checked as the default date instead of today
2015-07-01 13:17:01 +10:00
Matteo Pagliazzi ca36c5c632 Merge pull request #5531 from HabitRPG/paglias/amazon-payments
Amazon Payments Subscriptions
2015-07-01 01:40:27 +02:00
Matteo Pagliazzi 96ec70487f fix(amazon-payments): remove unused config var 2015-07-01 01:39:52 +02:00
Sabe Jones 71d8fd2f0c fix(analytics): Handle missing user object 2015-06-30 17:13:56 -05:00
Sabe Jones 3d15da61ec fix(analytics): Correct user ID handling 2015-06-30 16:52:18 -05:00
Sabe Jones 46a7591492 Merge branch 'release-june-30th-2015' into develop 2015-06-30 13:39:51 -05: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 8747cf4cce fix(amazon-oayments): use production url 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi dbce6f7676 fix(amazon-payments): use right url in production 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 e38f8bf4ef amazon payments: 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
Matteo Pagliazzi b0643e7177 WIP: start working on amazon payments 2015-06-30 17:59:30 +02:00