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

41731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ibrahim
d3b68dc173 remove the word Institutions if there is no authoring organization 
WL-1083
 2017-07-04 17:20:25 +05: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