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

24637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
e3804d8bbf Merge pull request #3665 from edx/db/update-lxml 
Update lxml to 3.3.5
 2014-07-31 10:15:56 -04:00
David Baumgold
44f987138e Update lxml to 3.3.5 2014-07-31 10:13:03 -04:00
David Baumgold
3040bee3f6 Update boto to 2.30.0 2014-07-31 10:01:04 -04:00
David Baumgold
64eee5012f Merge pull request #4582 from itsbenweeks/itsbenweeks/update_scipy 
Updating SciPy
 2014-07-31 09:57:08 -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
Mark Hoeber
d76c89f8ad Merge pull request #4619 from edx/markhoeber-release-notes-image-fix 
Fixed image paths
 2014-07-30 18:04:25 -04:00
Mark Hoeber
13707714ec Fixed image paths 2014-07-30 18:04:03 -04:00
Mark Hoeber
67c8d88b9f Merge pull request #4618 from edx/markhoeber-release-notes-index 
Fix release notes index
 2014-07-30 17:52:26 -04:00
Mark Hoeber
7ceaad0fb9 Fix release notes index 2014-07-30 17:51:59 -04: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
srpearce
ee9fd348b2 Merge pull request #4596 from edx/sylvia/docs/relnotes_7_30 
Sylvia/docs/relnotes 7 30
 2014-07-30 16:34:40 -04:00
Sylvia Pearce
09a92b16b7 Release notes 7-30 2014-07-30 16:34:04 -04:00
Julia Hansbrough
14dc3ce853 Merge branch 'release' 2014-07-30 19:35:51 +00:00
Ben Patterson
7796ece734 Merge pull request #4591 from edx/benp/fix-attach-file 
Fix false positive test in cms acceptance, harden attach_file helper.
 2014-07-30 12:20:13 -04:00
Ben Patterson
47b8d07220 Add test file used for format validation. 2014-07-30 12:19:19 -04:00
Ben Patterson
9b22ceb9f8 Fix false positive test in cms acceptance 
This test was passing in Jenkins, but failing in our Solano runs (and locally on firefox).
This is because it was attaching a file that was not there. This change fixes the test
and makes the attachment method smarter so it will fail if it tries attaching a non-existent
file.
 2014-07-30 12:19:18 -04:00
Ben Patterson
2848f7ab58 Merge pull request #4597 from edx/benp/fix-bok-choy-solano 
Simplify bok choy environments to inherit pipeline settings from common.
 2014-07-30 12:16:45 -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
d275107dc0 updated doctring to explain the bok-choy shards 2014-07-30 11:09:35 -04:00
Christine Lytwynec
c1da8aa7f0 use paver commands in jenkins script 2014-07-30 11:09:34 -04:00
Christine Lytwynec
c0264ca81d add shard_1 flags to cms bok-choy tests 2014-07-30 11:09:34 -04:00
Christine Lytwynec
c7df52c511 enable sharding of 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
0181bb2d91 Merge pull request #4574 from edx/reruns/cms-server-side 
Reruns/cms server side LMS-11016
 2014-07-29 17:05:34 -04:00
Alison Hodges
5afd2eff55 Merge pull request #4578 from edx/ahodges/documentation/DOC754 
Careful identification of "dashboards"
 2014-07-29 15:46:19 -04:00
Nimisha Asthagiri
86986e63ff Fixup: Studio server-side - review comments. 2014-07-29 15:27:10 -04:00
Nimisha Asthagiri
88ad29d166 LMS-11016 Studio server-side for course_listing and course_rerun. 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
 2014-07-29 15:04:17 -04: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
David Baumgold
919e530321 Merge pull request #4293 from juananpe/getinputfocusonlogin 
set keyboard input focus to the e-mail field on the login screen
 2014-07-29 14:55:59 -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
jmclaus
6fd085e31b Merge pull request #4528 from edx/jmclaus/edit-group-configurations-usage 
BLD-1104: List units that use group configuration.
 2014-07-29 17:41:29 +02:00
Ben Patterson
90a2417d97 Simplify bok choy environments to inherit pipeline settings from common.py 2014-07-29 11:40:21 -04:00
Minh Tue Vo
81a3e67a62 Updating acceptance (lettuce) db cache 2014-07-29 11:18:17 -04:00
Ben Weeks
4aa969539d Updating SciPy 2014-07-29 11:02:53 -04:00
jmclaus
69ee9d92d6 BLD-1104: List units that use group configuration. 2014-07-29 16:16:31 +02:00
Mark Hoeber
df71afd4c0 Merge pull request #4507 from dmin7b5/patch-1 
Update install_prodstack.rst
 2014-07-29 09:52:20 -04: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
juananpe
21c0bf2550 Update AUTHORS 2014-07-29 00:32:22 +02:00