Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,716 Commits 1 Branch 0 Tags
52e28d91fa2d9411e4e2ad4fe612cb47d07c4307
Commit Graph

41716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Christina Roberts
224606bd97 Merge pull request #15392 from open-craft/smarnach/notify-default 
Add flag to configure whether "Notify users by email" is checked by default.
 2017-07-05 11:32:39 -04:00
Clinton Blackburn
e1312b3812 Updated Django Waffle to 0.12.0 2017-07-05 11:30:02 -04:00
Christina Roberts
bcb610f7dd Merge pull request #15434 from pepeportela/teltek/external_help_button_shape 
Keep button shape for long strings
 2017-07-05 11:28:59 -04:00
bmedx
705a68b212 Upgrade django-ratelimit-backend to 1.1.1 2017-07-05 10:14:59 -04:00
Robert Raposa
cbcc8d4d18 Reduce xss thresholds. 2017-07-05 10:12:26 -04:00
Aamish Baloch
ac45850d15 YONK-691: Configurable profile image sizes 2017-07-05 18:50:01 +05:00
David Ormsbee
b0abd5b02a Merge pull request #15461 from edx/ormsbee/snb_devplus 
Removed old (unused) devplus.py env for LMS.
 2017-07-05 09:19:24 -04:00
M. Rehan
378f05622b Merge pull request #15463 from edx/mrehan/set-val-yt-id-on-save 
Override video xmodule's youtube id with the id coming from val YT profile
 2017-07-05 18:08:26 +05:00
Qubad786
acfa80a663 Override video's youtube_id_1_0 with val yt id on save. 2017-07-05 14:58:13 +05:00
Sven Marnach
7ac436c28e Add flag to configure whether "Notify users by email" is checked by default. 2017-07-05 11:19:02 +02:00
Andy Armstrong
a6392e514a Merge pull request #15415 from edx/andya/use-edx-bootstrap 
Implement a skeleton page with Bootstrap
 2017-07-04 18:29:13 -04:00
Harry Rein
7ea3b013ad Style LMS header, footer and nav for Bootstrap. 2017-07-04 17:24:12 -04:00
Andy Armstrong
3cd985da20 Implement a skeleton page with Bootstrap 
LEARNER-1174
 2017-07-04 15:55:06 -04:00
David Ormsbee
3e2520396d Removed old (unused) devplus.py env for LMS. 
This used to be where we enabled some prod-like features on the dev
environment, but it's horribly out of date (it actually predates
the vagrant-based devstack).
 2017-07-04 08:00:02 -04:00
Ibrahim Ahmed
c6e085173d Merge pull request #15460 from edx/ibrahimahmed443/WL-1088 
Do not capitalize words in start button
 2017-07-04 15:53:49 +05:00
Afzal Wali Naushahi
f4da106e36 Merge pull request #15334 from edx/afzaledx/Learner-1146 
Learner-1146
 2017-07-04 15:17:38 +05:00
Ibrahim
90d0a3637c Do not capitalize words in start button 2017-07-04 14:59:39 +05:00
Afzal Wali
383208c4c8 multitenant Program cache. 
Fetched Programs and Program details from Course Discovery service for all sites and stored the uuids in cache with site-specfic keys.
Learner-1146
 2017-07-04 14:20:55 +05:00
Diana Huang
51fc7b73bf Merge pull request #15457 from edx/diana/replace-updates-urls 
Replace urls in html updates.
 2017-07-03 16:05:51 -04:00
Kevin Falcone
ea7b14eba3 Merge pull request #15455 from edx/jibsheet/bump-newrelic 
Bump up the NewRelic plugin version
 2017-07-03 15:20:25 -04:00
Diana Huang
378b1f86c6 Replace urls in plan html updates. 2017-07-03 15:03:29 -04:00
Kevin Falcone
0c4fa745bd Bump up the NewRelic plugin version 
Most bugfixes are python3 or Tornado specific, but several releate
to Django 1.10 and they improved transaction traces since we last
updated.

https://docs.newrelic.com/docs/release-notes/agent-release-notes/python-release-notes/python-agent-286370
 2017-07-03 12:55:54 -04:00
Jeremy Bowman
353b4c4f67 PLAT-1499 Use appropriate default settings in Docker devstack 2017-07-03 12:04:27 -04:00
Jesse Shapiro
8838162abb Merge pull request #15453 from open-craft/haikuginger/fix-failing-catalog-integration-tests 
[ENT-457] Fix failing course_mode tests
 2017-07-03 12:03:07 -04:00
Jesse Shapiro
add01fdfab Specify catalog URL to configure 2017-07-03 10:48:11 -04:00
Ibrahim Ahmed
2bb7a9fdb9 Merge pull request #15442 from edx/ibrahimahmed443/WL-1087-video-issue 
fix issue where video modal is not closed by clicking outside the video
 2017-07-03 19:26:43 +05:00
Ibrahim
33f9c46e1b fix issue where video modal is not closed by clicking outside the video 2017-07-03 17:20:21 +05:00
Robert Raposa
a864b450a8 Merge pull request #15436 from edx/robrap/rename-xss-linter 
Rename xss linter.
 2017-06-30 16:22:38 -04:00
Kevin Falcone
9329a5e3f0 Merge pull request #15440 from edx/jibsheet/tweak-video-upload-pipeline-s3-access 
Change to validate=False which emulates django-storages
 2017-06-30 14:19:23 -04:00
Jesse Shapiro
e408feffb8 Merge pull request #15400 from open-craft/haikuginger/enterprise_audit_enrollment 
[ENT-457] Create EnterpriseCourseEnrollment when enrolling via Track Selection page
 2017-06-30 13:22:17 -04:00
Robert Raposa
b370fe2314 Part II: Rename xss linter. 2017-06-30 13:20:23 -04:00