Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,672 Commits 1 Branch 0 Tags
2cd265292fbfb635d34ca199fd7f424a8eb4af89
Commit Graph

29672 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
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
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
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
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
ataki
2c6226362e Warning that hard start/stop times don't work for mobile 2015-04-15 14:47:42 -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
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
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
Adam
d3bb72251e Merge pull request #7683 from edx/release 
Release
 2015-04-14 11:45:12 -04:00
aamir-khan
3b015cd8d9 ECOM-1396: added the xblock setup in github.txt of edx-platform 2015-04-14 19:28:43 +05:00
Marko Jevtić
a3aecb2014 Merge pull request #7548 from edx/mjevtic/SOL-531 
(SOL-531)(SOL-532) Course Cards update on the homepage;
 2015-04-14 16:17:34 +02:00
Marco Morales
1aa6275b7b updated styling for LMS post references 2015-04-14 10:06:01 -04:00
zubair-arbi
b6fd30313a Merge pull request #7679 from edx/zub/bugfix/ecom-1355-ie9-verification-webcam-without-flash 
show error message to user on photo reverification page if Flash not fou...
 2015-04-14 18:41:39 +05:00
marjev
939a3672d4 (SOL-531)(SOL-532)Course Cards update; A link to course discovery page has been added to the OpenEdX homepage 2015-04-14 14:58:06 +02:00
zubair-arbi
e04e61d686 show error message to user on photo reverification page if Flash not found 
ECOM-1355
 2015-04-14 15:39:51 +05:00
Sarina Canelake
b3ab7fcea1 Merge pull request #7674 from applecool/authors 
Added name to the authors list
 2015-04-13 16:48:14 -04:00
applecool
74415858b1 Added name to the authors list 2015-04-13 16:39:44 -04:00
Christopher Lee
9bf8ae5b52 Merge pull request #7635 from edx/clee/MA-318 
MA-318, change edx video id to video id
 2015-04-13 14:55:56 -04:00
Matt Drayer
97f0cf108f Merge pull request #7577 from edx/mattdrayer/SOL-464 
Add course-specific URL overrides for social sharing icons on student da...
 2015-04-13 14:42:15 -04:00
Will Daly
c81bac956c Escape curly quotes in release page table 2015-04-13 14:22:58 -04:00
christopher lee
c42097b458 MA-318, change edx video id to video id 2015-04-13 13:31:37 -04:00
Matt Drayer
ffe30da7a5 Add course-specific URL overrides for social sharing icons on student dashboard 
- sharing enabled for custom URLs only if URL actually specified
 2015-04-13 13:14:43 -04:00
Greg Price
903422b861 Enable OAuth token exchange only if OAuth provider 2015-04-13 12:46:28 -04:00
Martyn James
e1be8a526a Merge pull request #7655 from edx/dcikatic/SOL-570 
SOL-570 Remove djangotracker from common imports - merging
 2015-04-13 12:43:02 -04:00
Waqas Khalid
52488cae8c Merge pull request #7662 from edx/hotfix/2015-04-13 
Revert hotfix for PLAT-452
 2015-04-13 21:29:15 +05:00