Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
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
Albert St. Aubin
6cdcf8e9b8 Discussion group moderation 2017-07-06 13:39:03 -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
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
52e28d91fa Implementing connection timeout for sailthru api call. 
LEARNER-1186
 2017-07-06 14:54:19 +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
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
Matjaz Gregoric
c448426cd3 Add chromeless class to the wrapper when in chromeless mode. 
This makes it easier for CSS rules to target chromeless mode. This is
useful for xblocks which want to use some CSS tweaks specific to the
chromeless view.
 2017-07-06 09:18:57 +02: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
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
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
bmedx
705a68b212 Upgrade django-ratelimit-backend to 1.1.1 2017-07-05 10:14:59 -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
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
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
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
Jeremy Bowman
353b4c4f67 PLAT-1499 Use appropriate default settings in Docker devstack 2017-07-03 12:04:27 -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
Robert Raposa
b370fe2314 Part II: Rename xss linter. 2017-06-30 13:20:23 -04:00
Robert Raposa
a087ce4854 Merge pull request #15416 from edx/robrap/LEARNER-1604-waffle-default 
LEARNER-1604: Change default and refactor old unified_course_view flag.
 2017-06-29 15:37:38 -04:00
Gregory Martin
8543a7504f Merge pull request #15411 from edx/yro/fire-certs-on-pass 
Enqueue Generate Certs Task on Passing Grade
 2017-06-29 15:29:26 -04:00
Sven Marnach
1d8d44eedb Merge pull request #15223 from proversity-org/proversity/pr-add-invitation-only-field-to-course-serializer 
Add invitation_only field to course serializer
 2017-06-29 20:32:56 +02:00
Gregory Martin
b9425c5b5c Implement signal/handler for learner passing grades 2017-06-29 14:16:06 -04:00
Ned Batchelder
bf0f7ce704 Merge pull request #15433 from edx/nedbat/pedantic-footer-2 
Correct spelling of 'Open edX', and pedantic typography in the copyright footer
 2017-06-29 12:15:14 -04:00
Sanford Student
86eca26aa0 EDUCATOR-778: prefetched visible blocks 2017-06-29 12:09:22 -04:00
Robert Raposa
2e80c1e66b Refactor, enhance, and adjust unified_course_view flag. 
This includes several general enhancement in addition
to the fixes for unified_course_view:
1. Add support for default when no waffle flag defined.
2. Add support for table_blacklist to assertNumQueries.
3. Rename flag to 'course_experience.course_outline_page'.
4. Change flag default to True when it is not defined.
 2017-06-29 11:04:35 -04:00
Jeremy Bowman
d311a83474 Merge pull request #15427 from edx/jmbowman/PLAT-1610 
PLAT-1610 Fix social auth config error in Docker bok-choy tests
 2017-06-29 10:32:48 -04:00
Ned Batchelder
01018ec418 Correct spelling of 'Open edX', and pedantic typography in the copyright footer 2017-06-29 10:22:38 -04:00
Jose Antonio Gonzalez
aca096138b add invitation_only field to course serializer 2017-06-29 16:08:58 +02:00