Commit Graph

318 Commits

Author SHA1 Message Date
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution
Add an XBlock javascript runtime, and use it to run XModules
2013-10-21 05:53:36 -07:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules
[LMS-57]
2013-10-18 16:31:32 -04:00
Don Mitchell
978c19dd2c Merge pull request #1325 from edx/dhm/paginate_assets
Add asset pagination
2013-10-17 07:16:09 -07:00
Don Mitchell
214a3bd251 pylint/pep8 cleanups 2013-10-17 09:52:13 -04:00
Carlos Andrés Rocha
7852b10753 Add command to dump a course to stdout as a tar.gz file 2013-10-15 10:48:59 -04:00
Carlos Andrés Rocha
8cc8608276 Add command to dump the structure of a course as a JSON 2013-10-15 10:48:59 -04:00
Carlos Andrés Rocha
956a960c63 Add command to dump the course_ids available to the LMS 2013-10-15 10:48:59 -04:00
Valera Rozuvan
134eab8c13 Adding fix for failing Python unit test. 2013-10-14 13:58:18 +03:00
Alexander Kryklia
a03c5be6de New feature for lti module.
Add ability to display LTI module in a new
window. Iframe will be still supported.

Fix python test
Update acceptance tests
Fix in acceptance tests, they are stable now
Fix Acceptance tests.
Adding Jasmine tests for LTI.
Fixing Jasmine tests. Adding the rest of Jasmine tests.
2013-10-14 13:58:17 +03:00
Brian Wilson
03b4330c04 Update tests with more complete coverage. 2013-10-10 15:34:16 -04:00
chrisndodge
82e42cc580 Merge pull request #1156 from edx/feature/cdodge/add-preview-configs-via-middleware
add some middleware to determine whether draft modulestore or non-draft ...
2013-10-10 10:24:51 -07:00
Chris Dodge
8f9d815f10 add some middleware to determine whether draft modulestore or non-draft modulestore should be used
change to use regex to do the domain mappings. Also add config to AWS to be able to set from configuration file.

handle cases where HTTP_HOST is none, like in unit tests

add linefeed at end

fix up regex matches

switch to use thread local storage to hold the request itself

.

.

convert over to use open source 3rd party library

convert over to use django-cum

add unit test

remove comment

.

add comment to config setting

fix comment

use better regex for localdev

no need to break

no need to wrap an imported function, it's visible to any file that is importing us

add comment

add unit test

clean up test

use a separate env file to set the preview hostname
2013-10-09 11:53:26 -04:00
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Calen Pennington
d785b1e213 Convert due_date_display_format tests to use factories
Previously, these tests modified due_date, which failed due to the new
restrictions on writing to Scope.settings from the LMS.
2013-10-08 15:29:17 -04:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
2013-10-08 15:29:17 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Jason Bau
667a1eadb5 Stanford paid course registration
With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
2013-09-26 18:25:00 -07:00
Renzo Lucioni
e7e03f10fb Refactor tab tests 2013-09-25 00:27:36 -04:00
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
jmclaus
7af892e66a Disabled video autoplay for students 2013-09-20 14:04:57 +02:00
Calen Pennington
9643fd463f Rename xblock_field_data to xmodule_field_data 2013-09-18 10:49:41 -04:00
Diana Huang
47ce9082e4 Merge branch 'release'
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py
2013-09-13 17:15:44 -04:00
Vik Paruchuri
009017fe07 Address review comments 2013-09-13 11:06:40 -04:00
cahrens
988833ded9 pylint/pep8 2013-09-12 14:30:00 -04:00
cahrens
95ad1826d4 Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format. 2013-09-12 14:30:00 -04:00
cahrens
08d9942993 Allow custom formatting of due date strings.
STUD-724

Test course for allowing custom formatting of due date strings.

STUD-724

Try making the name of the course match the folder name.

More cleanup.

More cleanup.

updates.
2013-09-12 14:30:00 -04:00
Alexander Kryklia
68409f0c7a Add default launch url for lti. 2013-09-11 19:16:46 +03:00
David Baumgold
a1d3899a4d Use oauthlib directly for LTI module 2013-09-10 11:02:30 -04:00
Valera Rozuvan
ee02c06250 Add Learning Tools Interoperability (LTI) blade.
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
2013-09-10 12:30:42 +03:00
Valera Rozuvan
d02ef8bc12 Add Learning Tools Interoperability (LTI) blade.
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
2013-09-09 23:54:49 +03:00
Alexander Kryklia
719ec8f9d8 Revert "Merge pull request #804 from edx/valera/lti_module"
This reverts commit 2894b21c32, reversing
changes made to 34d0fe1554.
2013-09-09 22:51:57 +03:00
Alexander Kryklia
cd72f05778 Fix test 2013-09-09 19:16:19 +03:00
Alexander Kryklia
c63170aea5 Fix 2013-09-09 19:16:18 +03:00
Alexander Kryklia
5e8aebf00b Fix 2013-09-09 19:16:18 +03:00
Alexander Kryklia
5e3c6736ab Fixes. 2013-09-09 19:16:16 +03:00
Alexander Kryklia
ab3cde8a4d Fix 2013-09-09 19:16:14 +03:00
Alexander Kryklia
faa03f0e25 Update docstrings. 2013-09-09 19:16:14 +03:00
Alexander Kryklia
e10577d6ad Pass user_id and course_id to runtime in cms (dev) and tests. 2013-09-09 19:16:14 +03:00
Alexander Kryklia
f6d9c077f0 Improve LTI module
Add simplifyed template.
Update lti integration test.
Add getting oauth credentials from course settings.
Add user id transferring to provider.
Improve documentation of lti module.
2013-09-09 19:13:22 +03:00
Alexander Kryklia
e4e7a4e30b Remove ipdb. 2013-09-09 19:13:20 +03:00
Valera Rozuvan
417ddcaaa1 LTI module with tests 2013-09-09 19:13:20 +03:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Jason Bau
08168ec67f Merge pull request #859 from edx/jbau/studio-link-in-instructor-panel
Add link in lms legacy instructor dashboard to cms course_index
2013-09-04 13:03:21 -07:00
Jason Bau
ec989e4999 Address review comments for lms_link_to_cms
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
2013-09-04 11:29:22 -07:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Anton Stupak
a09e610403 Fix multiple video bug 2013-09-03 18:49:46 +03:00
Jason Bau
b0f9fd0df5 Add link in lms legacy instructor dashboard to cms course_index
A one-click way of getting to editing the course
2013-08-31 01:07:34 -07:00
Calen Pennington
7d79f4fe37 Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi
[DEVPAIN-7]
2013-08-28 10:56:07 -04:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
2013-08-27 12:12:20 -04:00