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

24617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Juanan Pereira
cb2aaf8d8c set keyboard input focus to the e-mail field on the login screen 2014-07-29 00:31:26 +02:00
Mathew Peterson
df14d8e49d Merge pull request #4513 from edx/split/auto_publish 
Split/auto publish
 2014-07-28 17:31:49 -04:00
Sarina Canelake
fa50aa2e70 Merge pull request #4588 from edx/sarina/fix-legacy-cohorts 
Fix call to cohorts
 2014-07-28 17:28:31 -04:00
dmin7b5
26a766245b Update install_prodstack.rst 
After installing Fullstack via Vagrant, the user needs to know the credentials to login to edX
 2014-07-28 16:08:32 -05: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
b22a824948 Merge pull request #4584 from edx/renzo/edit-authors 
Update email address
 2014-07-28 16:42:29 -04:00
Sarina Canelake
eafa6b2227 Fix call to cohorts 2014-07-28 16:19:57 -04:00
Ned Batchelder
7f9839b990 Merge pull request #4492 from edx/ned/poweredby-logos-on-cdn 
Use the CDN-friendly URLs for the Powered-By logos
 2014-07-28 15:33:41 -04:00
polesye
c5c3913783 BLD-1091: Hide user_partitions from Advanced settings. 2014-07-28 22:07:57 +03:00
Renzo Lucioni
9de2f3819d Update email address 2014-07-28 15:04:03 -04:00
Julia Hansbrough
4353e1e48f Merge pull request #4577 from edx/sarina/072814-language-update 
Update translations (autogenerated message)
 2014-07-28 13:13:25 -04:00
Will Daly
144b2578ab Merge pull request #4579 from edx/will/ora2-release-2014-07-28T12.09 
ORA2 release-2014-07-28T12.09
 2014-07-28 13:03:43 -04:00
Usman Khalid
b594bd480a Merge pull request #4427 from edx/usman/lms6507-mako-dir 
Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates.
 2014-07-28 21:52:20 +05:00
Usman Khalid
c770f6e753 Merge pull request #4556 from edx/usman/lms11146-download-csv-of-responses 
In legacy dashboard changed make_usage_key() to make_usage_key_from_deprecated_string()
 2014-07-28 21:46:35 +05: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
Will Daly
5dc884bdb9 ORA2 release-2014-07-28T12.09 2014-07-28 11:56:35 -04:00
Alison Hodges
e79b8bb2a3 Careful identification of "dashboards" 2014-07-28 11:17:31 -04:00
Renzo Lucioni
8bd84b5f3a Overhaul Segment.io integration 2014-07-28 11:08:02 -04:00