Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,672 Commits 1 Branch 0 Tags
481cbfd8a56ac5116a7e39d5e79ad7623e2601bd
Commit Graph

88 Commits

Author SHA1 Message Date
jkarni
2b5fa7994f Merge pull request #951 from edx/jkarni/add-mock 
Add mock package to RTD requirements
 2013-09-12 10:58:46 -07:00
David Baumgold
b16799071e Merge pull request #559 from hikari-boulders/patch-2 
Update discussion.md
 2013-09-12 08:36:43 -07:00
Julian Arni
1bd745f336 Add mock package to RTD requirements 2013-09-12 10:56:47 -04:00
David Baumgold
a1d3899a4d Use oauthlib directly for LTI module 2013-09-10 11:02:30 -04:00
David Baumgold
45f38ddf81 Update requests library to 1.2.3 2013-09-10 09:59:21 -04: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
e5ec4600df Add documentation to LTI module and to dev docs 2013-09-09 19:13:22 +03:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Calen Pennington
b0cdbbc1fe Merge pull request #794 from cpennington/upgrade-newrelic 
Upgrade newrelic agent to the latest version
 2013-08-30 12:56:11 -07:00
Will Daly
4e7c309d56 Merge pull request #798 from edx/will/js-test-tool-squashed 
Integrate js-test-tool into testing infrastructure
 2013-08-27 14:09:13 -07:00
Calen Pennington
42571b9319 Merge pull request #802 from cpennington/run-failed-tests 
Teach rake test tasks how to re-run failed tests
 2013-08-27 12:53:40 -07:00
Calen Pennington
e7626d2d84 Teach rake test tasks how to re-run failed tests 2013-08-27 09:43:30 -04:00
Will Daly
fe72730969 Integrate js-test-tool into testing infrastructure 2013-08-26 20:21:18 -04:00
Will Daly
12cf060ba7 Silence doc test errors/warnings 2013-08-26 15:57:58 -04:00
Calen Pennington
bf331c9d7e Upgrade newrelic agent to the latest version 2013-08-26 12:41:04 -04:00
ichuang
0d938d3940 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
 2013-08-20 23:40:09 -04:00
ichuang
95952bd693 add tests of static_asset_path and importing with no static; 
fix (again) static_replace to work with static_asset_path
 2013-08-20 23:30:26 -04:00
Peter Baratta
ab2570a7bd Add docs for changes in #726 2013-08-20 14:04:38 -04:00
jkarni
6c5d3e66c9 Merge pull request #731 from edx/jkarni/feature/docchanges 
Incorporate Anant's suggestions
 2013-08-20 07:00:05 -07:00
Julian Arni
72421a11cf Incorporate Anant's suggestions 2013-08-19 14:03:13 -04:00
jkarni
424570c6d5 Merge pull request #568 from edx/jkarni/fix/quietdocs 
Jkarni/fix/quietdocs
 2013-08-19 07:48:34 -07:00
Julian Arni
852977c2d2 Mock only if on RTD. 
And some code cleanup.
 2013-08-19 10:24:52 -04:00
David Ormsbee
3ce87583ab Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode. 
Features coming down the pipe will want to be able to:
* Refer to enrollments before they are actually activated (approval step).
* See what courses a user used to be enrolled in for when they re-enroll in
  the same course, or a different run of that course.
* Have different "modes" of enrolling in a course, representing things like
  honor certificate enrollment, auditing (no certs), etc.

This change adds an is_active flag and mode (with default being "honor").
The commit is only as large as it is because many parts of the codebase were
manipulating enrollments by adding and removing CourseEnrollment objects
directly. It was necessary to create classmethods on CourseEnrollment to
encapsulate this functionality and then port everything over to using them.

The migration to add columns has been tested on a prod replica, and seems to be
fine for running on a live system with single digit millions of rows of
enrollments.
 2013-08-14 13:23:06 -04:00
Peter Baratta
69fa1b069d Added user documentation 2013-08-12 11:49:04 -04:00
JonahStanley
e8b2789409 Fixed upload test. Also added information to testing.md 2013-08-08 11:32:30 -04:00
Julian Arni
6716783009 Fix import mocks. 
Prevents sphinx from bailing on builds that involve unavailable imports.
 2013-08-06 14:01:22 -04:00
Julian Arni
0bbd80fedf Add verbose option 2013-08-06 14:00:31 -04:00
Julian Arni
5c477a9004 Make builds quiet by default 2013-08-02 16:24:07 -04:00
David Baumgold
cca94c62e9 Update Babel and Transifex libraries 2013-08-02 15:19:35 -04:00
hikari-boulders
bbd0692b51 Update discussion.md 
- fixed typo
- roles 'moderator' and 'administrator' are explained as bullet points.
 2013-08-02 17:57:49 +02:00
Julian Arni
a4d7bff4b1 Fix reference issues 2013-08-02 08:08:51 -04:00
Julian Arni
2bb7372a6b Remove django.utils dependency 
And fix path issues.
 2013-08-02 08:08:51 -04:00
Julian Arni
78ca8fb7be Add rtd-specific syspath 2013-08-02 08:08:51 -04:00
Julian Arni
0908ce408a Fix 'images' capitalization 2013-08-01 14:29:53 -04:00
Julian Arni
9f4b7261a8 Merge branch 'master' into jkarni/docs-merge 2013-08-01 11:41:44 -04:00
Julian Arni
5451bb642c Code cleanup. 
From PR review.
 2013-07-30 17:43:43 -04:00
Julian Arni
6ee5eb2e4b Cherry-pick and fix Toddi's commit. 
Which was giving git endless confusion on merge.
 2013-07-30 11:45:43 -04:00
Julian Arni
21fcdc7f3d Rename data docs straggler 2013-07-30 10:30:44 -04:00
Julian Arni
c0f6ec6cf5 Merge branch 'master' into jkarni/docs-merge 
Conflicts:
	docs/source/conf.py
 2013-07-30 10:23:35 -04:00
Calen Pennington
3774ea1565 Add an XBlock student_view to XModule 
This just wraps XModule.get_html, and ignores javascript and css for
now.

[LMS-189]
 2013-07-24 12:23:26 -04:00
Don Mitchell
df7b917b40 Implement next generation modulestore 
A new modulestore backed by mongo that changes the data format to
facilitate easy versioning, sharing content between courses, and fast
lookup of course structure and Scope.settings data.

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
 2013-07-19 13:10:14 -04:00
Julian Arni
2540be2442 Update rake docs to reflect change in folder structure 2013-07-16 13:45:22 -04:00
Julian Arni
5f9c395afe Use source dir for data docs 2013-07-16 13:44:53 -04:00
Julian Arni
79b1bffdc8 fix breakage from dir renaming 2013-07-16 13:30:39 -04:00
Ned Batchelder
f3d8738365 static_template_view.models is gone, remove it from docs. 2013-07-16 13:09:23 -04:00
Ned Batchelder
954ddf496d We don't need to run sphinx on our tests. 2013-07-16 13:08:06 -04:00
Julian Arni
bf60b24aa8 Switch to common structure and shared resources 2013-07-16 13:01:12 -04:00
Lyla Fischer
e3fa27a3d8 moved docs into one repo. Broke compilation 2013-07-11 10:38:20 -04:00
Ned Batchelder
8997ed0322 Suggestions from James: mitx is old-school, as is autogeneration. 2013-07-10 12:19:53 -04:00