Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,680 Commits 1 Branch 0 Tags
445386233e7f53181bd12f6f2d5ce5f8e7e618e7
Commit Graph

33680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Fogg
445386233e Fix date summary blocks for courses without an end date. 
I also took this opportunity to do some small cleanups of the date
summary code, specifically converting some attributes to properties in
order to remove a Pylint directive disabling warnings about missing
docstrings.
 2015-11-05 09:11:10 -05:00
Eric Fischer
24ee5a68f5 Merge pull request #10490 from edx/release 
Release 4 November 2015 to master
 2015-11-04 13:19:09 -05:00
Sarina Canelake
e46b43963c Merge pull request #10416 from louyihua/underscore_ngettext 
Fix underscore extraction error
 2015-11-04 12:17:01 -05:00
Peter Fogg
31e609ff8f Merge pull request #10510 from edx/peter-fogg/update-cert-info-docstring 
Update `cert_info` docstring with correct return type.
 2015-11-04 12:07:49 -05:00
Peter Pinch
01f1c3a160 Merge pull request #10478 from mitocw/enhancement/aq/disable_auto_enrol_ccx 
Disabled auto enroll in ccx coach's enrollment tab
 2015-11-04 11:28:01 -05:00
Eric Fischer
ae7b44bb4d Merge pull request #10497 from edx/rc/2015-11-03 
Fixing cert_status None bug
 2015-11-04 11:07:20 -05:00
Peter Fogg
13f20d5649 Update cert_info docstring with correct return type. 2015-11-04 10:29:27 -05:00
Peter Fogg
5bd6e829e7 Merge pull request #10465 from edx/peter-fogg/fix-spec-helpers-closure 
Fix `withData` and `withConfiguration` helpers.
 2015-11-04 10:21:30 -05:00
Sarina Canelake
b48b2b645f Merge pull request #10487 from edx/renzo/ugettext-noop 
Where possible, use ugettext_noop instead of lambdas assigned to the underscore
 2015-11-04 10:18:12 -05:00
Ned Batchelder
babd422f76 Merge pull request #10500 from edx/ned/explain-why-prereqs-arent-installing 
If NO_PREREQ_INSTALL is set, print a message to explain why
 2015-11-04 09:56:32 -05:00
Renzo Lucioni
2f0e663581 Use ugettext_noop instead of lambdas assigned to the underscore 
Replaces instances of an old hack with the more clear ugettext_noop.
 2015-11-04 09:17:18 -05:00
Ben Patterson
a1bb822c8e Generify message. User will see context in previous console line. 2015-11-04 08:40:56 -05:00
Ned Batchelder
68182b13d2 Merge pull request #10474 from edx/ned/django-pylint 
Use 0.3.2 of edx-lint, with pylint-django and C extensions read
 2015-11-04 06:16:01 -05:00
louyihua
c78b306a30 Fix a underscore extraction error 
ngettext and its parameters should not be separated into multiple lines.
 2015-11-04 15:03:29 +08:00
Amir Qayyum Khan
1f60e9696f Disabled auto enroll in ccx enrollment tab 2015-11-04 11:56:01 +05:00
Eric Fischer
dc469ea5ec Fix cert_status None. Add GeneratedCertificate to admin 2015-11-03 21:54:48 -05:00
Andy Armstrong
cd3f8ded2b Fix typo 2015-11-03 18:46:42 -05:00
Ned Batchelder
3f79dd0b75 If NO_PREREQ_INSTALL is set, print a message to explain why 2015-11-03 17:34:22 -05:00
Ned Batchelder
1f093eccfb Use 0.3.2 of edx-lint, with pylint-django and C extensions read 2015-11-03 16:22:40 -05:00
Adam
59af66c6a5 Merge pull request #10488 from edx/adam/disable-check-button-on-save-click 
Adam/disable check button on save click
 2015-11-03 15:31:52 -05:00
Eric Fischer
0951dc3967 Merge pull request #10442 from edx/rc/2015-11-03 
Release 3 November 2015
 2015-11-03 14:43:19 -05:00
Adam Palay
bc6caea6a6 add test for disabling check button while clicking save 2015-11-03 14:02:37 -05:00
Giulio Gratta
99cca05730 Disable submit button on save click 2015-11-03 14:01:21 -05:00
Ben Patterson
79c2501c8d Merge pull request #10486 from edx/benp/more-better-doc 
Fix formatting.
 2015-11-03 13:10:10 -05:00
Ben Patterson
c009035806 Fix formatting. 2015-11-03 13:08:44 -05:00
Ben Patterson
74ef9dd047 Merge pull request #10480 from edx/benp/update-bokchoy-docs 
Improve documentation for bok-choy.
 2015-11-03 13:05:24 -05:00
Ben Patterson
343d285651 Improve documentation for bok-choy. 
Includes info about the serversonly/testsonly pattern, as well
as multiprocessing.
 2015-11-03 12:15:13 -05:00
Robert Raposa
a85cc9e1d3 Merge pull request #10482 from edx/robrap/SEC-27 
SEC-27: Escape json for Studio advanced settings
 2015-11-03 11:36:06 -05:00
Sarina Canelake
1172a49580 Merge pull request #10445 from stvstnfrd/chat 
Remove chat feature
 2015-11-03 11:11:23 -05:00
