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

26516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ben McMorran
2cc72ca015 Show category when an xblock does not have a default display name 2014-07-30 10:30:18 -04: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
stv
510c130c1a Fix incorrect max upload file size on forums 
The file size is calculated and displayed as a number of bytes, but was
being incorrectly labeled as 'K' [0].

The size is now correctly labeled as "bytes" and the sentence now begins
with a leading captial letter.

Impact: This has been broken on master since 2012 [1].

[0] https://github.com/edx/edx-platform/blob/master/lms/djangoapps/django_comment_client/settings.py#L4
[1] 5d90366917
 2014-07-29 12:18:22 -07: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
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
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
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
Sarina Canelake
79d3f798f3 Update translations (autogenerated message) 2014-07-28 10:29:32 -04:00
Ned Batchelder
41ed2db720 Use the CDN-friendly URLs for the Powered-By logos 2014-07-28 10:20:22 -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
Don Mitchell
ff696a2f2a Merge pull request #4440 from edx/bug/import 
Bug/import
 2014-07-28 09:44:15 -04:00
Ben Patterson
1bd6c71112 Merge pull request #4571 from edx/benp/acc-env-settings 
Simplify acceptance test env pipeline handler settings.
 2014-07-28 09:31:20 -04:00
Oleg Marshev
a340ad53cf Remove import. 2014-07-28 15:43:10 +03:00