Commit Graph

6269 Commits

Author SHA1 Message Date
Nimisha Asthagiri
dcdbd53e99 Transformer: StartDateTransformer 2015-11-05 14:41:42 -05:00
Nimisha Asthagiri
3f6baa992d Transformer: VisibilityTransformer 2015-11-05 14:41:41 -05:00
Nimisha Asthagiri
a40d2b65d2 Course Blocks App MA-1556 2015-11-05 14:41:40 -05:00
Peter Fogg
4c934614d2 Merge pull request #10512 from edx/peter-fogg/date-summary-bugfix
Fix date summary blocks for courses without an end date.
2015-11-05 12:09:34 -05:00
Nimisha Asthagiri
7c480f93c6 Merge pull request #10245 from edx/jia/MA-1044
MA-1044 DiscussionTopic - Added bulk operations
2015-11-05 12:08:09 -05:00
Matt Drayer
7256bd1b02 Merge pull request #10522 from edx/ziafazal/SOL-1377
SOL-1377: allow certifcate exception to be added for multiple courses
2015-11-05 11:35:17 -05:00
Zia Fazal
941664294e allow exception to be added for multiple courses
added unit test to test certs exception same user different courses scenario
2015-11-05 20:53:18 +05:00
Peter Fogg
445386233e Fix date summary blocks for courses without an end date.
I also took this opportunity to do some small cleanups of the date
summary code, specifically converting some attributes to properties in
order to remove a Pylint directive disabling warnings about missing
docstrings.
2015-11-05 09:11:10 -05:00
wajeeha-khalid
509b2a4453 MA-1044 DiscussionTopic - Added bulk operations 2015-11-05 18:24:20 +05:00
Tasawer
06a91979e1 Added checkout error page.
ECOM-2516
2015-11-05 07:26:13 +00:00
Matt Drayer
7a7cd6e660 Merge pull request #10459 from edx/ziafazal/SOL-1346
SOL-1346:convert string to bytestring before passing it to urllib.quote_plus
2015-11-04 17:07:46 -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
Peter Fogg
acf5bb57cb Merge pull request #10509 from edx/peter-fogg/course-pacing-label-changes
Course pacing template changes.
2015-11-04 14:11:49 -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
Eric Fischer
24ee5a68f5 Merge pull request #10490 from edx/release
Release 4 November 2015 to master
2015-11-04 13:19:09 -05:00
Peter Pinch
01f1c3a160 Merge pull request #10478 from mitocw/enhancement/aq/disable_auto_enrol_ccx
Disabled auto enroll in ccx coach's enrollment tab
2015-11-04 11:28:01 -05:00
Peter Fogg
5bd6e829e7 Merge pull request #10465 from edx/peter-fogg/fix-spec-helpers-closure
Fix `withData` and `withConfiguration` helpers.
2015-11-04 10:21:30 -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
Renzo Lucioni
2f0e663581 Use ugettext_noop instead of lambdas assigned to the underscore
Replaces instances of an old hack with the more clear ugettext_noop.
2015-11-04 09:17:18 -05:00
Amir Qayyum Khan
1f60e9696f Disabled auto enroll in ccx enrollment tab 2015-11-04 11:56:01 +05:00
Zia Fazal
fbc8a13410 convert string to bytestring before passing it to urllib.quote_plus
further improvement in handling of unicode data
2015-11-04 11:22:36 +05:00
Eric Fischer
dc469ea5ec Fix cert_status None. Add GeneratedCertificate to admin 2015-11-03 21:54:48 -05:00
Sarina Canelake
1172a49580 Merge pull request #10445 from stvstnfrd/chat
Remove chat feature
2015-11-03 11:11:23 -05:00
Matt Drayer
fc77a6eae7 Merge pull request #10363 from edx/saleem-latif/SOL-1315
SOL-1315: Add Cert Exception UI on Instructor Dash
2015-11-03 10:09:19 -05:00
Saleem Latif
99bd47e9a8 Add Cert Exception UI on Instructor Dash 2015-11-03 12:52:22 +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
stv
3a2c0e37dc Remove chat feature
This was originally contributed upstream by Stanford, circa 2013.

We neither use nor support this feature in its current implementation,
and in fact, we may never have used this production. Until recently, we
had additional chat/Jabber code [1] (in the form of a Jabber djangoapp in
LMS); context there suggests this feature may have never been more than
a prototype. The original author is no longer on the team, so I can't directly
confirm this on our end.

Do you use this feature?

Stanford had already abandoned this Jabber-backed chat implementation,
in favor of an IRC backend, by the time I joined the team in early 2014.

[1] dbe52a6b13
2015-11-02 14:08:58 -08:00
Peter Fogg
759a3c4f1f Fix withData and withConfiguration helpers.
Both of them dynamically generate specs which close over the iteration
variable of a for loop. Closures capture *references*, not values, and
so when the variable is mutated on loop iteration its new value is
used when the spec is called. This means that instead of running a
spec with n different values, we run the spec n times with the same
value. This is bad.
2015-11-02 16:34:06 -05:00
Peter Fogg
d7417d62cc Date summary blocks on the course home page.
Enabled behind the
`SelfPacedConfiguration.enable_course_home_improvements` flag.

ECOM-2604
2015-11-02 10:49:18 -05:00
Edward Zarecor
37f69c20a8 Merge pull request #10358 from edx/e0d/fix-consumer-secret
PR for discussing the right thing to do here.
2015-10-30 13:55:55 -04: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