Robert Raposa
44bd65293a Escape json for Studio advanced settings 
- Resolve SEC-27 by escaping course name in advanced settings
- Add escape_json_dumps to simplify escaping json in Mako templates

SEC-27: XSS/JS Error in Advanced Settings with invalid course name
 2015-11-03 10:38:39 -05:00
Eric Fischer
a5473a4e82 Merge pull request #10469 from edx/efischer/hotfix_management_command 
Post-migration management command
 2015-11-03 10:31:36 -05:00
Eric Fischer
3609cc7a99 Post-migration management command 
On devops recommendation, now handling the potential for an 'inconsistency
window' via a management command instead of a hacky "re-run the data migration"
bash script.
 2015-11-03 10:30:43 -05:00
Matt Drayer
fc77a6eae7 Merge pull request #10363 from edx/saleem-latif/SOL-1315 
SOL-1315: Add Cert Exception UI on Instructor Dash
 2015-11-03 10:09:19 -05:00
Jesse Zoldak
81782c4ecf Merge pull request #10283 from edx/zoldak/SOL-1160 
Fix for flaky asset test SOL-1160
 2015-11-03 10:07:39 -05:00
Christina Roberts
a943fbef6a Merge pull request #10462 from edx/christina/tnl-3725 
Fix flaky video test
 2015-11-03 09:56:52 -05:00
Ben Patterson
6e80cedc2d Merge pull request #10138 from edx/benp/2-multiprocess-bokchoy-oct15 
Multi-process bok-choy tests
 2015-11-03 09:25:05 -05:00
Jesse Zoldak
71ecb6c9f2 Fix for flaky asset test SOL-1160 2015-11-03 09:22:08 -05:00
David Baumgold
acd4c566e6 Merge pull request #10466 from edx/db/fix-profile-path 
Fixed an incorrect revert
 2015-11-03 09:21:33 -05:00
Ben Patterson
7eb9cecb9b Ability to run bok-choy in multiprocess mode. 
This includes:
* Ability to specify number of processes to run bok-choy tests in
* A forked nose commit to get the multiprocess plugin's logging to work
* A different plugin (xunitmp) must be used for pulling together xunit results

This works by:
* Starting the various servers that are needed for the acceptance test environment
* Running the tests themselves in multiprocess mode
 2015-11-03 08:19:20 -05:00
David Ormsbee
923c24df53 Merge pull request #10472 from edx/ormsbee/nr_xblock_handler_reporting_fix 
New Relic transaction naming now ignores suffix most of the time.
 2015-11-03 07:52:04 -05:00
Waheed Ahmed
8103378ba6 Merge pull request #10398 from Qubad786/mrehan/500-error-tnl3643 
Bug fix: Added test cases and updated course info view with exception handling
 2015-11-03 15:21:59 +05:00
Vedran Karačić
f3900b230c Merge pull request #10458 from edx/vkaracic/testing.rst-update 
Changed command description texts to be sentences
 2015-11-03 09:15:43 +01:00
Saleem Latif
99bd47e9a8 Add Cert Exception UI on Instructor Dash 2015-11-03 12:52:22 +05:00
Qubad786
36fe97c6c8 Bug fix: Added test cases and updated course info and index view with exception handling 
TNL-3643
 2015-11-03 12:43:47 +05:00
Bill DeRusha
f4dc1f33e2 Merge pull request #10471 from edx/bderusha/refund-follow-on 
Compare all refund dates in UTC
 2015-11-02 22:38:04 -05:00
David Ormsbee
0aa58f5033 New Relic transaction naming now ignores suffix most of the time. 
The only time it should include the suffix is when the handler is
explicilty "xmodule_handler", meaning it's an old-style handler
that routes everything. For example, Capa uses one handler for
all its AJAX requests, and only differentiates actions based on
suffix ("get", "problem_check", etc.).

What prompted this change is that LTIDescriptor defines a handler
"lti_2_0_result_rest_handler" which encodes user-specific
information into the suffix. This is a perfectly valid thing to
do, but it blows out the number of named transactions in our
metrics.
 2015-11-02 22:17:46 -05:00
David Baumgold
b023631837 Merge pull request #10468 from edx/db/fix-i18n-incorrect-replacement 
Fix an incorrect string format
 2015-11-02 21:27:44 -05:00
Bill DeRusha
6123827ab1 Compare all refund dates in UTC 2015-11-02 20:00:06 -05:00
stv
3a2c0e37dc Remove chat feature 
This was originally contributed upstream by Stanford, circa 2013.

We neither use nor support this feature in its current implementation,
and in fact, we may never have used this production. Until recently, we
had additional chat/Jabber code [1] (in the form of a Jabber djangoapp in
LMS); context there suggests this feature may have never been more than
a prototype. The original author is no longer on the team, so I can't directly
confirm this on our end.

Do you use this feature?

Stanford had already abandoned this Jabber-backed chat implementation,
in favor of an IRC backend, by the time I joined the team in early 2014.

[1] dbe52a6b13
 2015-11-02 14:08:58 -08:00
David Baumgold
b22faf1f01 Fix an incorrect string format 2015-11-02 16:37:36 -05:00