Commit Graph

6240 Commits

Author SHA1 Message Date
Eric Fischer
dc469ea5ec Fix cert_status None. Add GeneratedCertificate to admin 2015-11-03 21:54:48 -05:00
David Ormsbee
0aa58f5033 New Relic transaction naming now ignores suffix most of the time.
The only time it should include the suffix is when the handler is
explicilty "xmodule_handler", meaning it's an old-style handler
that routes everything. For example, Capa uses one handler for
all its AJAX requests, and only differentiates actions based on
suffix ("get", "problem_check", etc.).

What prompted this change is that LTIDescriptor defines a handler
"lti_2_0_result_rest_handler" which encodes user-specific
information into the suffix. This is a perfectly valid thing to
do, but it blows out the number of named transactions in our
metrics.
2015-11-02 22:17:46 -05:00
Nimisha Asthagiri
6ab20b71c0 Merge pull request #10388 from edx/nimisha/course-factory
Add SampleCourseFactory and ToyCourseFactory
2015-10-30 13:23:05 -04:00
Eric Fischer
08ed3b547f CohortMemberships Unit Test Updates
Updating previously-existing unit tests to function with the new
CohortMembership model.
2015-10-30 11:07:25 -04:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams
Timed Exams
2015-10-30 11:03:59 -04:00
Bill DeRusha
1f77810fad Add configurable refund window
Add configuration model for enrollment refunds.

Use order info from otto in refund window calculation

Delete dupe tests. Extend tests to include window tests

Move ecom client from lib to djangoapps in openedx
2015-10-30 09:01:53 -04:00
Nimisha Asthagiri
ce466619e4 Add SampleCourseFactory and ToyCourseFactory 2015-10-30 08:52:29 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
wajeeha-khalid
16ab4f4333 Merge pull request #10105 from edx/jia/MA-1189
MA-1189 - Discussion API: implemented GET comment children
2015-10-30 11:37:41 +05:00
chrisndodge
2301bcbf8f Merge pull request #10403 from edx/afzaledx/MAYN-149_survey_report
MAYN-149 Survey Report CSV upload for Professional Education courses.
2015-10-29 18:24:31 -04:00
Afzal Wali
5a11f75a48 Add the ability for self-service course survey reports 2015-10-29 13:26:28 -04:00
Zubair Afzal
fed0964c51 Merge pull request #10304 from edx/zub/story/ecom-2578-basic-programs-api-client-setup
basic programs api setup and dashboard integration
2015-10-29 22:21:12 +05: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
Sarina Canelake
2206b8a056 Merge pull request #10324 from stvstnfrd/debt/circuit
Remove circuit djangoapp from LMS
2015-10-29 11:15:15 -04:00
zubair-arbi
7f96474d01 basic programs api setup and dashboard integration
ECOM-2578
2015-10-29 20:07:51 +05: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
Peter Fogg
4805946a83 Override due dates in the LMS for self-paced courses. 2015-10-28 14:33:11 -04:00
Clinton Blackburn
9bb3f703d7 Updated receipt page to use order endpoint
The receipt page now retrieves data for orders instead of baskets. Going forward baskets will be deleted after an order has been placed, so there should be no permanent references to baskets. Orders will continue to be persisted permanently.

