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

11117 Commits

Author SHA1 Message Date
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
Ben Patterson
47b8d07220 Add test file used for format validation. 2014-07-30 12:19:19 -04:00
clytwynec
9f8104a2f3 Merge pull request #4593 from edx/clytwynec/shard_out_bokchoy_tests 
Clytwynec/shard out bokchoy tests
 2014-07-30 11:48:49 -04:00
Christine Lytwynec
c5a311dbd1 adding discussion tests to shard_1 2014-07-30 11:09:35 -04:00
Christine Lytwynec
c0264ca81d add shard_1 flags to cms bok-choy tests 2014-07-30 11:09:34 -04:00
Minh-Tue Vo
063b9b9ab2 Merge pull request #4595 from edx/mvo/update_acceptance_db_caches 
Updating acceptance (lettuce) db cache
 2014-07-30 10:57:29 -04: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
Nimisha Asthagiri
538bec92a7 LMS-11137 Course Action State Django models. 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
Minh Tue Vo
81a3e67a62 Updating acceptance (lettuce) db cache 2014-07-29 11:18:17 -04:00
jmclaus
69ee9d92d6 BLD-1104: List units that use group configuration. 2014-07-29 16:16:31 +02:00
Anton Stupak
54d60fc1b1 Merge pull request #4555 from edx/anton/remove-experiments-from-advanced-settings 
Remove user_partitions from advanced settings
 2014-07-29 09:03:45 +03:00
Mathew Peterson
df14d8e49d Merge pull request #4513 from edx/split/auto_publish 
Split/auto publish
 2014-07-28 17:31:49 -04: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
Sarina Canelake
eafa6b2227 Fix call to cohorts 2014-07-28 16:19:57 -04:00
Jason Bau
e557b5debd Allow external_auth registrations to bypass PW complexity check 2014-07-28 15:17:17 -04:00
polesye
c5c3913783 BLD-1091: Hide user_partitions from Advanced settings. 2014-07-28 22:07:57 +03: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
Ned Batchelder
7caf8c53b1 Merge pull request #4080 from Course-Master/redirect 
decode uri component before redirect for safe redirect
 2014-07-28 10:14:45 -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
jmclaus
8a5bb72984 Merge pull request #4563 from Stanford-Online/stv/jsinput/cdata 
Wrap JSInput Python code in CDATA section
 2014-07-25 23:56:52 +02:00
cahrens
9143861364 Add edit info to instantiated xblock in update_item 2014-07-25 15:24:00 -04:00
Calen Pennington
48645020d1 Merge pull request #4392 from louyihua/lms-window-origin 
Add defininition of window.location.origin in both studio and LMS
 2014-07-25 14:27:27 -04:00
Gabe Mulley
f7eb7df5c5 Remove duplicated data from legacy events 
When event-tracking was fully integrated into the platform, some data was replicated in the context in the middleware and then later extracted and moved the old location by event-tracking. The legacy code path was not updated to remove this transient shim data from the context resulting in duplication of the information. This patch ensures that the transient information is removed from the context before emitting the event.

Fixes: AN-2369
 2014-07-25 12:49:55 -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
Jay Zoldak
fced72e4fc Merge pull request #4557 from edx/zoldak/remove-action-chains 
Use clear and send_keys instead of action chains in page object methods
 2014-07-25 11:44:27 -04:00
Ben McMorran
79945533e9 Merge pull request #4548 from edx/benmcmorran/refactor-studio-tests 
Refactor studio tests to use StudioCourseTest
 2014-07-25 11:15:38 -04:00
Jay Zoldak
f166ddb4bc Merge pull request #4552 from edx/zoldak/studio-container-page 
Improve is_browser_on_page method for Studio Container page
 2014-07-25 10:34:45 -04:00
Jay Zoldak
cac47598fb Use clear and send_keys instead of action chains in page object methods 2014-07-25 09:37:14 -04:00
Nimisha Asthagiri
c930e17fe1 Merge pull request #4534 from edx/nimisha/import-perf-unit-test-STUD-1994 
Unit test for import performance STUD-1994
 2014-07-25 09:37:06 -04:00
Jay Zoldak
d0aaa37a70 Fix is_browser_on_page method for Studio Container page 2014-07-25 08:57:50 -04:00
Ben McMorran
b30222c00f Refactor studio tests to use StudioCourseTest 2014-07-25 08:40:40 -04:00
Ned Batchelder
412e6d3499 Add a more informative assert to a lettuce helper 2014-07-24 16:11:11 -07:00
Nimisha Asthagiri
cd33165a52 Unit test for import performance STUD-1994 2014-07-24 16:34:26 -04:00
Jay Zoldak
a536c344f2 Disable failing test STUD-2003 2014-07-24 13:58:05 -04:00
Jay Zoldak
bff7c58930 Merge pull request #4465 from edx/zoldak/fix-studio-clicks 
Improve clicking and synchronization in Studio bok-choy tests
 2014-07-24 10:04:07 -04:00
Sarina Canelake
8b3d9da40d Merge pull request #4209 from msegado/showanswer-correct-or-past-due 
Add "Correct or Past Due" option for showanswer
 2014-07-24 08:57:54 -04:00
Jay Zoldak
c21dbe4cd2 Improvements to clicking and synchronization in Studio bok-choy tests. 2014-07-24 08:55:34 -04:00
Oleg Marshev
84be560ceb Log CDN request timeout with level INFO. 2014-07-24 11:02:46 +03:00