Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,531 Commits 1 Branch 0 Tags
113e0af10455aa49fd591b89b9fd587e2af9d374
Commit Graph

43531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Albert St. Aubin
113e0af104 Added Entitlement API 
The Entitlement API will allow for GET, POST, DELETE(Revoke), and
variations of these methods of managing and retrieving data about
Learner Entitlements.
[LEARNER-2661]
 2017-11-08 10:03:38 -05:00
John Eskew
e503ed86ae Merge pull request #16490 from edx/jeskew/move_edx_sga_back_to_upstream 
Move back to upstream edx-sga requirement.
 2017-11-08 09:46:13 -05:00
John Eskew
c14727539f Move back to upstream edx-sga requirement. 2017-11-08 09:26:01 -05:00
Muhammad Ammar
4813929f1d Merge pull request #16458 from edx/ammar/fix-capa-hint-focus 
fix capa hint focus
 2017-11-08 08:11:46 +05:00
Jeremy Bowman
5b415b5c7c Merge pull request #16486 from edx/jmbowman/remove_nose_cruft 
Remove unused nose settings and plugin
 2017-11-07 17:51:13 -05:00
Anthony Mangano
f696c4c08b Merge pull request #16440 from edx/LEARNER-2921-fix-spanish-cert-dates 
LEARNER-2921 Fix i18n for certificates
 2017-11-07 16:40:10 -05:00
Jeremy Bowman
0f4e4e1c31 Remove unused nose settings and plugin 2017-11-07 16:34:59 -05:00
John Eskew
3d884d6cc0 Merge pull request #16428 from edx/jeskew/email_mkting_lti_prov_to_appconfig_ready 
Move lti_provider/email_marketing startup to AppConfig ready.
 2017-11-07 15:15:56 -05:00
Anthony Mangano
7e52af97b5 Render certificate templates in the correct language 
LEARNER-2921
 2017-11-07 14:49:44 -05:00
Brian Mesick
333e1ccb96 Merge pull request #16433 from edx/bmedx/django111_urls_common 
common urls cleanup for Django 1.11
 2017-11-07 14:46:15 -05:00
muhammad-ammar
690542c998 fix capa hint focus 
EDUCATOR-1555
 2017-11-08 00:18:50 +05:00
Feanil Patel
8d71b98a19 Merge pull request #16479 from edx/revert-16201-transcript-secure-credentials 
Revert "Transcript secure credentials"
 2017-11-07 14:04:34 -05:00
Feanil Patel
9a35a5439e Revert "Transcript secure credentials" 2017-11-07 13:07:32 -05:00
Jeremy Bowman
c2daef61d5 Merge pull request #16471 from edx/jmbowman/upgrade-django-cors-headers 
Upgrade django-cors-headers for Django 1.11 support
 2017-11-07 11:46:54 -05:00
bmedx
ffc2a0eb7c common urls cleanup for Django 1.11 
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
 2017-11-07 11:27:20 -05:00
Gabe Mulley
cfaf45054d Merge pull request #16476 from edx/mulby/ace-bidi 
rtl support for ACE emails
 2017-11-07 10:56:43 -05:00
Jeremy Bowman
1f1ad26137 Merge pull request #16465 from edx/jmbowman/PLAT-1774 
PLAT-1774 Move x_module monkey-patching
 2017-11-07 10:34:44 -05:00
Michael Youngstrom
70feb4cd11 Merge pull request #16469 from edx/youngstrom/lettuce_db_cache 
Update lettuce and bok-choy db caches
 2017-11-07 09:59:56 -05:00
Alex Dusenbery
fedf35c36e EDUCATOR-1572 | Send an ACE message to thread author when new comment signal is received. 2017-11-07 09:40:04 -05:00
Gabe Mulley
f6adde3d45 rtl support for ACE emails 2017-11-07 09:33:50 -05:00
Eric Fischer
9920a3247e Merge pull request #16473 from edx/efischer/EDUCATOR-1685 
Fix for tex2jax \tag{} width issue
 2017-11-07 08:34:21 -05:00
Mushtaq Ali
093bdcb1f8 Merge pull request #16201 from edx/transcript-secure-credentials 
Transcript secure credentials
 2017-11-07 16:57:38 +05:00
Mushtaq Ali
9d40404206 Modify reset button and invalid credential error text 2017-11-07 13:18:59 +05:00
Mushtaq Ali
e89c3dd3ee Add cancel button, handle errors, change label texts - EDUCATOR-1584 2017-11-07 13:18:59 +05:00
Qubad786
2310614bb6 Save credentials in edx-video-pipeline 
EDUCATOR-1335 - This Adds a dedicated app which is responsible for communication with edx-video-pipeline service. It also adds the backend for saving 3rd party transcription service credentials on edx-video-pipline and cache it in edx-val.
 2017-11-07 13:18:58 +05:00
