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

6389 Commits

Author SHA1 Message Date
Eric Fischer
36f05c860c Applying security patch 
Applying a security patch from last week that has made its way through
the disclosure period already. FYI @robrap
 2015-11-02 09:37:22 -05:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams 
Timed Exams
 2015-10-30 11:03:59 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
Christina Roberts
3382a955c9 Merge pull request #10378 from edx/christina/fix-mathjax-preview 
Disable Fast Preview for version 2.5.
 2015-10-29 12:41:30 -04:00
cahrens
deb4e35f92 Disable Fast Preview for version 2.5. 
Except for the Discussion Tab.
TNL-3693, TNL-3365
 2015-10-29 11:56:08 -04:00
David Ormsbee
87ded08d49 Merge pull request #10389 from edx/mobile/handler-url 
Changes to handler URL generation
 2015-10-29 11:39:35 -04:00
Peter Fogg
d9751a855a Merge pull request #10404 from edx/feature/self-paced 
Enable self-paced courses.
 2015-10-28 20:46:35 -04:00
Peter Fogg
505b2aa4d9 Disable setting course pacing during course run. 
Also adds improved styling for course pacing settings, and unit tests
around query counts for self-paced courses.

ECOM-2650
 2015-10-28 16:44:36 -04:00
Peter Fogg
5ffa06bed1 Responding to review comments. 2015-10-28 16:44:36 -04:00
Carol Tong
9d7a2bc97b Merge pull request #10379 from edx/carol/doc/DOC-2372 
TNL-3697/DOC-2372 Modify "Manage Users" template to indicate that course team members are not automatically enrolled in courses
 2015-10-28 15:34:59 -04:00
Peter Fogg
7f673604fb Allow setting self-paced on schedule & details page. 
Currently unstyled.

ECOM-2462
 2015-10-28 14:33:11 -04:00
Peter Fogg
0107525d41 Enable self-paced courses behind a feature flag. 2015-10-28 14:33:11 -04:00
Peter Fogg
9d88bef117 Allow setting self_paced through course details endpoint. 
ECOM-2489
 2015-10-28 14:33:11 -04:00
Peter Fogg
15d77fda3f Hide due/release dates on course outline in Studio. 
ECOM-2443
 2015-10-28 14:33:11 -04:00
Peter Fogg
dc7f09fc0e Add self_paced field to course module. 2015-10-28 14:33:11 -04:00
David Ormsbee
9b88bdb072 Changes to handler URL generation 
* The LMS now also monkey-patches
  xmodule.x_module.descriptor_global_handler_url and
  xmodule.x_module.descriptor_global_local_resource_url so that we can
  get LMS XBlock URLs from the DescriptorSystem. That functionality is
  needed in the block transforms collect() phase for certain XModules
  like Video. For instance, say we want to generate the transcripts
  URLs. The collect phase is run asynchronously, without a user context.

* The URL handler monkey-patching is now done in the startup.py files
  for LMS and Studio. Studio used to do this in the import of
  cms/djangoapps/contentstore/views/item.py. This was mostly just
  because it seemed like a sane and consistent place to put it.

* LmsHandlerUrls was removed, its handler_url and local_resource_url
  methods were moved to be top level functions. The only reason that
  class existed seems to be to give a place to store course_id state,
  and that can now be derived from the block location.

* To avoid the Module -> Descriptor ProxyAttribute magic that we do
  (which explodes with an UndefinedContext error because there is no
  user involved), when examining the block's handler method in
  handler_url, I made a few changes:

** Check the .__class__ to see if the handler was defined, instead of the
   block itself.

** The above required me to relax the check for _is_xblock_handler on the
   function, since that will no longer be defined.

90% of this goes away when we kill XModules and do the refactoring we've
wanted to do for a while.
 2015-10-28 09:42:59 -04:00
Michael Frey
bb53cad0fa Merge pull request #10377 from edx/release 
Release
 2015-10-27 13:10:49 -04:00
Carol Tong
40d1a63343 TNL-3697/DOC-2372: modify Manage Users template to indicate that course 
team not automatically enrolled in course
 2015-10-27 11:05:23 -04:00
Matt Drayer
d39d0cf55b Merge pull request #10370 from edx/asadiqbal08/SOL-1312-text-update 
SOL-1312 nit clean
 2015-10-27 10:07:31 -04:00
Jim Abramson
edf09d84e9 Merge pull request #10350 from edx/jsa/ecom-2657 
Programs: added platform support package and configuration model.
 2015-10-27 09:10:23 -04:00
asadiqbal
b2497a5112 nit 2015-10-27 16:14:30 +05:00
cahrens
87f0df3501 Revert to version 2.4 of MathJax. 
TNL-3693
 2015-10-26 11:28:40 -04:00
