Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,675 Commits 1 Branch 0 Tags
c8a7b259ff87eecaec461efe98220568af02fb15
Commit Graph

106 Commits

Author SHA1 Message Date
Ned Batchelder
c8a7b259ff Resolve conflicts merging master to rc/2013-11-21 2013-11-27 11:55:44 -05:00
Jay Zoldak
341875bb18 Remove code related to Pearson Testing Centers 2013-11-26 17:04:19 -05:00
Calen Pennington
11bbf4c182 Add grading functionality to LTI xmodule 
Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
[BLD-384]
 2013-11-26 16:30:55 -05:00
Manuel Freire
cdc3ad1cc4 298.15 K is 25 C, not 0 (0 is defined to be at 273.15) 
Signed-off-by:  <manuel.freire@fdi.ucm.es>
 2013-11-19 12:52:13 +01:00
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules 
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
 2013-11-08 11:08:48 -05:00
stroilova
47cb3e3bd0 update personal info in example 2013-10-23 17:09:20 -04:00
polesye
ee7c71817a Add special cases to doc. 2013-10-23 12:37:11 +03:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
Will Daly
c1a5f18e9b Updated testing docs 2013-10-17 14:17:48 -04:00
Carlos Andrés Rocha
e396bf883c Replace Language with Event Source in the tracking logs documentation 
Also:
  - Add some missing event descriptions
  - Reorganized rows to put relevant events together
 2013-10-08 17:03:15 -04:00
Carlos Andrés Rocha
7749bbbe51 Add module grade to problem_check tracking log event 2013-10-08 13:53:35 -04:00
David Baumgold
6bd015d321 Update docs readme 2013-10-07 15:40:36 -04:00
Will Daly
b5fc5d89d3 Fix run single test example 2013-10-01 15:53:16 -04:00
Jay Zoldak
94c74b5c80 update discussion forum doc 2013-09-27 08:28:18 -04:00
stroilova
6d41669bbb Merge pull request #809 from edx/event_spec_update 
Update event doc from wiki
 2013-09-24 10:44:31 -07:00
Jay Zoldak
6ebb753823 Write xunit reports for acceptance tests 
Refactor rake tasks for acceptance tests
Address PR comments
 2013-09-24 12:36:38 -04:00
stroilova
818f4f231a Update event doc from wiki 
update to grid table
    Cleaned up formatting to use `` instead of :code:
    Added Instructor Events and cleaned up outline
    Added instructor events. Cleaned up outline.
    Moved out correct_map table to addendum
    Removed deprecated/undocumented events
 2013-09-24 11:39:07 -04:00
Calen Pennington
2cc793c8eb Teach rake to run all python tests as a group 2013-09-18 10:45:46 -04:00
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