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

5206 Commits

Author SHA1 Message Date
Diana Huang
83f7acffca Merge pull request #4764 from edx/diana/show-cert-without-end-date 
Show Certificates Before End
 2014-08-08 15:36:39 -04:00
Oleg Marshev
0577b9d8b9 Allow turning off Video CDN in Studio. 
BLD-1207
 2014-08-08 14:39:19 -04:00
Diana Huang
7865e2fb3c Move certificates_show_before_end into a new variable 
Mark it as deprecated, but maintain backwards compatibility.

ECOM-11
 2014-08-08 14:29:57 -04:00
Ben McMorran
f3070e6796 Reduce mongo calls on course outline and container pages 2014-08-07 12:27:38 -04:00
cahrens
932a130b16 pep8/pylint 2014-08-07 12:27:36 -04:00
polesye
61c417f7f4 STUD-2021: Fix Multiple Choice Options in Studio. 2014-08-07 12:27:23 -04:00
cahrens
121922a316 Fix rebase issue. 2014-08-07 12:27:17 -04:00
Andy Armstrong
ef581e1146 Apply code review comments and fix tests 2014-08-07 12:27:14 -04:00
Andy Armstrong
a359065329 Integrate visual styling into the course outline 2014-08-07 12:27:13 -04:00
Ben McMorran
fdc79b3050 Adds edit info to instantiated xblock in update_item 2014-08-07 12:27:12 -04:00
cahrens
327a97f7c6 Failing test for create_item populating edit information. 2014-08-07 12:27:11 -04:00
cahrens
285beb388f Clean up from rebase with master. 2014-08-07 12:26:50 -04:00
Ben McMorran
436d773987 Displays release date of unit in sidebar 2014-08-07 12:16:20 -04:00
cahrens
005491587f Updates for create_and_save_xmodule doing an extra lookup. 2014-08-07 12:16:20 -04:00
cahrens
7cb5c4d7b8 Updates based on merge with master. 2014-08-07 12:16:18 -04:00
Andy Armstrong
d65e887d1a New Publishing controls on Unit page. 
STUD-1707
 2014-08-07 12:16:17 -04:00
Andy Armstrong
b1eccdf2d4 Replace unit page with the container page. 
STUD-1754
 2014-08-07 12:16:17 -04:00
Waqas Khalid
3d5dde8195 Fix inconsistent ui issues on discussion during blackout period 
FOR-108
 2014-08-07 19:33:40 +05:00
clytwynec
22582f4931 Merge pull request #4634 from edx/clytwynec/removing_remaining_rake_references 
removing rake and  outdated references to it
 2014-08-06 10:20:30 -04:00
jmclaus
459c241e3b BLD 1020: Easy access to Group Configurations page from Content Experiment component. 2014-08-05 19:44:21 +02:00
Christine Lytwynec
eb3c1ab9a8 removing rake and outdated references to it 2014-08-05 09:54:29 -04:00
Renzo Lucioni
3c37b9723c Merge pull request #4620 from edx/renzo/fix-instructor-analytics 
Renzo/fix instructor analytics
 2014-07-31 14:12:47 -04:00
Don Mitchell
437a3bf93e Merge pull request #4542 from edx/split/perf_test 
Split/perf test
 2014-07-31 09:14:15 -04:00
Oleg Marshev
36d47dd05e Merge pull request #4527 from edx/oleg/xml-course-transcripts-fix 
Fix transcripts in XML course when no static_asset_path is set.
 2014-07-31 10:35:44 +03:00
Don Mitchell
02e21d8ab7 fixup! Count & compare db hits between old and split mongo LMS-11090 2014-07-30 17:44:45 -04:00
Don Mitchell
4d51906761 fixup! Test both split and old mongo 2014-07-30 17:44:45 -04:00
Don Mitchell
d4776a151b Test both split and old mongo 2014-07-30 17:44:45 -04:00
Don Mitchell
0f0d75fce8 Convert toc test to use mongo not xml ms 
Included adding a general create_toy_course and create_sample_course method for tests
 2014-07-30 17:44:44 -04:00