Mushtaq Ali
f3b9ea4311 Send transcript credentials data to backend 
Add Cielo Username

- EDUCATOR-1456
 2017-11-07 13:18:57 +05:00
Mushtaq Ali
6634b92c61 Transcript organization credentials UI - EDUCATOR-1126 2017-11-07 13:18:25 +05:00
Saleem Latif
958a26cb85 Merge pull request #16461 from edx/saleem-latif/ENT-711 
ENT-711: enterprise version upgrade to 0.53.11
 2017-11-07 12:57:10 +05:00
Michael Youngstrom
4fa386150f Update lettuce and bok choy cached db's 2017-11-06 17:40:12 -05:00
Gregory Martin
8089a0db41 Merge pull request #16452 from edx/yro/EDUCATOR-1554 
Yro/EDUCATOR 1554
 2017-11-06 17:24:05 -05:00
Brian Mesick
6a336c0c6f Merge pull request #16454 from edx/bmedx/django111_urls_lms_2 
LMS urls cleanup pt. 2
 2017-11-06 16:59:34 -05:00
Eric Fischer
69f81011c6 EDUCATOR-1685 Fix for tex2jax \tag{} width issue 
This prevents the library from applying an inline style that is much
too wide and breaks everything.
 2017-11-06 16:45:14 -05:00
Tyler Hallada
5332b6920f Merge pull request #16466 from edx/thallada/ret-fix-absolute-url 
Schedules: absolute_url returns given URL if already absolute
 2017-11-06 16:44:43 -05:00
Nimisha Asthagiri
e758e20a8b Merge pull request #16409 from edx/google-analytics-in-studio 
Course Week Highlights (Studio): adding Google Analytics tracking
 2017-11-06 16:44:07 -05:00
Clinton Blackburn
69eeca61d8 Opening courseware to anonymous users 
Anonymous users may now view units in the courseware. This access is limited to units that are not considered problems/graded (e.g. homework, exams).
 2017-11-06 16:42:06 -05:00
John Eskew
878d3eff6e Split signals.py from tasks.py file. 2017-11-06 16:41:05 -05:00
Gregory Martin
a990e1fee8 Add Paragon Implementation to Wiki 2017-11-06 16:33:46 -05:00
Nimisha Asthagiri
9a9ef198b2 Merge pull request #16447 from appsembler/omar/hide-library-button 
Hide the create library for non-staff users when DISABLE_COURSE_CREATION
 2017-11-06 16:12:44 -05:00
bmedx
11a4030767 LMS urls cleanup for Django 1.11 
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
- This is the second of several urls updates for LMS; a work in progress
 2017-11-06 16:06:00 -05:00
Nimisha Asthagiri
f61cbe75b5 Merge pull request #16455 from edx/pacing/highlights-email 
Schedule-based Highlights email update
 2017-11-06 15:35:35 -05:00
Clinton Blackburn
9782b40751 Updated override_waffle_flag to work as a context manager 
override_waffle_flag can now be used as a context manager in addition to its previous role as a decorator. Additionally, the tests have been updated to use standard assertions since we now use py.test.
 2017-11-06 15:32:12 -05:00
sandroroux
82aa1654f8 Added Google Analytics tracking to the Highlights Modal's save and cancel buttons 
Added tracking to 'Enter Section Highlights' link.
 2017-11-06 15:32:02 -05:00
Harry Rein
bdde858779 Merge pull request #16470 from edx/HarryRein/hotfix-course-tabs-too-long 
Issue with long course tab name styling.
 2017-11-06 15:23:26 -05:00
Matt Tuchfarber
166d784dd5 Merge pull request #16453 from edx/tuchfarber/more_program_marketing 
Make program marketing dynamic and less 500-prone.
 2017-11-06 15:07:43 -05:00
Troy Sankey
c4c1e7eb80 Merge pull request #16467 from edx/pwnage101/django_comment_client_mgmt_cleanup 
django_comment_client management command cleanup for Django 1.11
 2017-11-06 14:48:49 -05:00
Jeremy Bowman
fe7fb0a874 Upgrade django-cors-headers for Django 1.11 support 2017-11-06 14:47:22 -05:00
Eric Fischer
ae0854b09f Merge pull request #16468 from edx/efischer/edu-1635 
Log Role Creation
 2017-11-06 14:45:52 -05:00
Nimisha Asthagiri
98e647fa24 Schedule-based Highlights email update 2017-11-06 14:30:28 -05:00
Harry Rein
263a227999 Issue with long course tab name styling. 2017-11-06 14:27:39 -05:00
Harry Rein
51459d3333 Merge pull request #16444 from edx/responsive-header-cleanup 
Cleaning up mobile web.
 2017-11-06 14:17:53 -05:00