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

33648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amir Qayyum Khan
1f60e9696f Disabled auto enroll in ccx enrollment tab 2015-11-04 11:56:01 +05:00
Andy Armstrong
cd3f8ded2b Fix typo 2015-11-03 18:46:42 -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
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
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
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
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
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
David Baumgold
b921d995fc Fixed an incorrect revert 
When I reverted the edx.org theme in 116ca29189,
I reverted this line incorrectly. It should be like this.
 2015-11-02 16:16:36 -05:00
Bill DeRusha
dd5a6acfc1 Merge pull request #10444 from edx/bderusha/mailchimp-country 
Convert country to unicode before sending to segment
 2015-11-02 13:59:38 -05:00
cahrens
f94459dde2 Provide time for the display of video speed to change. 
TNL-3725
 2015-11-02 13:33:59 -05:00
Vedran Karačić
731d8a4e68 Changed command description texts to be sentences 2015-11-02 18:25:20 +00:00
Peter Fogg
27be371a2c Merge pull request #10430 from edx/peter-fogg/date-summary-blocks 
Date summary blocks.
 2015-11-02 12:42:36 -05:00
Bill DeRusha
572ea25678 Convert segment country to unicode. 2015-11-02 11:59:47 -05:00
Sarina Canelake
1804ee77a6 Merge pull request #10456 from open-craft/unenroll-course-name-bugfix 
Fix bugs in course unenroll popup
 2015-11-02 11:58:52 -05:00
Matjaz Gregoric
3320ecf418 Move unenroll messages into separate data attributes. 
Having the messeges embedded into onclick attributes was fragile because
it could break if the translated string contained special characters
such as single quotes.

Rather than trying to escape the special characters inside the onclick handler,
move the translatable strings into separate h-escaped data attributes and interpolate
the values in the (already existing) jQuery click handler rather than in the
inline onclick handler.

This makes the javascript code more consistent as well as fixes the problem
where the popup would break if translation included single quotes.
 2015-11-02 17:21:28 +01:00
Matjaz Gregoric
1037e6b551 Replace s placeholder with %()s in course listing. 
The string is passed through the JS 'interpolate' function,
which expects %()s style placeholders.
 2015-11-02 17:21:27 +01:00
Peter Fogg
42ce6b96a3 Merge pull request #10446 from edx/peter-fogg/hide-studio-due-date 
Hide Xblock due dates in studio for self-paced courses.
 2015-11-02 11:04:44 -05:00
Peter Fogg
d7417d62cc Date summary blocks on the course home page. 
Enabled behind the
`SelfPacedConfiguration.enable_course_home_improvements` flag.

ECOM-2604
 2015-11-02 10:49:18 -05:00
Clinton Blackburn
847797da5f Merge pull request #10460 from edx/clintonb/enrollment-admin 
Removed read-only fields from enrollment admin
 2015-11-02 10:20:49 -05:00
Matt Drayer
b900221ca4 Merge pull request #10394 from edx/asadiqbal08/SOL-1292 
asadiqbal08/SOL-1292 Entrance Exam is not imported with an imported course
 2015-11-02 10:14:47 -05:00
Christina Roberts
67f649a2d7 Merge pull request #10435 from edx/christina/flaky-bio 
Remove flaky flag from profile bok choy test
 2015-11-02 09:59:03 -05:00
Sarina Canelake
42c5f2ff8c Merge pull request #10125 from open-craft/smarnach/course-number-class 
Add a class to the course number in the page header to facilitate hiding it in a theme.
 2015-11-02 09:55:30 -05:00
Peter Fogg
709758e433 Hide Xblock due dates in studio for self-paced courses. 2015-11-02 09:35:58 -05:00
Syed Hasan raza
cdd5a6f8fb Merge pull request #7016 from edx/shr/bug/TNL-1355-Studio-username-field-area-alignment 
set max width for nav-account-user for long characters
 2015-11-02 06:30:33 -08:00
Syed Hassan Raza
f582d1a832 adjusment for long usernames 2015-11-02 16:14:53 -08:00
Clinton Blackburn
c34dfac1ff Removed read-only fields from enrollment admin 
The read-only protection is more hassle than it's worth when testing locally and on stage. It's a solution to a problem we don't actually have, so I have reverted the changes.
 2015-11-02 09:25:56 -05:00
Awais Jibran
2587ebc931 Merge pull request #10355 from edx/aj/tnl2324-xblocksaveerror-exception 
Updating edx-platform for XBlock#323
 2015-11-02 19:22:30 +05:00
Awais Jibran
6319142a86 Updating edx-platform for XBlock#323 2015-11-02 18:17:47 +05:00
asadiqbal
bf0affc25d SOL-1292 2015-11-02 14:33:12 +05:00
Ahsan Ulhaq
1c66fbc812 Merge pull request #10277 from edx/ahsan/ECOM-2338-adding-Messaging-and-text-improvements-unaffected-changes 
Reimplemented text changes for dashboard
 2015-11-02 11:34:25 +05:00
Ned Batchelder
365e497c17 Merge pull request #10443 from edx/ned/fix-edx-oauth2-provider-installation 
Egg name needs to match setup(name=..) to get installed properly
 2015-10-31 12:34:10 -04:00