Don Mitchell
9a90579f02 Move test_path_to_location to mixed testing 2014-07-30 17:44:44 -04:00
Don Mitchell
8268724ee5 check 0 sends means 0 not ignore 2014-07-30 17:44:44 -04:00
Don Mitchell
1c17e05608 Count & compare db hits between old and split mongo 
LMS-11090
 2014-07-30 17:44:44 -04:00
Don Mitchell
37c873db90 Serialize using to_json on fields 2014-07-30 17:44:44 -04:00
Renzo Lucioni
3599e2eec7 Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"" 
This reverts commit 079808ee47.
 2014-07-30 17:01:52 -04:00
Julia Hansbrough
14dc3ce853 Merge branch 'release' 2014-07-30 19:35:51 +00:00
jmclaus
58ca939ba6 Merge pull request #4292 from terman/jsinput 
Supply initial_state attribute for jsinput tag
 2014-07-30 16:56:45 +02:00
Oleg Marshev
ac5f8d94f7 Merge pull request #4382 from edx/oleg/cdn-log-level-fix 
Log CDN request timeout with level INFO.
 2014-07-30 16:06:47 +03:00
Nimisha Asthagiri
fe4bce8bba clone_course: Add fields parameter to support new display_name. 2014-07-29 15:03:36 -04:00
Julia Hansbrough
079808ee47 Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul" 
This reverts commit 252038c376, reversing
changes made to 7caf8c53b1.
 2014-07-29 17:41:46 +00:00
Mathew Peterson
9a039e93ec Adding auto_publishing to split_draft 
Added update_item, create_item, create_child to split_draft.py

Cleaned up TODOs in test_mixed_modulestore.py

Unit test for auto-publish

LMS-11017

Added tests to test_mixed_modulestore.py for has_changes and added black_list to _auto_publish

Moved DIRECT_ONLY_CATEGORIES to draft_and_publish.py

Deleted test_split_draft_modulestore.py

Added _auto_publish to create course

Publish cleanups for update_version, source_version

Changed has_changes to use source_version

Removing mixed test that no longer makes sense in auto_publish world

Addressed TODOs in test_branch_setting
 2014-07-28 20:49:30 +00:00
Renzo Lucioni
252038c376 Merge pull request #4545 from edx/renzo/bi-analytics-overhaul 
Overhaul Segment.io integration
 2014-07-28 11:59:58 -04:00
Renzo Lucioni
8bd84b5f3a Overhaul Segment.io integration 2014-07-28 11:08:02 -04:00
Oleg Marshev
a340ad53cf Remove import. 2014-07-28 15:43:10 +03:00
Oleg Marshev
46fe356182 Use data dir from course. 2014-07-28 13:11:12 +03:00
Ben McMorran
bf8183f61e Merge pull request #4544 from edx/benmcmorran/fixes-from-bulk-publishing 
Return edit info from update_item and refactor item.py to use usage_key_with_run
 2014-07-26 17:02:31 -04:00
cahrens
9143861364 Add edit info to instantiated xblock in update_item 2014-07-25 15:24:00 -04:00
stv
0aba4f7ec6 Wrap JSInput Python code in CDATA section 
Python code can commonly contain characters that are invalid XML, such
as '<' and '>'. This has proven to be a pain point for instructors
implementing custom Python grading functions for their JSInput problems
(see sample code below).

This change creates a more robust template from which to make
modifications.

```python
    # This is an XML syntax error, when not inside a CDATA section.
    if i < 0:
        print('negative')
```
 2014-07-25 12:11:33 -04:00
Nimisha Asthagiri
cd33165a52 Unit test for import performance STUD-1994 2014-07-24 16:34:26 -04:00
Oleg Marshev
84be560ceb Log CDN request timeout with level INFO. 2014-07-24 11:02:46 +03:00
Martin Segado
bbeb79cbe7 Add correct_or_past_due option for showanswer and update relevant documentation 2014-07-24 02:44:03 -04:00
Diana Huang
167e2b675b Split branch settings code review fixes LMS-11056 2014-07-23 21:59:33 -04:00