Muddasser
|
048f73be6d
|
Fixed close button click issue
|
2016-04-28 19:37:37 +05:00 |
|
Waheed Ahmed
|
91d3b0bd24
|
Merge pull request #12271 from edx/waheed/ecom-4292-add-kosovo-to-country-list
Added Kosovo in django country list.
|
2016-04-28 11:59:24 +05:00 |
|
Waheed Ahmed
|
b7b4e0b041
|
Added Kosovo in django country list.
ECOM-4292
|
2016-04-28 00:17:06 +05:00 |
|
AlasdairSwan
|
a6da71591a
|
Merge pull request #12221 from edx/alasdair/ECOM-3200-program-card-learner-progress
Adding program progress bar to program cards
|
2016-04-27 15:06:39 -04:00 |
|
John Eskew
|
625e76a595
|
Merge pull request #12262 from edx/jeskew/pillow_upgrade
Upgrade pillow.
|
2016-04-27 14:17:17 -04:00 |
|
David Ormsbee
|
0acccf2fd4
|
Merge pull request #12280 from edx/release
Release to Master (2016-04-26 release)
|
2016-04-27 14:05:12 -04:00 |
|
AlasdairSwan
|
cdb05c26a6
|
Adding program progress bar to program cards
|
2016-04-27 13:46:48 -04:00 |
|
Brian Jacobel
|
19b9242986
|
Merge pull request #12151 from edx/bjacobel/requirejs-errors-in-django-templates
Fix errors in old Django templates / migrate to Mako
|
2016-04-27 13:39:54 -04:00 |
|
Nimisha Asthagiri
|
036537f174
|
Merge pull request #12263 from edx/tnl/next-button-fix
Fix Next Button's 404 error
|
2016-04-27 13:18:39 -04:00 |
|
David Ormsbee
|
7d7d5a160d
|
Merge pull request #12232 from edx/rc/2016-04-26
Release Candidate rc/2016-04-26
|
2016-04-27 12:23:34 -04:00 |
|
Brian Jacobel
|
0f1366a7fb
|
Merge pull request #12251 from edx/bjacobel/use-unminified-assets
Use unminified picturefill in development
|
2016-04-27 12:12:43 -04:00 |
|
John Eskew
|
0899871958
|
Merge pull request #11042 from edx/jeskew/xml_removal
Remove XML modulestore code from most tests.
|
2016-04-27 11:20:02 -04:00 |
|
Brian Jacobel
|
12d65f5801
|
Use unminified picturefill in development
|
2016-04-27 10:23:07 -04:00 |
|
Ahsan Ulhaq
|
edb356a43a
|
Merge pull request #12273 from edx/ahsan/revert-ECOM-4281-js-test-for-analytics-event-on-LMS-receipt-page
Revert "Add js test for analytics event on LMS receipt page"
|
2016-04-27 18:38:45 +05:00 |
|
John Eskew
|
8354e6d79c
|
Fix quality issue.
|
2016-04-27 09:27:36 -04:00 |
|
Renzo Lucioni
|
63b65ab035
|
Merge pull request #12231 from edx/renzo/program-progress
Measuring program progress
|
2016-04-27 09:24:09 -04:00 |
|
Ahsan Ulhaq
|
5f6474ac7d
|
Revert "Add js test for analytics event on LMS receipt page"
This reverts commit 785b752d19.
|
2016-04-27 17:38:51 +05:00 |
|
Muzaffar yousaf
|
d97b3cbd1f
|
Merge pull request #12037 from edx/fedx/upgrade-backbone
Upgrade backbone via npm.
|
2016-04-27 17:31:00 +05:00 |
|
clrux
|
c6a4c23123
|
Merge pull request #12260 from edx/clrux/ac-400
AC-400 removing tabindex from bookmark
|
2016-04-27 07:23:30 -04:00 |
|
Ahsan Ulhaq
|
be6aea179a
|
Merge pull request #12238 from edx/ahsan/ECOM-4281-js-test-for-analytics-event-on-LMS-receipt-page
Add js test for analytics event on LMS receipt page
|
2016-04-27 15:33:29 +05:00 |
|
muhammad-ammar
|
4fd2a7d176
|
LMS fixes required to upgrade BackboneJS
|
2016-04-27 12:51:13 +05:00 |
|
Ehtesham
|
c87821446b
|
CMS event fixes required to upgrade backbonejs
|
2016-04-27 12:48:46 +05:00 |
|
Ehtesham
|
59e1cafc02
|
CMS fixes required to upgrade backbonejs
|
2016-04-27 12:48:45 +05:00 |
|
muzaffaryousaf
|
a1cb7b8f39
|
Common, squire fixes required to upgrade backbonejs
TNL-4358
|
2016-04-27 12:48:45 +05:00 |
|
muzaffaryousaf
|
e89a32d5c6
|
Upgrade backbone via npm.
TNL-4335
|
2016-04-27 12:48:45 +05:00 |
|
Muddasser
|
d670f8c4da
|
Merge pull request #12257 from edx/muddasser/bokchoy/chrome/test_if_captions_are_draggable
branch out at assert based on chrome and firefox
|
2016-04-27 12:03:55 +05:00 |
|
Muddasser
|
1220a0a98b
|
Merge pull request #12259 from edx/muddasser/bokchoy/chrome/screenshots_test
Changed screenshots to incorporate firefox and chrome
|
2016-04-27 12:03:37 +05:00 |
|
Douglas Hall
|
9eefe6a947
|
Merge pull request #12264 from edx/douglashall/upgrade_xblock_lti_consumer_1_0_6
Upgrade xblock_lti_consumer to 1.0.6
|
2016-04-26 21:05:30 -04:00 |
|
Nimisha Asthagiri
|
2396cc493d
|
Fix Next Button's 404 error
MA-2305
|
2016-04-26 20:21:08 -04:00 |
|
Robert Raposa
|
40b2711cc4
|
Merge pull request #12183 from edx/robrap/linter-run-quality
TNL-4321: Add Jenkins support for Safe Templates Linter
|
2016-04-26 17:53:57 -04:00 |
|
Brian Jacobel
|
90499e77f1
|
Merge pull request #12250 from edx/bjacobel/underscore.string-removal-v2
remove usage of minifed Underscore.string
|
2016-04-26 16:40:19 -04:00 |
|
Douglas Hall
|
139524cadb
|
Upgrade xblock_lti_consumer to 1.0.6
|
2016-04-26 16:08:16 -04:00 |
|
Ahsan Ulhaq
|
785b752d19
|
Add js test for analytics event on LMS receipt page
ECOM-4281
|
2016-04-27 00:35:06 +05:00 |
|
Renzo Lucioni
|
5da6a598dd
|
Measuring program progress
Introduces a utility class for gauging a user's progress towards program completion. Progress data is passed to the ProgramListFactory. ECOM-3200.
|
2016-04-26 13:36:58 -04:00 |
|
Ben Patterson
|
badb2ec307
|
Merge pull request #12242 from edx/benp/bok-choy-0.5.2
Use bok-choy v0.5.2 for various improvements.
|
2016-04-26 13:30:24 -04:00 |
|
Robert Raposa
|
ec442789c0
|
Add Jenkins support for Safe Templates Linter
|
2016-04-26 12:36:25 -04:00 |
|
Clinton Blackburn
|
3138ff9724
|
Merge pull request #12194 from edx/clintonb/jwt-oauth-access-token
Updated access token view to return a JWT as an access token
|
2016-04-26 12:35:32 -04:00 |
|
John Eskew
|
71430055e2
|
Upgrade pillow.
|
2016-04-26 11:43:42 -04:00 |
|
Waheed Ahmed
|
28b0d993cc
|
Merge pull request #12255 from edx/waheed/ecom-3437-fix-celery-task
Fixed celery task.
|
2016-04-26 19:28:36 +05:00 |
|
Brian Jacobel
|
b27c8f060f
|
Merge pull request #12220 from edx/bjacobel/adaptive-hint-bug
Math inputs _and_ adaptive hints are sized/positioned correctly
|
2016-04-26 10:27:39 -04:00 |
|
Chris Rodriguez
|
fed39609d5
|
AC-400 removing tabindex from bookmark
|
2016-04-26 09:54:48 -04:00 |
|
Clinton Blackburn
|
6941fcd766
|
Updated access token view to return a JWT as an access token
The JWT includes the user email and username, along with details pulled from the original access token (e.g. scope, expiration).
ECOM-4221
|
2016-04-26 09:32:49 -04:00 |
|
Muddasser
|
2857e66239
|
Changed screenshots to incorporate firefox and chrome
|
2016-04-26 18:11:52 +05:00 |
|
Waheed Ahmed
|
61de4ffc71
|
Fixed celery task.
ECOM-3437
|
2016-04-26 17:37:02 +05:00 |
|
Muddasser
|
99cbf18e96
|
branch out at assert based on chrome and firefox
|
2016-04-26 16:20:32 +05:00 |
|
Ben Patterson
|
d0b8f5d4fd
|
Merge pull request #12253 from edx/benp/flaky-condition
Fix flaky condition related to settings page.
|
2016-04-26 05:39:34 -04:00 |
|
Ibrahim Ahmed
|
8b014f2650
|
Merge pull request #12107 from edx/ibrahimahmed443/WL-309-new-fields-in-studio
WL-309 Add new text fields to Studio schedule and details settings page
|
2016-04-26 14:30:43 +05:00 |
|
Awais Jibran
|
b4e8086397
|
Merge pull request #12049 from edx/aj/safe-templates
Safe templates
|
2016-04-26 09:40:31 +05:00 |
|
Ibrahim
|
720bde1da9
|
add new text fields to schedule and details settings page
|
2016-04-25 23:44:13 -04:00 |
|
Matt Drayer
|
5adf6fec66
|
Merge pull request #12252 from edx/mattdrayer/microsite-override-ecommerce-api
mattdrayer: Add microsite settings overrides
|
2016-04-25 21:17:09 -04:00 |
|