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

30 Commits

Author SHA1 Message Date
jmclaus
5478525a42 Added JSInput template to Studio and a sop attribute to JSInput. Only if it's set to false, as in JSInput's template, will JSChannel be used to bypass it. In all other cases (attribute not present or set to something else), SOP is enforced. Compatibility with jsVGL is therefore maintained. Multiple JSInput are supported in a vertical. Also, save button now functions. [BLD-523, BLD-556, BLD-568] 2013-12-20 17:03:56 +01:00
Mark Hoeber
31ab28ee83 Merge pull request #1993 from edx/markhoeber/documentation/analytics-sprint-12 
Markhoeber/documentation/analytics sprint 12
 2013-12-18 11:41:42 -08:00
Mark Hoeber
4b1431bffe Edits to analytics changes 
wiki and user_id_map tables finalized
 2013-12-18 14:14:32 -05:00
Mark Hoeber
7e88ecc16d Fix for STUD-1011 
Had to change conf.py setting to turn off smartypants formatting
 2013-12-16 16:27:09 -05:00
David Baumgold
3d2ad59c51 Merge pull request #1907 from edx/db/whitespace-fixes 
whitespace-only changes
 2013-12-13 11:40:54 -08:00
Mark Hoeber
6d76d6abe8 Wiki data update 
Wiki data update
 2013-12-13 14:25:15 -05:00
David Baumgold
28f22393bf whitespace-only changes 2013-12-10 11:45:49 -05:00
Mark Hoeber
ad9da035cf Added user_id_map 
Added user_id_map
 2013-12-10 10:51:10 -05:00
Mark Hoeber
bc23a6de30 editing wiki data 
removed boilerplace from beginning of file
 2013-12-09 16:13:32 -05:00
Mark Hoeber
75bf35a333 Adding wiki data file to data formats doc 
Adding wiki data file to data formats doc
 2013-12-09 16:12:36 -05:00
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
stroilova
47cb3e3bd0 update personal info in example 2013-10-23 17:09:20 -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
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
Will Daly
12cf060ba7 Silence doc test errors/warnings 2013-08-26 15:57:58 -04:00
jkarni
424570c6d5 Merge pull request #568 from edx/jkarni/fix/quietdocs 
Jkarni/fix/quietdocs
 2013-08-19 07:48:34 -07: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
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
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
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
Julian Arni
5f9c395afe Use source dir for data docs 2013-07-16 13:44:53 -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