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

30630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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