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

33604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Awais
2cd265292f ECOM-1421 implementing the functionality 2015-04-16 21:46:47 +05:00
Adam
38811f218b Merge pull request #7716 from edx/hotfix/2015-04-16 
Hotfix/2015 04 16
 2015-04-16 12:14:26 -04:00
Adam Palay
987ea8551e fix quality violation 2015-04-16 10:13:36 -04:00
David Baumgold
294e24dd8f Strict comparison between expected_fields and displayed_fields 2015-04-16 10:07:40 -04:00
Marco Morales
9e525d6b5c added images to the bulk email directory to include Youtube as a social icon option 2015-04-16 10:03:22 -04:00
Feanil Patel
fd99d55218 Merge pull request #7715 from edx/feanil/sassy_certs 
Be more specific about where we compile sass from.
 2015-04-16 09:07:32 -04:00
Waheed Ahmed
ec16bc3710 Merge pull request #7701 from edx/waheed/tnl2000-ora-release-tag 
Added new release tag for ORA2.
 2015-04-16 16:00:47 +05:00
Chris Rodriguez
b6b7acbd53 Chaning table th td color to meet AA guidelines 2015-04-16 06:57:42 -04:00
Chris
c641155cb2 Merge pull request #7467 from edx/clrux/UX-1810-a11y-color-fix--blue 
Accessibility: Updating the color blue on LMS
 2015-04-16 06:55:32 -04:00
Aamir
a5bacc3461 Merge pull request #7682 from edx/aamir-khan/ECOM-1287-reverification-xblock-in-github 
ECOM-1396: added the xblock setup in github.txt of edx-platform
 2015-04-16 14:55:02 +05:00
Ahsan Ulhaq
eba02da233 Merge pull request #7544 from edx/ahsan/tnl-1675-iframe-elements-require-meaningful-title 
iframe elements require a meaningful title attribute
 2015-04-16 13:54:15 +05:00
Waheed Ahmed
5fec96aefc Added new release tag for ORA2. 
TNL-2000
 2015-04-16 12:39:00 +05:00
Awais Jibran
efc1d5d3ef Merge pull request #7649 from edx/aj/tnl1902-fix-long-latex-post-discussion 
Fixed Long discussion post not rendering Latex expressions
 2015-04-16 10:49:58 +05:00
Marco Morales
031edf6abf Merge pull request #7221 from edx/marco/discussions-related-to 
Updated Styling for course references in discussion forum posts
 2015-04-15 19:47:54 -04:00
Adam Palay
9196817abb Revert "Decrease the number of inserts and updates needed by DjangoKeyValueStore" 
This reverts commit 88b9187476.
 2015-04-15 17:41:11 -04:00
Carson Gee
deefce0194 Merge pull request #7700 from mitocw/feature/cg/ccx_urls 
Put CCX URLs behind their feature flag
 2015-04-15 17:39:52 -04:00
Feanil Patel
b0dbe2f2da Be more specific about where we compile sass from. 
There are now folders under static that have sass that should not be compiled
as a part of our asset pipeline,  they were getting pulled in because the wildcard
for `SASS_UPDATE_DIRS` was too broad.  This update makes it more specific for most
folders but leaves it broad for the common folder where the xmodule has its own sass
that needs compiling from a non-standard location.
 2015-04-15 17:27:17 -04:00
David Baumgold
1c910023aa Merge pull request #7111 from ataki/ataki/upstream-pr-video-start-stop 
hard start/stop times to video player
 2015-04-15 16:42:24 -04:00
Carson Gee
b6970d9aa3 Put CCX URLs behind their feature flag 
- Moved the CCX URLS into their django app.
 2015-04-15 16:38:10 -04:00
Will Daly
da8103d2ea Expose course start/end date in the enrollment API 2015-04-15 16:14:30 -04:00
Will Daly
a91d90cbd8 Merge branch 'release' 2015-04-15 16:12:00 -04:00
David Baumgold
9018088c5c Merge pull request #7693 from edx/remove-nested-form-elements 
Remove nested form elements
 2015-04-15 15:33:15 -04:00
Jesse Zoldak
6e34687ff8 Merge pull request #7704 from edx/zoldak/TE-745 
Increase timeout for library page to load after refresh in acceptance tests
 2015-04-15 15:29:19 -04:00
Chris Rodriguez
e789c554c7 Updating blue color variables for accessibility in the LMS 2015-04-15 15:23:23 -04:00
Calen Pennington
39206948e8 Fix contract on context argument 2015-04-15 15:05:32 -04:00
ataki
2c6226362e Warning that hard start/stop times don't work for mobile 2015-04-15 14:47:42 -04:00
David Baumgold
c07ce2ad9e Simplify test_only_expected_fields_are_displayed 
Use sets to accomplish the same result.
 2015-04-15 14:20:12 -04:00