Piotr Mitros
d3c6425af2 Add RateXBlock 2015-10-26 10:32:53 -04:00
Piotr Mitros
da709bbcb6 Merge pull request #8597 from edx/pmitros/RateXBlock 
XBlock for rating course content
 2015-10-26 10:06:36 -04:00
Matt Drayer
a2fa59cd4b Merge pull request #10308 from edx/ziafazal/SOL-1332 
SOL-1332: use a generic function to check if entrance_exam feature is enabled or not
 2015-10-26 09:46:22 -04:00
jsa
1bb29289f2 Programs: added platform support package and configuration model. 
ECOM-2657
 2015-10-25 21:30:26 -04:00
Clinton Blackburn
7c6a30f16d Failing startup if private settings fail to load 
Squashing private settings import errors leads to wasted developer time when developers expect settings to be in place, and they aren't. This change only loads private settings if the private.py file exists. If there is an error during the import of that file, the application will not start.

ECOM-2653
 2015-10-24 17:22:16 -04:00
Ben Patterson
1032d37271 Revert "Public Course Import/Export API (continued)" 2015-10-23 20:02:34 -04:00
Peter Pinch
e7708e5a04 Merge pull request #8942 from mitocw/bdero/import-export-reprise 
Public Course Import/Export API (continued)
 2015-10-23 15:03:38 -04:00
Matt Drayer
5c1789006d Merge pull request #10291 from edx/asadiqbal08/SOL-1312-solution 
SOL-1312 changes
 2015-10-23 12:00:35 -04:00
Andy Armstrong
054aa95b26 Allow non-public XBlock assets in debug mode 2015-10-22 11:09:02 -04:00
Zia Fazal
9bb6f6e88d use a generic function check if entrance_exam is enabled or not 2015-10-22 16:45:19 +05:00
asadiqbal
0f394656c9 SOL-1312 changes 2015-10-21 20:50:28 +05:00
Matt Drayer
5ed97e90f3 Merge pull request #10248 from edx/ziafazal/SOL-1319 
SOL-1319: removed  entrance exam dependency on ENABLE_MKTG_SITE
 2015-10-21 10:16:56 -04:00
Christina Roberts
125930cf59 Merge pull request #10223 from edx/christina/upgrade-mathjax 
Upgrade to MathJax 2.5.
 2015-10-21 09:44:44 -04:00
Renzo Lucioni
99e6cab282 Merge pull request #10253 from edx/renzo/studio-entity-plugins 
Groundwork for Studio extensibility
 2015-10-21 09:19:17 -04:00
Zia Fazal
80abf159ee removed entrance exam dependency on ENABLE_MKTG_SITE 
changes after feedback from Matt D

set default value of entrance_exams feature flags to false
 2015-10-21 15:21:26 +05:00
Renzo Lucioni
32460a990e Groundwork for Studio extensibility 
Implement a Studio tab plugin manager, define a namespace for Studio tab plugins, and introduce an abstract base class used to represent Studio tabs. This does not introduce changes required to inject such plugins into the Studio UI. ECOM-2187.
 2015-10-20 14:57:33 -04:00
cahrens
90b61f8ef8 Upgrade to MathJax 2.5. 
TNL-3495
 2015-10-20 11:54:09 -04:00
Piotr Mitros
ba3ac72c4a Add RateXBlock 2015-10-19 15:49:55 -04:00
Adam
ab78069a33 Merge pull request #10246 from edx/merge-release-into-master 
Merge release into master
 2015-10-19 11:13:49 -05:00
Matt Drayer
1eab25f292 mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations 
* Fix paver violations to stablize edx-lint update
* Parens, Line2Long
* Fix missing docstrings
* Fix PEP8 issues
* Address PR feedback (thanks @nedbat!)
 2015-10-19 10:11:59 -04:00
Matt Drayer
c30960cc85 Merge pull request #10215 from edx/ziafazal/SOL-1317 
SOL-1317: check MILESTONES_APP also when checking prerequisite courses enabled
 2015-10-19 09:47:20 -04:00
Adam Palay
9b3841f62c Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html
 2015-10-19 08:35:33 -05:00
Zia Fazal
0f637fdc95 check MILESTONES_APP when checking prerequisite courses enabled 2015-10-16 12:53:55 +05:00
Saleem Latif
5f766f3806 Changes after testing on staging 2015-10-16 10:19:43 +05:00
frances botsford
a2bb8ed96c Merge pull request #10120 from edx/frances/fix/repo-cert-template-bugs 
Platform Web Cert template fixes
 2015-10-13 16:51:56 -04:00
Awais Jibran
2813b1269e Published orphans in split breaks preview button in Studio 2015-10-12 15:00:49 +05:00
Frances Botsford
06df341f56 web cert template rendering - adjust signature image sizing 2015-10-09 15:12:50 -04:00
Sarina Canelake
a693feb836 Add Oppia XBlock 2015-10-09 14:41:27 -04:00