Simon Chen
|
82a7a79264
|
Update the admin table to allow the insert of course cert settings LEARNER-1787
|
2017-07-07 16:05:26 -04:00 |
|
Brian Mesick
|
32618fa0f5
|
Merge pull request #15495 from edx/bmedx/admin-site-register-PLAT-1631
Ensure User model is unregistered before registering with Django admin
|
2017-07-07 14:36:10 -04:00 |
|
Renzo Lucioni
|
292502babf
|
Switch to forks of certain third-party repos
|
2017-07-07 13:40:13 -04:00 |
|
Andy Armstrong
|
7077ea0601
|
Merge pull request #15497 from edx/andya/fix-styling-bug
Fix styling on non-Bootstrap pages
|
2017-07-07 13:30:41 -04:00 |
|
Andy Armstrong
|
f137c75ed5
|
Merge pull request #15496 from edx/andya/fix-modal-issue
Remove modal that started appearing on the LMS
|
2017-07-07 12:36:23 -04:00 |
|
Andy Armstrong
|
71baa6af0e
|
Fix styling on non-Bootstrap pages
LEARNER-1798
|
2017-07-07 12:12:35 -04:00 |
|
Dennis Jen
|
2b261b5ca7
|
Merge pull request #15458 from edx/dsjen/upgrade-proctoring-django-111
Upgrade proctoring (supports django 1.11)
|
2017-07-07 12:05:03 -04:00 |
|
Eric Fischer
|
94f5ccbb85
|
Merge pull request #15488 from edx/edx-ora2/rc
edx-ora2 1.4.4 release
|
2017-07-07 11:48:46 -04:00 |
|
Andy Armstrong
|
a113ab51d9
|
Removed unused accessible_modal template
|
2017-07-07 11:37:53 -04:00 |
|
bmedx
|
cfb53a3526
|
Ensure User model is unregistered before registering with Django admin
- PLAT-1631
|
2017-07-07 11:02:53 -04:00 |
|
Ned Batchelder
|
48767b31c5
|
Merge pull request #15492 from edx/nedbat/use-hashes
Use commit hashes for certain third-party repos
|
2017-07-07 09:47:21 -04:00 |
|
Ibrahim Ahmed
|
0f759e1c01
|
Merge pull request #15491 from edx/revert-15462-ibrahimahmed443/WL-1083-remove-institutions
Revert "remove the word Institutions if there is no authoring organization"
|
2017-07-07 17:01:35 +05:00 |
|
Ned Batchelder
|
fdd974ddbd
|
Use commit hashes for certain third-party repos
|
2017-07-07 07:15:04 -04:00 |
|
Ibrahim Ahmed
|
4ec9563806
|
Revert "remove the word Institutions if there is no authoring organization"
|
2017-07-07 15:45:26 +05:00 |
|
Eric Fischer
|
577d44b0db
|
edx-ora2 1.4.4
|
2017-07-06 16:41:31 -04:00 |
|
Dennis Jen
|
19c4d799e1
|
Upgrade proctoring (supports django 1.11)
|
2017-07-06 16:29:47 -04:00 |
|
Brian Mesick
|
15e66949b9
|
Merge pull request #15487 from edx/revert-15469-bmedx/django_1.11_upgrade_ratelimit_backend_PLAT-1482
Revert "Upgrade django-ratelimit-backend to 1.1.1"
|
2017-07-06 16:21:28 -04:00 |
|
Brian Mesick
|
af43d08b22
|
Revert "Upgrade django-ratelimit-backend to 1.1.1"
|
2017-07-06 16:18:02 -04:00 |
|
Ned Batchelder
|
0023986551
|
Merge pull request #15481 from edx/nedbat/update-translations
Update translations (autogenerated message)
|
2017-07-06 15:00:59 -04:00 |
|
Harry Rein
|
b979c871a7
|
Merge pull request #15486 from edx/HarryRein/LEARNER-1783
Fixing naming issue in edx.org theme.
|
2017-07-06 14:13:15 -04:00 |
|
Douglas Hall
|
a00d9ad37c
|
Merge pull request #15484 from edx/afzaledx/LEARNER-1146-patch
Put the program_types filter under the waffle switch
|
2017-07-06 13:58:43 -04:00 |
|
Afzal Wali
|
b8a310d54b
|
Put the program_types filter under the waffle switch
|
2017-07-06 13:12:43 -04:00 |
|
Harry Rein
|
17fc310026
|
Fixing naming issue in edx.org theme.
|
2017-07-06 13:07:00 -04:00 |
|
Christina Roberts
|
8fb8647473
|
Merge pull request #15360 from open-craft/replaceafill/aws_with_filesystem_storage_tested
Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module
|
2017-07-06 12:36:56 -04:00 |
|
Robert Raposa
|
0b7ace2952
|
Merge pull request #15478 from edx/ubc-add-lti-consumer-module-to-rest-endpoints
Add lti consumer xblock modules to LTI REST endpoints
|
2017-07-06 11:47:37 -04:00 |
|
Ned Batchelder
|
5c4ece2968
|
Update translations (autogenerated message)
|
2017-07-06 15:17:35 +00:00 |
|
Pan Luo
|
4db8c7a758
|
Add lti consumer xblock modules to LTI REST endpoints
This allows LTI consumer xblock modules being hocked into get_course_lti_endpoints for
discovering LTI result/outcome endpoints.
|
2017-07-06 10:41:46 -04:00 |
|
Ibrahim Ahmed
|
f6ad15bb59
|
Merge pull request #15462 from edx/ibrahimahmed443/WL-1083-remove-institutions
remove the word Institutions if there is no authoring organization
|
2017-07-06 17:53:42 +05:00 |
|
George Song
|
487895fb21
|
Merge pull request #14862 from replaceafill/default_discussion_topic
Default discussion topic
|
2017-07-06 05:25:43 -07:00 |
|
adeel khan
|
ec787a9963
|
Merge pull request #15332 from edx/adeel/LEARNER-1188_Setting_connection_timeout_value_for_sailthru_api_call
Implementing connection timeout for sailthru api call.
|
2017-07-06 15:58:23 +05:00 |
|
Adeel Khan
|
52e28d91fa
|
Implementing connection timeout for sailthru api call.
LEARNER-1186
|
2017-07-06 14:54:19 +05:00 |
|
Mushtaq Ali
|
95b3055f66
|
Merge pull request #15178 from edx/course-video-image
Course video image
|
2017-07-06 13:38:18 +05:00 |
|
Mushtaq Ali
|
d2b420a9a5
|
Change opacity and user messages
|
2017-07-06 12:35:07 +05:00 |
|
Qubad786
|
556213659b
|
Add waffle switch to toggle video thumbnail feature.
|
2017-07-06 12:35:07 +05:00 |
|
Mushtaq Ali
|
eabfba48a2
|
Change video image requirements text hover - EDUCATOR-577
|
2017-07-06 12:35:06 +05:00 |
|
Mushtaq Ali
|
9750cd2ab1
|
Video Uploads Cleanup - Replace table grid layout with div grid layout and do related adjustments - EDUCATOR-562
|
2017-07-06 12:35:06 +05:00 |
|
Mushtaq Ali
|
7bf717f75d
|
Add video image settings to aws settings so that lms can pull values from lms.env.json
|
2017-07-06 12:35:06 +05:00 |
|
Mushtaq Ali
|
cf6200cbb3
|
Add frontend video image validations - EDUCATOR-447
|
2017-07-06 12:35:05 +05:00 |
|
Mushtaq Ali
|
e8fee2e09a
|
Add backend video image validations - EDUCATOR-45
|
2017-07-06 12:35:05 +05:00 |
|
muhammad-ammar
|
626f2896a0
|
add video poster support
EDUCATOR-44
|
2017-07-06 12:35:05 +05:00 |
|
muhammad-ammar
|
763f0051bd
|
video thumbnail ui
|
2017-07-06 12:35:04 +05:00 |
|
Muhammad Ammar
|
dca12d65c2
|
Save or update course video image - TNL-6762
|
2017-07-06 12:35:00 +05:00 |
|
Aamish Baloch
|
7b91095398
|
Merge pull request #15467 from edx/aamishbaloch/YONK-691
YONK-691: Configurable profile image sizes
|
2017-07-06 12:09:16 +05:00 |
|
Tasawer Nawaz
|
bba596728a
|
Merge pull request #15450 from edx/tasawer/learner-1710-fix-dashboard-HttPClientError
Fix 500 error on learner dashboard
|
2017-07-06 08:29:10 +05:00 |
|
Douglas Cerna
|
eacc4bc138
|
Allow to set the default topic for new Discussion posts
|
2017-07-05 20:26:32 -06:00 |
|
Brian Mesick
|
bc485ea580
|
Merge pull request #15469 from edx/bmedx/django_1.11_upgrade_ratelimit_backend_PLAT-1482
Upgrade django-ratelimit-backend to 1.1.1
|
2017-07-05 16:54:49 -04:00 |
|
Jeremy Bowman
|
e4c8ff3aa4
|
Merge pull request #15445 from edx/jmbowman/PLAT-1499
PLAT-1499 Use appropriate default settings in Docker devstack
|
2017-07-05 13:22:14 -04:00 |
|
tasawernawaz
|
a7b2009566
|
Fix 500 error on learner dashboard
LEARNER-1710
|
2017-07-05 21:44:43 +05:00 |
|
bmedx
|
d6d7fcaf4f
|
Fix NotRegistered error when running makemigrations
|
2017-07-05 12:28:22 -04:00 |
|
Robert Raposa
|
eff621b7ba
|
Merge pull request #15468 from edx/robrap/reduce-thresholds
Reduce xss thresholds.
|
2017-07-05 11:56:37 -04:00 |
|