Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,855 Commits 1 Branch 0 Tags
a466b437f6d746701ac46d79cd86ceeeaa271bf4
Commit Graph

7399 Commits

Author SHA1 Message Date
Adam
64372dd53e Merge pull request #13038 from OmarIthawi/edraak/bulk-email-from-addr 
Translatable bulk_email from Address based on platform`s default lang
 2017-04-20 10:29:59 -04:00
Noraiz Anwar
c1b148dd74 Merge pull request #14916 from edx/noraiz/TNL-6837 
TNL-6837 ORAs and Drag and Drop not supported in libraries, remove both from problem types in studio
 2017-04-20 19:20:55 +05:00
noraiz-anwar
074900632a ORAs and Drag and Drop not supported in libraries, remove both from problem types in studio 2017-04-20 18:27:13 +05:00
Eric Fischer
7e368e10f7 Merge pull request #14913 from edx/efischer/rekill 
Re-kill ICRV block
 2017-04-19 16:48:33 -04:00
Eric Fischer
5c26acc115 Re-kill ICRV block 
This reverts commit 1224e341de. I've also added
NotImplementedPartitionScheme, which allows deprecated partition types to have
a valid entry point despite being unusable.

TNL-6675
 2017-04-19 15:55:13 -04:00
cahrens
5e14a35607 Change "Choose one" to "Select a group type". 2017-04-19 14:32:44 -04:00
Christina Roberts
5599a4513d Merge pull request #14803 from edx/aj/TNL-6743_GroupConfigEnrollmentPartition 
Aj/tnl 6743 group config enrollment partition
 2017-04-19 14:27:06 -04:00
Albert St. Aubin
59c6218885 Show Enrollment Tracks in Group Configurations. 
TNL-6743
 2017-04-19 12:35:15 -04:00
Cliff Dyer
28d36b5276 Merge pull request #14813 from edx/neem/backfill-problem-completion 
Estimate first_attempted for grades.
 2017-04-19 09:36:10 -04:00
Eugeny Kolpakov
e03b3914f8 Merge pull request #14737 from open-craft/mit-capa-hide-correct 
MIT CAPA improvements: Add show_correctness field
 2017-04-19 07:03:46 +08:00
J. Cliff Dyer
4f6d5d9ce9 Estimate creation time for subsections grades based on timestamp of 
incoming scores.

TNL-6697
 2017-04-18 16:51:17 -04:00
Christina Roberts
529df7c6d9 Merge pull request #14863 from edx/christina/tnl-6746 
Show messages about component visibility.
 2017-04-18 14:53:58 -04:00
Clinton Blackburn
792d134de5 Added Studio test settings for Docker devstack 2017-04-18 10:11:35 -04:00
Clinton Blackburn
1edfd795fb Cloning additional data when re-running a course 
Re-running a course now clones the OrganizationCourse and RestrictedCourse data from the old run to the new run. This will allow administrators to avoid the tedium of manually recreating this data.
 2017-04-18 10:11:35 -04:00
Jillian Vogel
f18a2be837 Implement optional hiding of capa assessment results 2017-04-13 15:52:57 -07:00
cahrens
6e416310b9 Show messages about component visibility. 
TNL-6746
 2017-04-13 11:33:57 -04:00
Ned Batchelder
d3ddb2ae68 Merge pull request #14857 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-04-11 14:13:10 -04:00
Dennis Jen
02f6715075 Merge pull request #14853 from edx/dsjen/update-mathjax-cdn 
Update mathjax CDN to cloudflare.
 2017-04-11 13:50:10 -04:00
Ned Batchelder
babf349f87 Update translations (autogenerated message) 2017-04-11 15:12:19 +00:00
Clinton Blackburn
1ff2be0d93 Removed unnecessary Studio settings for Docker devstack 2017-04-10 18:01:39 -04:00
Dennis Jen
f90b80da62 Update mathjax CDN to cloudflare. 2017-04-10 19:52:35 +00:00
Jeremy Bowman
871c931065 Merge pull request #14648 from edx/iivic/fix-get-xblock-settings 
Fix get xblock settings
 2017-04-06 10:17:58 -04:00
Christina Roberts
15ab2b6be7 Merge pull request #14798 from edx/christina/tnl-6744 
Add Enrollment tracks to component visibility dialog
 2017-04-05 12:10:56 -04:00
cahrens
dbae1e397d Add ability to set visibility by enrollment track. 
TNL-6744
 2017-04-05 11:05:31 -04:00
iivic
49c3f20a15 Fix getting xblock settings in studio edit modal 2017-04-05 14:44:41 +00:00
Omar Al-Ithawi
8fe16541c0 Update the tip for the course language field 2017-04-05 16:48:53 +03:00
Mushtaq Ali
0bede12821 Fix multiple copies of components on discard changing a move operation - TNL-6670 2017-04-04 16:53:35 +05:00
asadiqbal
ed33d3b09f ENT-287 Track Selection: Enterprise messaging only for catalog courses 2017-03-31 16:54:16 +05:00
cahrens
e5035746bf Introduce EnrollmentTrackUserPartition. 
TNL-6674
 2017-03-30 12:24:48 -04:00
Ned Batchelder
bca2db88ce Update translations (autogenerated message) 2017-03-30 11:00:31 +00:00
Mushtaq Ali
d4c6f9fad2 Merge pull request #14748 from edx/mushtaq/fix-group-id 
Make matching group ID condition be more specific
 2017-03-30 11:46:10 +05:00
Mushtaq Ali
6b9f853ccf make matching group ID condition be more specific 2017-03-29 19:19:50 +05:00
Nimisha Asthagiri
b1b950c6e6 Merge pull request #14770 from edx/neem/waffle-utils 
Waffle Switch with namespacing and request caching
 2017-03-28 20:07:50 -04:00
Nimisha Asthagiri
4ac78706a3 Waffle Switch with namespacing and request caching 2017-03-28 17:49:20 -04:00
Jillian Vogel
9660e13221 Adds ENTERPRISE_ENROLLMENT_API_URL to cms.envs.common 
Fixes migration error thrown by edxapp-migrate-cms
 2017-03-25 19:29:07 +10:30
Nimisha Asthagiri
e83182c743 Have generate_course_blocks pass with_storage option to celery tasks 2017-03-20 16:22:44 -04:00
M. Rehan
dd6b203cf0 Merge pull request #14664 from edx/mrehan/prioritize-youtube-subs-over-html5-on-save 
TNL-6539 – Prioritize youtube subs over html5 ones
 2017-03-17 12:23:06 +05:00
Ned Batchelder
73850f4627 Update translations (autogenerated message) 2017-03-16 14:07:42 -04:00
Ned Batchelder
75cb211cbe Update translations (autogenerated message) 2017-03-16 14:07:41 -04:00
Qubad786
0ff62e766e prioritize youtube transcripts over html5 ones 2017-03-16 14:38:51 +05:00
David Ormsbee
294bbe7fe0 Test speedup: Monkey patch Kombu entrypoints fn. 
We monkey patch Kombu's entrypoints listing because scanning through
this accounts for the majority of LMS/Studio startup time for tests,
and we don't use custom Kombu serializers (which is what this is for).
Still, this is pretty evil, and should be taken out when we update
Celery to the next version where it looks like this method of custom
serialization has been removed.

FWIW, this is identical behavior to what happens in Kombu if
pkg_resources isn't available.
 2017-03-14 13:45:40 -04:00
Mushtaq Ali
40621b6cc2 Merge pull request #14315 from edx/mushtaq/move-component 
Move a component
 2017-03-14 12:58:20 +05:00
Jeremy Bowman
8d36c3825c PLAT-1121 Export courses asynchronously 2017-03-13 09:00:11 -04:00
Clinton Blackburn
4cc7628696 Upgraded to Python Social Auth 0.2.21 to resolve migration issue 2017-03-10 23:06:02 -05:00
Mushtaq Ali
cb2d78bf34 Add logging on move xblock 
Add i18n to backend error messages in case they appear to end user
Remove success banner when trying to publish or discard changes on container page
 2017-03-10 19:25:03 +05:00
Ned Batchelder
7d7f17a3b3 Merge pull request #14663 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-03-09 14:03:09 -05:00
Ned Batchelder
9d9266f1c5 Update translations (autogenerated message) 2017-03-09 16:17:10 +00:00
Albert (AJ) St. Aubin
ee68726bf2 Merge pull request #14655 from edx/aj/fix_cms_style_bug 
Update to Studio style for recent capa action bar style changes
 2017-03-09 08:42:15 -05:00
Ned Batchelder
15a4fc420a Update translations (autogenerated message) 2017-03-09 12:08:25 +00:00
Calen Pennington
0c30c06a78 Merge pull request #14656 from edx/release-mergeback-to-master 
Merge release back to master
 2017-03-08 15:23:50 -05:00