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

17596 Commits

Author SHA1 Message Date
Jesse Zoldak
ee3f792eed Merge pull request #17171 from edx/zoldak/remove-skipped-test-with-pylint-errors 
Remove skipped testcases
 2018-01-12 15:52:11 -05:00
Robert Raposa
3afa83c0c4 Merge pull request #15598 from edx/andya/developer-doc-cleanups 
Improve documentation for the Open edX features
 2018-01-12 13:40:08 -05:00
Tyler Hallada
7a6db19a18 Merge pull request #17159 from edx/thallada/fix-discussion-off-screen-bug 
Use percentage widths to fix flex-box bug
 2018-01-12 13:33:37 -05:00
Andy Armstrong
7c09ebb794 Improve documentation for the Open edX features 2018-01-12 10:52:07 -05:00
Jae Bradley
725d354463 Merge pull request #17128 from edx/jaebradley/LEARNER-3600-Upsell-Modal 
jaebradley/learner 3600 upsell modal
 2018-01-12 09:57:09 -05:00
jaebradley
4573b63018 implement modal and carousel 
wip

upsell modal css

remove unnecessary newline

accidentally removed feature

update props

update modal component

update css

add additional slides

update styling

update copy
 2018-01-12 01:35:15 -05:00
Jeremy Bowman
c24d8c1b28 Merge pull request #17167 from edx/jmbowman/PLAT-1884 
PLAT-1884 Replace deprecated xblock.fragment usage
 2018-01-11 16:25:13 -05:00
Nimisha Asthagiri
bb738571ce Merge pull request #17093 from edx/arch/django-app-plugin 
Django App Plugins
 2018-01-11 15:49:45 -05:00
Jesse Zoldak
dae4ece3ab Remove skipped testcases 2018-01-11 14:54:42 -05:00
Nimisha Asthagiri
4c67302604 Update grades app to be a Django App Plugin 2018-01-11 14:35:07 -05:00
Nimisha Asthagiri
7490cd93ab Enable Django App Plugins in LMS 2018-01-11 14:35:07 -05:00
Nimisha Asthagiri
dc3510a619 README docs for lms/envs directory 2018-01-11 14:35:05 -05:00
Jeremy Bowman
f8e5e38cc4 PLAT-1884 Replace deprecated xblock.fragment usage 2018-01-11 14:20:12 -05:00
Ned Batchelder
58d23e4159 Merge pull request #17166 from mreyk/teltek/feature/allow-cert-name-aws-override 
Allow to override CERT_NAME_SHORT and CERT_NAME_LONG default values
 2018-01-11 13:19:14 -05:00
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
mrey
a28f3046e1 Allow to override CERT_NAME_SHORT and CERT_NAME_LONG default values 2018-01-11 16:37:30 +01: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
Tyler Hallada
804eacdb04 Use percentage widths to fix flex-box bug 2018-01-10 17:48:34 -05:00
Jeremy Bowman
1a7753d775 PLAT-1881 Fix datetimes lacking timezone information 2018-01-10 14:33:01 -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
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
9650c324bc updated-translations 2018-01-10 15:53:41 +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
Qubad786
4f422e37d9 Refactor transcript upload handler to add language-overwrite support - EDUCATOR-2022 2018-01-09 17:03:45 +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
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
Jeremy Bowman
d3d6272d8f PLAT-1873 to_deprecated_string() cleanup part 1 2018-01-08 13:51:42 -05:00
Brian Mesick
e46c7fc516 Merge pull request #17096 from edx/bmedx/django111_lms_unit_1_failures 
Small fixes to LMS unit 1 failures in Django 1.11 tests
 2018-01-08 11:30:21 -05:00
bmedx
95e76dcafe Small fixes to LMS unit 1 failures in Django 1.11 tests 2018-01-08 10:20:30 -05:00
Ahsan Ul Haq
e7c869f87a Merge pull request #16951 from edx/ahsan/LEARNER-3393-rate-limited-access-token-view 
Rate limited /oauth2/access_token/
 2018-01-08 18:52:47 +05:00
Ahsan Ulhaq
1b2fdc058d Rate limited /oauth2/access_token/ 
There has been some reports about attack on /oauth2/access_token/.
This cause LMS to be down. This is being resolved by rate limiting the
endpoint.
LEARNER-3393
 2018-01-08 16:58:16 +05:00
Ammar Naqvi
fde830b73a Updated subsections grade percentage to start rounding 
Changed subsection gating on course outline to consider rounded off grade instead of absolute grade to decide whether to show a subsection which has a prerequisite or not.
EDUCATOR-1676
 2018-01-08 15:29:42 +05:00
Tomasz Gargas
3da19d0ea8 Ignore deprecated progress event for blocks with new Completion API. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2018-01-08 10:10:02 +01:00
Asad Iqbal
d894850513 Merge pull request #16950 from edx/asadiqbal08/ENT-772-Update-singin-UI 
ENT-772 - UI Updated to Support Ent Data Synchronization message
 2018-01-08 12:55:24 +05:00
Nimisha Asthagiri
57f09e987f Delete unneeded Django Settings files 2018-01-05 15:04:10 -05:00
McKenzie Welter
82fb6e7ec0 course title link to course home when enrolled 2018-01-05 12:36:59 -05:00