ECOM-2653
2015-10-28 12:12:57 -04:00
Brian Beggs
352c5d13ac Merge pull request #10367 from edx/bbeggs/PLAT-881
Fix for PLAT-881: Disable CallStackManger from StudentModule
2015-10-28 11:41:32 -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
Tasawer
982c9a2667 Added photo_id_key while AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING is True
ECOM-2547
2015-10-28 10:58:44 +00:00
wajeeha-khalid
d210ca6e42 Merge pull request #10134 from edx/jia/MA-1359
MA-1359 &  MA-1457 DiscussionAPI: return response_count for thread GET/POST
2015-10-28 10:51:32 +05:00
Michael Frey
bb53cad0fa Merge pull request #10377 from edx/release
Release
2015-10-27 13:10:49 -04:00
Peter Pinch
cda95d7a28 Merge pull request #10251 from mitocw/fix/jf/enroll-coach-on-create-ccx
Enroll the coach in the CCX on creation
2015-10-27 12:44:15 -04:00
stv
c2fe4483ba Fix PEP8: E126 continuation line over-indented
for hanging indent
2015-10-26 15:51:38 -07:00
stv
a8d30c5de2 Remove circuit-schematic integration from wiki 2015-10-26 15:51:12 -07:00
stv
d77f31dd38 Remove circuit djangoapp from LMS
These endpoints (`edit_circuit` and `save_circuit`) had already been
commented out of `urls.py`, so these views were disabled.
2015-10-26 15:50:29 -07:00
Nimisha Asthagiri
b1ae462ab7 Merge pull request #10361 from edx/mobile/refactor-has-access
Refactor has_access for re-usability.
2015-10-26 18:15:09 -04:00
Sarina Canelake
54394cf7b2 Merge pull request #10325 from stvstnfrd/debt/wiki-image
Remove disabled wiki plugin
2015-10-26 17:48:59 -04:00
Nimisha Asthagiri
95fdbd981c Refactor has_access for re-usability. 2015-10-26 16:26:41 -04:00
Sarina Canelake
f5e4c74e7b Merge pull request #10213 from mitocw/feature/skm/add_tests#95
Adds more tests for get_student_grade_summary_data.
2015-10-26 14:47:59 -04:00
Brian Beggs
56b3e596ab Fix for PLAT-881: StudentModule no longer uses CallStackManger 2015-10-26 13:37:32 -04:00
Jamie Folsom
a3a7ff2428 Enroll the coach in the CCX on creation
Make the course URL pattern more generic.

Comment newly added functionality.

Fix quality issues.

Address two lint errors, with regex and variable naming.

Changed how we access course_key and course_id.

Replace another instance of self.course.id.to_deprecated_string()

Remove unused import, add missing one.

Improve how the ccx key is extracted from the URL

Use resolve() instead of os.path to get the course_id.

Remove the granting of staff access to coaches.
2015-10-26 11:35:01 -04:00
chrisndodge
7157affadf Merge pull request #10356 from edx/cdodge/fix-orm-query
be sure to add a all() to the ORM statement otherwise the select_subc…
2015-10-26 10:08:05 -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
stv
d57f6ab628 Remove disabled wiki plugin
So apparently, "Image Embedding Extension for Python-Markdown" was never
actually enabled. When it was introduced [1], it was already commented
out!?

[1] 93d15d15d0
2015-10-22 18:08:31 -07:00
Andy Armstrong
d05b7a21b3 Merge pull request #10312 from edx/andya/dev-xblock-assets
Allow non-public XBlock assets in debug mode
2015-10-22 12:56:14 -04:00
Andy Armstrong
054aa95b26 Allow non-public XBlock assets in debug mode 2015-10-22 11:09:02 -04:00
Peter Pinch
b87634d8e0 Merge pull request #10268 from mitocw/fix/pdw/download-ccx-csv
Fix CCX grades csv file download
2015-10-22 10:58:27 -04:00
Christina Roberts
d4f2fe1281 Merge pull request #10294 from edx/christina/convert-video-test
Delete test that is already covered by bok choy.
2015-10-22 09:08:16 -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
wajeeha-khalid
c5afa44e35 used recursive to optionally get response comments from comment service 2015-10-22 15:53:35 +05:00
wajeeha-khalid
fa285e09a4 MA-1189 - Discussion API: implemented GET comment children 2015-10-22 15:53:34 +05:00
wajeeha-khalid
a3c6faefc5 MA-1359 & MA-1457 DiscussionAPI: return response_count for thread GET/POST 2015-10-22 12:22:46 +05:00
Chris Dodge
c00f82adab be sure to add a all() to the ORM statement otherwise the select_subclasses() will cause a full table scan/join 2015-10-21 19:27:09 -04:00
Shawn Milochik
9adf9acd11 Adds more tests for get_student_grade_summary_data.
Tests all the kwargs. This is in support of #95, and will be followed
by an update to get_student_grade_summary_data which adds a new kwarg.
2015-10-21 15:30:08 -04:00
Renzo Lucioni
fda61b52aa Reserve ecommerce worker username
Django's user model allows email addresses to be blank. However, edx-platform includes a migration requiring that email addresses be unique. Someone in our production environment already had a blank email address, so this migration was failing earlier.
2015-10-21 15:27:50 -04:00
Jim Abramson
88bfeafe4c Merge pull request #10274 from edx/jsa/update-erac
Update from ecommerce-api-client 1.1 to edx-rest-api-client 1.2
2015-10-21 14:20:53 -04:00
cahrens
cc0d942963 Delete test that is already covered by bok choy.
TNL-3223
2015-10-21 13:26:54 -04:00