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

76 Commits

Author SHA1 Message Date
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
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
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
Ned Batchelder
55d4d98031 static_template_view.models is gone, remove it from docs. 2013-07-10 11:39:54 -04:00
Ned Batchelder
7f193bcaad We don't need to run sphinx on our tests. 2013-07-10 11:39:22 -04:00
Ned Batchelder
a3d496a882 Set sys.path properly for docs to build. 
We used to do it this way, I'm not sure why it was changed.
Our settings files add directories to the path, so we need to
do it here so that names will be importable.
 2013-07-10 11:38:00 -04:00
Calen Pennington
d06a9a2043 Merge pull request #219 from edx/cale/remove-simplewiki 
Remove simplewiki from the codebase
 2013-06-20 13:43:38 -07:00
Calen Pennington
448ca26cdf Remove simplewiki from the codebase 2013-06-20 09:06:29 -04:00
Alexander Kryklia
d57fb77765 removes reference to removed module in docs 2013-06-20 13:18:04 +03:00
Alexander Kryklia
a3a2412c88 fixes pep8 and pylint errors 2013-06-20 12:58:33 +03:00
Alexander Kryklia
f152668e12 Fixes bugs in documentation and improves it. 2013-06-20 12:58:33 +03:00
Alexander Kryklia
5d0f905961 fixes pep8 and pylint errors and rename mitx->edx 2013-06-20 12:58:33 +03:00
Vasyl Nakvasiuk
67884b1a88 add Word Cloud to public docs 2013-05-13 14:44:04 +03:00
Vasyl Nakvasiuk
911c384527 remove old xml docs, add rake buildpubdocs, showpubdocs, pubdoc 2013-03-18 15:53:07 +02:00
Vasyl Nakvasiuk
f172405c9a remove xml documentation from docs/source/ 2013-03-18 15:37:29 +02:00