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

6420 Commits

Author SHA1 Message Date
Brian Beggs
141e0a93c7 Merge branch 'master' into dj18-release-merge 2015-11-19 13:36:13 -05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
asadiqbal
88ae4ce257 SOL-1416 2015-11-18 11:56:49 +05:00
cahrens
37cf46728d Correct the remove icon. 2015-11-16 12:29:42 -05:00
Ned Batchelder
ccc6e5077d Make sure Studio has a secret key 2015-11-13 12:30:54 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Matt Drayer
fab6e00313 Merge pull request #10417 from edx/ziafazal/SOL-1358 
ziafazal/SOL-1358: enabled web certs by default for all new courses
 2015-11-10 10:56:13 -05:00
Zia Fazal
cbc57aae6b enabled web certs by default 
changing default value instead of setting it via fields

fixed broken test

fixed quality violation

following another approach
 2015-11-10 18:51:14 +05:00
Syed Hasan raza
40847db72c Merge pull request #10153 from edx/shr/bug/PLAT-875-Courses_Appear_in_search_after_deletion 
Delete course entry from CourseAboutSearchIndex
 2015-11-10 14:30:57 +05:00
Syed Hassan Raza
3102788bd1 Delete course entry from CourseAboutSearchIndex 2015-11-07 18:27:09 +05:00
Andy Armstrong
a3ff4d50e8 Merge pull request #10534 from edx/andya/fix-studio-videos 
Fix optimizing of draggabilly and json2
 2015-11-06 12:12:44 -05:00
Andy Armstrong
7a1469633f Fix optimizing of draggabilly and json2 2015-11-06 09:40:20 -05:00
asadiqbal
13508c7681 SOL-1379 2015-11-06 18:45:36 +05:00
David Baumgold
1aac73d614 Merge pull request #10493 from edx/db/kill-mitx-features 
Remove legacy MITX_FEATURES reference
 2015-11-05 11:56:35 -05:00
Andy Armstrong
0785aeb959 Merge pull request #10426 from edx/andya/update-draggabilly 
Upgrade draggabilly.js to fix Firefox iframe bug
 2015-11-05 11:01:35 -05:00
Andy Armstrong
18dabc3312 Upgrade draggabilly.js to fix Firefox iframe bug 
TNL-3627
 2015-11-05 10:10:39 -05:00
Robert Raposa
b76981234d Merge pull request #10484 from edx/robrap/TNL-2646 
TNL-2646: Escape json in Studio
 2015-11-04 14:28:25 -05:00
Robert Raposa
3682fac832 Add json escaping to Studio 
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates

TNL-2646: Escape json.dumps
 2015-11-04 13:34:42 -05:00
Robert Raposa
0964bf280f Remove unused method subsection_handler 
Removing this particular call to json.dumps was done by removing
the complete method subsection_handler which is no longer
used.  The template edit_subsection.html had already been removed.

TNL-2646 Escape json
 2015-11-04 13:34:42 -05:00
Peter Fogg
b98c89117c Course pacing template changes. 
Instructor-led is changed to instructor-paced. Adds a label to the
course outline page to show the course pacing.

ECOM-2794
ECOM-2800
 2015-11-04 09:59:58 -05:00
David Baumgold
792c3d93c1 Remove legacy MITX_FEATURES reference 2015-11-03 15:37:41 -05:00
Robert Raposa
44bd65293a Escape json for Studio advanced settings 
- Resolve SEC-27 by escaping course name in advanced settings
- Add escape_json_dumps to simplify escaping json in Mako templates

SEC-27: XSS/JS Error in Advanced Settings with invalid course name
 2015-11-03 10:38:39 -05:00
Qubad786
36fe97c6c8 Bug fix: Added test cases and updated course info and index view with exception handling 
TNL-3643
 2015-11-03 12:43:47 +05:00
David Baumgold
b22faf1f01 Fix an incorrect string format 2015-11-02 16:37:36 -05:00
Peter Fogg
42ce6b96a3 Merge pull request #10446 from edx/peter-fogg/hide-studio-due-date 
Hide Xblock due dates in studio for self-paced courses.
 2015-11-02 11:04:44 -05:00
Matt Drayer
b900221ca4 Merge pull request #10394 from edx/asadiqbal08/SOL-1292 
asadiqbal08/SOL-1292 Entrance Exam is not imported with an imported course
 2015-11-02 10:14:47 -05:00
Peter Fogg
709758e433 Hide Xblock due dates in studio for self-paced courses. 2015-11-02 09:35:58 -05:00
Syed Hasan raza
cdd5a6f8fb Merge pull request #7016 from edx/shr/bug/TNL-1355-Studio-username-field-area-alignment 
set max width for nav-account-user for long characters
 2015-11-02 06:30:33 -08:00
Syed Hassan Raza
f582d1a832 adjusment for long usernames 2015-11-02 16:14:53 -08:00
asadiqbal
bf0affc25d SOL-1292 2015-11-02 14:33:12 +05:00
Christina Roberts
057ab71b7c Merge pull request #10052 from edx/andya/segmentio-performance 
Upgrade segment.io and possibly improve its performance
 2015-10-30 14:10:16 -04:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams 
Timed Exams
 2015-10-30 11:03:59 -04:00
Andy Armstrong
b66cbe3484 Upgrade segment.io to match documentation. 
May improve performance.
TNL-3538
 2015-10-30 09:24:20 -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