Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,577 Commits 1 Branch 0 Tags
78bc871fa4bc08fa446b472eaebc3e204b121e09
Commit Graph

44577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Tuchfarber
78bc871fa4 Merge pull request #17091 from open-craft/clemente/upstream-add-blocks-to-course-about 
Add some blocks to course_about.html
 2018-01-11 12:21:22 -05:00
Stu Young
00db38188d Merge pull request #17107 from edx/estute/enable-bokchoy-db-caching-on-jenkins 
use db cache in jenkins bok choy builds
 2018-01-11 12:03:44 -05:00
Ari Rizzitano
22a4f46e13 Merge pull request #17158 from edx/ari/package-lock 
check in package-lock.json [FEDX-399]
 2018-01-11 10:41:34 -05:00
Mushtaq Ali
9dcedaf82b Merge pull request #17138 from edx/mushtaq/improve-transcript-sorting 
Sort transcript languages
 2018-01-11 12:57:00 +05:00
Waheed Ahmed
69cd383402 Merge pull request #17145 from edx/waheed/LEARNER-3754-update-my-program-detail-url-for-mobile 
Update program detail fragment url for mobile apps.
 2018-01-11 12:42:23 +05:00
Jeremy Bowman
64b06b2259 Merge pull request #17155 from edx/jmbowman/PLAT-1881 
PLAT-1881 Fix datetimes lacking timezone information
 2018-01-10 18:00:10 -05:00
John Eskew
add3a21dc7 Merge pull request #17112 from edx/jeskew/fix_static_asset_pipeline_tests_django1.9 
Fix static asset pipeline tests in Django 1.9.
 2018-01-10 17:35:09 -05:00
Ari Rizzitano
4a03d45d7d check in package-lock.json [FEDX-399] 2018-01-10 17:33:26 -05:00
John Eskew
cbf836227b Disable migration-checking test in Django 1.9+ 2018-01-10 15:50:39 -05:00
John Eskew
6174e4deb6 Ensure npm install before static asset pipeline tests. 2018-01-10 15:50:39 -05:00
Ari Rizzitano
3e0a4260b1 Merge pull request #17152 from edx/ari/sass-include-directory 
temporarily include pattern library node modules for sass builds
 2018-01-10 15:30:21 -05:00
Jeremy Bowman
1a7753d775 PLAT-1881 Fix datetimes lacking timezone information 2018-01-10 14:33:01 -05:00
Ari Rizzitano
f64b04f4d8 temporarily include pattern library node modules for sass builds [FEDX-498] 
temporarily include pattern library node modules for sass builds [FEDX-498]

fixup tests
 2018-01-10 14:24:36 -05:00
Harry Rein
7f369b1ed9 Merge pull request #17151 from edx/HarryRein/initialize-currently-enrolled-for-entitlement-card 
Ensure entitlement session select initializes to enrolled session.
 2018-01-10 13:46:42 -05:00
Jeremy Bowman
4026c25f7a Merge pull request #17133 from edx/jmbowman/PLAT-1873_2 
PLAT-1873 to_deprecated_string() cleanup part 2
 2018-01-10 13:45:15 -05:00
Harry Rein
5dfd5213fd Ensure entitlement session select initializes to enrolled session. 
LEARNER-3827
 2018-01-10 12:13:56 -05:00
Stuart Young
ee02919ad7 use db cache in jenkins bok choy builds 
move migration calculation to reset test-db script
 2018-01-10 11:58:27 -05:00
Matthew Piatetsky
c2094d4388 Merge pull request #17134 from edx/LEARNER-3058 
Fix course upsell styling when bootstrap is enabled
 2018-01-10 09:59:37 -05:00
Waheed Ahmed
2406812100 Update program detail fragment url for mobile apps. 
LEARNER-3754
 2018-01-10 19:01:04 +05:00
McKenzie Welter
2db8364646 Merge pull request #17123 from edx/McKenzieW/learner-3688 
updated flexbox for course actions
 2018-01-10 08:19:27 -05:00
Ayub khan
476ea6105b Merge pull request #17144 from edx/10-jan-translations-updates 
updated-translations
 2018-01-10 17:51:32 +05:00
Mushtaq Ali
c0d86360f0 Improve trancript sorting - EDUCATOR-2030 2018-01-10 17:02:21 +05:00
ayub-khan
9650c324bc updated-translations 2018-01-10 15:53:41 +05:00
Saleem Latif
42da2de733 Merge pull request #17136 from edx/saleem-latif/ENT-431 
[ENT-431]: edx-enterprise version bump to 0.61.2 from 0.60.0
 2018-01-10 14:45:15 +05:00
