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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Ben Patterson
|
6ee3ea68ba
|
Fix flaky condition related to settings page.
|
2016-04-25 17:32:32 -04:00 |
|
Matt Drayer
|
fdd045b108
|
mattdrayer: Add microsite settings overrides
|
2016-04-25 17:09:11 -04:00 |
|
Andy Armstrong
|
ae52b9c468
|
Merge pull request #12057 from edx/alasdair/fedx-118-pattern-library-styles-with-current-partials
Alasdair/fedx 118 pattern library styles with current partials
|
2016-04-25 16:51:31 -04:00 |
|
Andy Armstrong
|
fe88402982
|
Merge branch 'master' into alasdair/fedx-118-pattern-library-styles-with-current-partials
|
2016-04-25 16:51:25 -04:00 |
|
Andy Armstrong
|
56d003e47e
|
Merge pull request #12219 from stvstnfrd/staticfiles/cms
Remove LMS_ROOT / static from cms/common.py
|
2016-04-25 16:50:29 -04:00 |
|
Brian Jacobel
|
217ea5d074
|
remove usage of minifed Underscore.string
|
2016-04-25 16:24:51 -04:00 |
|
Ben Patterson
|
f53b900f06
|
Merge pull request #12248 from edx/benp/course-page-existence
FEDX-88. Marking test as flaky.
|
2016-04-25 16:14:53 -04:00 |
|
Ben Patterson
|
9efdda83b1
|
FEDX-88. Marking test as flaky.
|
2016-04-25 14:35:34 -04:00 |
|
Brian Jacobel
|
00fcb9ddc1
|
Fix FEDX-167: Both math inputs and adaptive hints are sized correctly
|
2016-04-25 14:31:53 -04:00 |
|
clrux
|
74db655ed9
|
Merge pull request #12239 from edx/clrux/ac-444
AC-444 Adding legacy event_type for language menu events
|
2016-04-25 13:58:44 -04:00 |
|
clrux
|
6aa76d3f9b
|
Merge pull request #12199 from edx/clrux/ac-385
AC-385 adding events for closed captions
|
2016-04-25 13:58:16 -04:00 |
|
Andy Armstrong
|
c42b36ccd1
|
Fixes
|
2016-04-25 13:35:57 -04:00 |
|
Christine Lytwynec
|
7814e7c984
|
Merge pull request #12228 from edx/clytwynec/ac-367
Fix start url format for paver pa11ycrawler
|
2016-04-25 13:18:51 -04:00 |
|
Ben Patterson
|
54839cb725
|
Use bok-choy v0.5.2 for various improvements.
|
2016-04-25 12:09:04 -04:00 |
|
clrux
|
8e347f4078
|
Merge pull request #12101 from edx/clrux/ac-342-tweaking-skip-links
AC-342 sending skip links to single main, relevant
|
2016-04-25 11:36:26 -04:00 |
|
Peter Fogg
|
687197481f
|
Merge pull request #12154 from edx/peter-fogg/client-keys
Generate API client keys.
|
2016-04-25 11:05:01 -04:00 |
|
AlasdairSwan
|
a9971ef2ba
|
FEDX-118 Adding header to test page
|
2016-04-25 10:56:28 -04:00 |
|
Waheed Ahmed
|
8baf58689a
|
Merge pull request #12210 from edx/waheed/ecom-3437-enable-self-gen-certs-by-default-for-self-paced
Automatically enable Self Generating Certificates for Self Paced Courses.
|
2016-04-25 19:26:35 +05:00 |
|
Chris Rodriguez
|
2a23757fbc
|
Sending skip links to single main, making more relevant
|
2016-04-25 10:00:45 -04:00 |
|
Peter Fogg
|
b9b67d1091
|
Generate API client credentials.
ECOM-3946
|
2016-04-25 09:27:04 -04:00 |
|
Chris Rodriguez
|
5137b9f8b6
|
Adding legacy event_type for language menu events
|
2016-04-25 08:58:43 -04:00 |
|
Waheed Ahmed
|
f246c6bbd6
|
Automatically enable Self Generating Certificates for Self Paced Courses.
ECOM-3437
|
2016-04-25 17:52:47 +05:00 |
|
Chris Rodriguez
|
6ea7545cc3
|
AC-385 adding events for closed captions
|
2016-04-25 08:29:08 -04:00 |
|
Awais Jibran
|
34b06932e5
|
Safe tempaltes
|
2016-04-25 16:30:09 +05:00 |
|
Ben Patterson
|
f7ec039bef
|
Merge pull request #12100 from edx/benp/selenium-253-with-screenshots
Bok-choy tests: use firefox 42.0, selenium 2.53.1
|
2016-04-24 09:59:36 -04:00 |
|
Ben Patterson
|
a6a65217c9
|
selenium 2.53.1
|
2016-04-24 08:32:34 -04:00 |
|