Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,207 Commits 1 Branch 0 Tags
5cef287c5dfb2db7aa90ff0478587f1f12e505fd
Commit Graph

30207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Calen Pennington
d9630c7c76 Sample xblock metrics at 10% 2015-04-14 13:46:32 -04: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
E. Kolpakov
bd8754b0ee Removed stale test helper method 2015-04-14 16:12:16 +03: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
E. Kolpakov
75d61b6fa2 Renamed course_key to structure_key to reflect the fact it might be a library key as well. 2015-04-14 14:43:37 +03:00
E. Kolpakov
9bbad95497 Moved library key normalization into library_tools module, fixed library update task test 2015-04-14 14:43:37 +03: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
E. Kolpakov
5737364388 Added library update task test 2015-04-14 12:51:23 +03:00
E. Kolpakov
89443cf5dd Fixed broken test 2015-04-14 12:43:21 +03:00
E. Kolpakov
77cc80f6b6 Added code to fire library_updated signal when library is updated 2015-04-14 12:41:24 +03:00
E. Kolpakov
bd891c21db Added setting to enable/disable library indexing + moved is_index_enabled into search indexer classes 
Added task and signal to fire library reindex
 2015-04-14 12:40:05 +03:00
E. Kolpakov
eb7c5be035 Refactored tests to explicitly state with which modulestores they work 2015-04-14 12:38:36 +03:00
E. Kolpakov
4f6905ed77 Added library search indexer and tests 
Search indexer is not bound to any library modifications, so tests fail - this is expected.
 2015-04-14 12:37:28 +03:00
E. Kolpakov
d34c6a0783 Filtering using search index + tests 2015-04-14 12:32:50 +03:00
E. Kolpakov
2f03b97636 Index dictionary for CapaDescriptor + extending tests to cover it 2015-04-14 12:32:49 +03: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
Sarina Canelake
d3122b0141 Change byte-sized bugs link 2015-04-11 14:59:47 -04:00
David Ormsbee
03c3bbb379 Merge pull request #6636 from jazkarta/feature-pocs 
MIT CCx (was Personal Online Courses)
 2015-04-11 11:15:43 -04:00
Carlos de la Guardia
f9351ef830 MIT: CCX. Code Quality Fixes 
Remove duplicated course listings template code on the student dashboard.
 2015-04-10 23:30:27 -04:00
cewing
8ba74429b1 MIT: CCX. Fixes for API changes that affect the binding of descriptors to student context. 
fix for making sure all descriptor fields are always available for course descriptors despite module_class tricks

add required fields to cache data for tests

use a different strategy to mock up the get_children method
 2015-04-10 23:30:27 -04:00