Calen Pennington
fea4eef359 Merge pull request #17006 from cpennington/synchro-cms-static-base 
Make module loading for cms/static/js/base.js sychronous to ease tran…
 2018-01-09 22:55:08 -05:00
Matthew Piatetsky
222b356900 Fix course upsell styling when bootstrap is enabled 2018-01-09 16:09:26 -05:00
McKenzie Welter
b0271de359 make course actions an inline flexbox 2018-01-09 15:16:27 -05:00
Harry Rein
042a854bd0 Merge pull request #17124 from edx/HarryRein/dashboard-entitlement-with-no-course-runs 
Show more sessions coming soon on course dashboard.
 2018-01-09 14:13:33 -05:00
Harry Rein
b404173046 Show more sessions coming soon on course dashboard. 
LEARNER-3808

Ensures that users can see their entitlement purchase whether there
are available sessions or not. Notifies them with a message stating that
more sessions are coming soon, as is currently implemented on the programs
dashboard.
 2018-01-09 13:04:36 -05:00
Michael Terry
57ba9b2ac6 Remove deprecated enabled field 
The CertificateGenerationCourseSetting.enabled column is
deprecated. It is no longer referenced anywhere in the code, and
it's time to remove it.

Original code by Michael LoTurco.

LEARNER-2549
 2018-01-09 10:04:26 -05:00
Mushtaq Ali
5750495f86 Merge pull request #17052 from edx/show-transcripts-feature 
Show transcripts feature
 2018-01-09 19:29:47 +05:00
Zubair Afzal
dedbd288dc Merge pull request #17137 from edx/zub/ENT-768-display-friendly-error-message-for-third-party-auth 
ENT-768 Display friendly error message for third party auth error
 2018-01-09 19:25:50 +05:00
Waheed Ahmed
706dd4b836 Merge pull request #17135 from edx/waheed/LEARNER-3758-fix-webcam-not-loading 
Fix webcam not loading in safari.
 2018-01-09 19:25:24 +05:00
Saleem Latif
09eb8ee333 edx-enterprise version bump to 0.61.2 from 0.60.0 2018-01-09 18:49:09 +05:00
Mushtaq Ali
70fe33fc1e Change upload button text 2018-01-09 17:03:48 +05:00
Mushtaq Ali
f76d419bc7 Fix download transcript bug - EDUCATOR-2071 2018-01-09 17:03:48 +05:00
Mushtaq Ali
0ab6b825fa Bump VAL version to 0.1.7 2018-01-09 17:03:47 +05:00
Mushtaq Ali
10d79b0047 Update user strings 2018-01-09 17:03:46 +05:00
Mushtaq Ali
00a86ccef8 Transcript file upload - EDUCATOR-2029 2018-01-09 17:03:46 +05:00
Qubad786
4f422e37d9 Refactor transcript upload handler to add language-overwrite support - EDUCATOR-2022 2018-01-09 17:03:45 +05:00
Qubad786
090e5dc534 Transcript upload backend for Video Upload Page – EDUCATOR-1854 2018-01-09 17:03:44 +05:00
Qubad786
c760c6a01b Download transcript on video upload page - EDUCATOR-1853 2018-01-09 17:03:44 +05:00
Mushtaq Ali
e601767329 Show transcripts on video uploads page - EDUCATOR-1662 2018-01-09 17:03:43 +05:00
zubair-arbi
0b13d25b08 ENT-768 Display friendly error message for third party auth error 2018-01-09 16:57:14 +05:00
Waheed Ahmed
b3fe397f9b Fix webcam not loading in safari. 
LEARNER-3758
 2018-01-09 15:25:36 +05:00
Jeremy Bowman
669aa13ad6 PLAT-1873 to_deprecated_string() cleanup part 2 2018-01-08 17:26:55 -05:00
Jeremy Bowman
7a69d2f771 Merge pull request #17116 from edx/jmbowman/PLAT-1873_1 
PLAT-1873 to_deprecated_string() cleanup part 1
 2018-01-08 17:02:44 -05:00
Ari Rizzitano
8dcfd7f163 Merge pull request #16839 from edx/ari/demo-react-renderer 
use reactrenderer for react includes in python templates
 2018-01-08 16:46:07 -05:00
Braden MacDonald
a230cf3b5c Merge pull request #16741 from open-craft/tomaszgy/ignore_old_progress 
Ignore deprecated progress event for blocks with new Completion API.
 2018-01-08 13:10:52 -08:00
Michael Youngstrom
5095ffe1ae Merge pull request #17110 from edx/youngstrom/db_cache_rewrite_fingerprint 
Paver flag to update local bokchoy fingerprint
 2018-01-08 14:41:45 -05:00