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

29656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 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
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
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
Ali Mohammad
6b11ff6f22 Merge pull request #7650 from edx/multibeacon 
Added more precise alerting to video beacon experiment.
 2015-04-13 12:11:21 -04:00
Dino Cikatic
0fa86e3d5c SOL-570 Remove djangotracker from common imports 2015-04-13 11:58:37 -04:00
David Ormsbee
b1e8fcf614 Merge pull request #7560 from mcgachey/mcgachey-oauthlib-version 
[Dependencies] Upgrading oauthlib from 0.6.3 to 0.7.2
 2015-04-13 11:52:24 -04:00
applecool
c4cdfe210f Fix for TNL-1639 2015-04-13 11:41:07 -04:00
Sarina Canelake
2c7dd724b3 Merge pull request #7656 from louyihua/cms_i18n_1 
i18n fix in studio
 2015-04-13 11:30:33 -04:00
Syed Hassan Raza
08c6752722 Revert hotfix for PLAT-452 2015-04-13 20:20:19 +05:00
Sarina Canelake
13fe58e195 Merge pull request #7637 from louyihua/misc_i18n_1 
Better i18n for LMS
 2015-04-13 11:14:36 -04:00
chrisndodge
f38b90fd3c Merge pull request #7659 from edx/cdodge/fix-translation-help 
fix I18N errors in business order confirmation email
 2015-04-13 10:46:50 -04:00
Chris Dodge
768dd92256 fix I18N errors in business order confirmation email 2015-04-13 09:39:07 -04:00
Awais Qureshi
b8368617e6 Merge pull request #7627 from edx/awais786/ECOM-1183-verification-expiry 
ECOM-1183 fixing the
 2015-04-13 18:10:40 +05:00
louyihua
7a45d6e471 i18n fix in studio 
1. Fix the broken `gettext()` call in `courde_detail.js`
2. Change the string to avoid Transifex misunderstand the pattern '% o' in `checklist.underscore`.
3. Embed the `{filename}` part inside the string in `transcripts-choose.underscore` to provide better i18n flexibililty.
4. Remove all the call of `gettext()` and `${_()}` inside the `mock` directory to aovid mis-extraction by pybabel. (It seems that the `mock` directory is soly used in test? So the strings in this directory need not to be extracted and translated?)
5. The unicode char `\u2014` will trigger a bug inside pybabel which makes the extracted string untranslatable, so remove this char.
 2015-04-13 19:00:52 +08:00
louyihua
9a0da7d670 Better i18n 
Combine sentences in several pages for better translation.
 2015-04-13 13:10:23 +08:00
Sarina Canelake
b6265c4410 Merge pull request #7657 from edx/sarina/fix-typo 
Fix typo: Certfificate -> Certificate
 2015-04-11 23:46:04 -04:00
Sarina Canelake
293f256817 Fix typo: Certfificate -> Certificate 2015-04-11 18:24:37 -04:00