Commit Graph

12677 Commits

Author SHA1 Message Date
David Baumgold
b921d995fc Fixed an incorrect revert
When I reverted the edx.org theme in 116ca29189,
I reverted this line incorrectly. It should be like this.
2015-11-02 16:16:36 -05:00
Peter Fogg
27be371a2c Merge pull request #10430 from edx/peter-fogg/date-summary-blocks
Date summary blocks.
2015-11-02 12:42:36 -05:00
Matjaz Gregoric
3320ecf418 Move unenroll messages into separate data attributes.
Having the messeges embedded into onclick attributes was fragile because
it could break if the translated string contained special characters
such as single quotes.

Rather than trying to escape the special characters inside the onclick handler,
move the translatable strings into separate h-escaped data attributes and interpolate
the values in the (already existing) jQuery click handler rather than in the
inline onclick handler.

This makes the javascript code more consistent as well as fixes the problem
where the popup would break if translation included single quotes.
2015-11-02 17:21:28 +01:00
Matjaz Gregoric
1037e6b551 Replace s placeholder with %()s in course listing.
The string is passed through the JS 'interpolate' function,
which expects %()s style placeholders.
2015-11-02 17:21:27 +01: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
Sarina Canelake
42c5f2ff8c Merge pull request #10125 from open-craft/smarnach/course-number-class
Add a class to the course number in the page header to facilitate hiding it in a theme.
2015-11-02 09:55:30 -05:00
Ahsan Ulhaq
1c66fbc812 Merge pull request #10277 from edx/ahsan/ECOM-2338-adding-Messaging-and-text-improvements-unaffected-changes
Reimplemented text changes for dashboard
2015-11-02 11:34:25 +05:00
Sven Marnach
610a0e0fbb Add a class to course number and name in the page header to facilitate hiding them in a theme. 2015-10-31 13:19:06 +01:00
Nimisha Asthagiri
3ac14fe3dd Merge pull request #10365 from edx/mobile/block-cache-framework
Block Cache framework (MA-1551)
2015-10-30 17:01:23 -04:00
Ahsan Ulhaq
bab065d825 Reimplemented text changes for dashboard 2015-10-30 23:53:22 +05:00
Nimisha Asthagiri
7f325aee73 Block Cache framework. 2015-10-30 14:24:57 -04: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
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
e0380ad7ab Merge pull request #10295 from edx/efischer/cohort_membership_model
TNL-3478 Cohort Membership race condition fix
2015-10-30 13:08:56 -04:00
Ahsan Ulhaq
c47311b11f Add the html and css and backend changes required for the xseries. 2015-10-30 20:59:26 +05: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
717f5dc5e8 Merge pull request #10384 from edx/bderusha/refund-window
Refund windows
2015-10-30 10:29:29 -04:00
Matt Drayer
90f1473bfc Merge pull request #10418 from edx/ziafazal/SOL-1340
SOL-1340: added vertical spacing around issued certificates section
2015-10-30 10:02:16 -04:00
Andy Armstrong
b66cbe3484 Upgrade segment.io to match documentation.
May improve performance.
TNL-3538
2015-10-30 09:24:20 -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
Zia Fazal
830b2e0ac5 added vertical spacing
wrapped issued certificates section with p tags to add some vertical
spacing

changes after feedback from frances

indent code
2015-10-30 12:01:39 +05: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
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
Christina Roberts
55d1fb989e Merge pull request #10333 from edx/christina/delete-time-reference
time.coffee no longer exists
2015-10-29 12:41:12 -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
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
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
cahrens
c8f1987a84 Delete swfobject.js and analytics.js. 2015-10-28 14:52:43 -04:00
Peter Fogg
4805946a83 Override due dates in the LMS for self-paced courses. 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
Calen Pennington
49f9e31a00 Allow auto_auth on the LMS in bok_choy tests 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
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