Will Daly
a33dfe5cd8 Merge pull request #7665 from edx/rc/2015-04-15 
Rc/2015 04 15
 2015-04-15 12:34:18 -04:00
Adam Palay
afb2dae631 Revert "Revert "use different queue for smaller emails (TNL-1591)"" 
This reverts commit 228cca4e38ec79f5cbb54098c788ab9556f602e2.
 2015-04-15 12:03:23 -04:00
Jesse Zoldak
708203b3ef Increase timeout for library page to load after refresh in acceptance tests. TE-745 2015-04-15 11:58:32 -04:00
Awais Jibran
65c5ec8073 Fixed Long discussion post not rendering Latex expressions 
TNL-1902
 2015-04-15 20:43:39 +05:00
Clinton Blackburn
cd5039383e Returning complete URL for Enrollment API user messaging 
The Enrollment API now returns the complete URL in the user_message_url field. Returning just the path can result in 404s if the consuming code simply redirects to the value of this field without first checking to see if the hostname is included. Using the full URL solves this problem for all clients.
 2015-04-15 11:29:54 -04:00
Carson Gee
4afedbb001 Add CCX configuration to yaml_config.py 2015-04-15 10:39:32 -04:00
Awais Qureshi
04ca163f82 Merge pull request #7690 from edx/awais786/ECOM-1420-new-field 
ECOM-1420 adding new field and migration file.
 2015-04-15 17:55:44 +05:00
muhammad-ammar
cec4bb3101 Add Simplified and Traditional Chinese as Transcript language options 
TNL-1740
 2015-04-15 15:38:42 +05:00
E. Kolpakov
4d3750a526 Pylint fixes 2015-04-15 13:32:32 +03:00
E. Kolpakov
26b1e8d821 Made methods with no implementation abstract 2015-04-15 13:30:27 +03:00
E. Kolpakov
0b2b9fe2e8 Added management command to manually reindex libraries 2015-04-15 13:01:05 +03:00
Awais
18282919b5 ECOM-1420 adding new field and migration file. 2015-04-15 12:38:43 +05:00
Clinton Blackburn
ea52f4d8f2 Merge pull request #7692 from edx/ECOM-1418 
Fixed Embargo Bug in Enrollment API
 2015-04-14 23:04:25 -04:00
Clinton Blackburn
e18d69a9e9 Fixed Embargo Bug in Enrollment API 
This issue was not found sooner because the test helper used only tested for GeoIP embargoes, and neglected the user profile. An additional test has been added to test for embargoes against the country assigned to the user's profile. Additionally, variable names have been cleaned up--user replaced with username--to avoid confusion in the future.
 2015-04-14 22:07:25 -04:00
Sarina Canelake
07b7c5c83a Merge pull request #7663 from applecool/edxsprint 
Fix for TNL-1639
 2015-04-14 19:40:52 -04:00
Greg Price
ce8a6e5b1d Merge pull request #7666 from edx/gprice/fix-oauth-exchange 
Enable OAuth token exchange only if OAuth provider
 2015-04-14 17:54:27 -04:00
David Baumgold
93e7d795f1 Remove nested form elements 
This is invalid HTML
 2015-04-14 17:01:43 -04:00
Will Daly
860cc8f2e4 Merge pull request #7669 from edx/will/fix-release-script-escaping 
Escape curly quotes in release page table
 2015-04-14 16:28:15 -04:00
ataki
5f5a77acb1 Add comment, refactor, handle edge cases 2015-04-14 15:56:56 -04:00
ataki
27d3d0344d Update variable names for video module 2015-04-14 15:56:56 -04:00
ataki
5917ed063d hard start/stop times to video player 
This pull request makes the video player module respect
the video start/stop times specified by the instructor
as a hard start/stops, i.e. the video treats the start
time as the beginning of the video and the stop time as
the end.

Previously, the video module displayed the full
video and displayed a jquery ui slider range representing
the start and end times.

This new functionality invalidates two previous acceptance
tests for the video module:

    - slider visible test
    - finish time video acceptance test.

These tests are removed from the common acceptance tests.
 2015-04-14 15:56:56 -04:00
Will Daly
1884a0b45e Merge pull request #7688 from edx/revert-plat452 
Revert hotfix for PLAT-452
 2015-04-14 14:32:13 -04:00
Syed Hassan Raza
6b50ffd038 Revert hotfix for PLAT-452 2015-04-14 23:13:55 +05:00