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

7420 Commits

Author SHA1 Message Date
attiyaishaque
a5ab60aa53 EDUCATOR-146 Move button will not be shown on Pages page. 2017-05-03 18:38:34 +05:00
Omar Al-Ithawi
ad4e3d50a5 Allow uploading subtitles with unicode filenames 2017-05-02 10:53:58 +03:00
Brian Jacobel
a2323797f5 Work on sandbox bundling for webpack 2017-05-01 17:09:32 -04:00
Calen Pennington
3deb3a3c1b Merge pull request #14977 from cpennington/cale/fix-learner-542 
Cale/fix learner 542
 2017-05-01 12:18:03 -04:00
Ned Batchelder
ecce0f1513 Merge pull request #14996 from edx/nedbat/remove-useless-super-delegation 
Remove a number of unneeded super()-delegation methods
 2017-04-28 13:04:43 -04:00
Qubad786
4b2488b5ee Add config models and a configuration service to configure LTI Consumer. 2017-04-28 15:59:23 +05:00
Ned Batchelder
4a568476fd Remove a number of unneeded super()-delegation methods 2017-04-27 14:12:56 -04:00
Calen Pennington
33fee20c3a Reapply "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 65f13ddec4.
 2017-04-27 09:25:02 -04:00
Ned Batchelder
44dd7be5b6 Update translations (autogenerated message) 2017-04-27 12:16:29 +00:00
edx-pipeline-bot
38c0fbd638 Merge pull request #14975 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-26 15:29:32 -04:00
Calen Pennington
65f13ddec4 Revert "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 88dd85caec, reversing
changes made to bf8aef33fc.
 2017-04-26 11:29:56 -04:00
Albert (AJ) St. Aubin
0df079a9c6 Merge pull request #13026 from OmarIthawi/edraak/goup-config-rtl 
Major RTL refactor for the group configuration in Studio
 2017-04-26 09:19:31 -04:00
Calen Pennington
f8b050a5d8 Put LANGUAGE_COOKIE into settings 2017-04-24 13:03:17 -04:00
Omar Al-Ithawi
94efb3792f Major RTL refactor for the group configuration in Studio 2017-04-22 11:53:39 +03:00
Asad Iqbal
7493c11ec2 Merge pull request #14890 from edx/asadiqbal08/ENT-188 
ENT-188 Enterprise Learner support requests from LMS to Zendesk queue
 2017-04-21 17:22:42 +05:00
asadiqbal
8cea65b2d7 ENT-188 2017-04-21 16:30:23 +05:00
Muhammad Ammar
c3d0a50d42 Merge pull request #14514 from edx/ammar/tnl-6513-frontend-hls-support 
HLS playback support in video player
 2017-04-21 12:38:11 +05:00
Clinton Blackburn
163c71e8c4 Updated CREDENTIALS_SERVICE_USERNAME setting for Docker-based devstack 2017-04-20 14:57:22 -04:00
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
Qubad786
b2cfad1650 Add Configuration Models for HLS Playback Feature. 2017-04-20 16:35:46 +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
muhammad-ammar
cc330a8c25 disable hls profile 2017-04-13 14:51:42 +05:00
muhammad-ammar
6f2a2b445f add HLS playback support in video player 
TNL-6513
 2017-04-13 14:20:47 +05: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