Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
28,644 Commits 1 Branch 0 Tags
002dc0f553313667e98fa4233750034e4c83fced
Commit Graph

10477 Commits

Author SHA1 Message Date
Waheed Ahmed
0086893ddd Fixed option was not remain selected after submitting. 
TNL-1419
 2015-02-18 18:50:32 +05:00
Sarina Canelake
73c309935b Merge pull request #6679 from open-craft/problem-tooltips 
Support for inline explanatory popups in problem XML
 2015-02-18 08:37:03 -05:00
Shrhawk
24a63dadf9 Merge pull request #6694 from edx/shr/bug/TNL-1202-HD-button-not-working-properly 
Hd button on for default high resolutions
 2015-02-18 14:11:27 +05:00
Xavier Antoviaque
132cadb517 Merge pull request #2968 from edx-solutions/xblock-external-ui 
xblock-external-ui: Add XBlock API call to render XBlock views
 2015-02-18 08:58:33 +01:00
Syed Hassan Raza
44468f840e Hd button on for default high resolutions 
TNL-1202
 2015-02-18 12:49:27 +05:00
David Baumgold
e5c650d394 Merge pull request #7006 from stvstnfrd/dead 
Remove dead code paths
 2015-02-17 16:44:17 -05:00
Clinton Blackburn
2854bb9524 Added Course Structure API 2015-02-17 13:23:34 -05:00
Will Daly
cec3484184 Merge pull request #6969 from edx/will/ecom-1055 
ECOM-1055: Add messaging for when a student's verification will expire before the deadline
 2015-02-17 10:57:57 -05:00
Waqas Khalid
d6efd1285c Merge pull request #6996 from edx/waqas/tnl1390-missing-discussion-blackout 
Missing discussion blackout throwing exception
 2015-02-17 20:23:40 +05:00
Will Daly
6796b07d56 Add messaging for when a student's verification will expire before the deadline. 2015-02-17 09:55:29 -05:00
muzaffaryousaf
f0cfc93a5a Adding the support for '$exists' into the get_items for split mongo. 
TNL-1451
 2015-02-17 17:13:51 +05:00
Xavier Antoviaque
05c857478b xblock-external-ui: Adds support for CORS headers (cross-domain request) 
xblock-external-ui: Alternate referer check for CORS requests
xblock-external-ui: Allow to disable httponly on session cookies
xblock-external-ui: Add a unit test for CorsCSRFMiddleware
 2015-02-17 10:24:27 +01:00
stv
01bd96512a Remove shadowed class declaration 
It looks like one version of the class was first added [1] and then a
few days later, another was written [2]. The newer declaration appeared
lower in the file, allowing it to hide the other.

This removes the first, hidden declaration.

[1] commit 7aa493ec85
    Date:   Fri Mar 1 10:36:20 2013 -0500
[2] commit f62dad2f57
    Date:   Tue Mar 5 16:31:02 2013 -0500
 2015-02-16 22:55:22 -08:00
Waqas Khalid
a730f81132 Missing discussion blackout throwing exception 
When the list is empty in discussion blackout
on studio side it causes the exception on lms
side when we try to access the discussion. We
were expecting the values and try to parse it
in two values start and end date whereas parsing
empty values to two values causing the exception.
Now values will be parse when value exists. Empty
value will be ignored.

TNL-1390
 2015-02-16 19:43:03 +05:00
Piotr Mitros
7aea582ab0 Merge pull request #6973 from edx/pmitros/add-video-events 
Adds events to video player for CC menu
 2015-02-14 22:22:11 -05:00
John Eskew
e15435ebef Skip import/export mongo call count test - off by one call sometimes. 2015-02-13 16:48:48 -05:00
Will Daly
62b91d6fcc Merge pull request #6982 from edx/will/update-linkedin-field-name 
LinkedIn Add to Profile source parameter
 2015-02-13 14:03:10 -05:00
Clinton Blackburn
052fa8eafc Merge pull request #6935 from edx/clintonb/course-structure 
Generating Course Structure Asynchronously on Course Publish
 2015-02-13 13:37:05 -05:00
John Eskew
d0c9daa4f8 Merge pull request #6920 from edx/jeskew/eager_loading_xblocks_to_depth 
Improve performance of import/export and course traversal with Split modulestore.
 2015-02-13 12:37:25 -05:00
Will Daly
a18e0c6bc7 Rename LinkedIn configuration field to "company_identifier" 
Add "source" parameter to LinkedIn add-to-profile URL.

Add platform name to certification name.

Style changes for linked in sharing on dashboard
 2015-02-13 12:23:51 -05:00
Clinton Blackburn
92ca64fa2a Finishing async course structure work 
- Added tests
- Updated model field specification
- Fixed issue of multiple event emission
- Updated admin page
- Added management command to manually generate course structures
 2015-02-13 12:21:51 -05:00
Martyn James
3a28c5709c Merge pull request #6896 from edx/mjevtic/fixing-video-module-tests-for-search 
Fixed a test_video issue regarding settings
 2015-02-13 12:14:34 -05:00
Will Daly
29c769bc2f Merge pull request #6987 from edx/will/country-access-feature-flag-fixup 
Skip country access check if feature flag is disabled
 2015-02-13 10:55:02 -05:00
Piotr Mitros
dc227cb525 Added events for showing and hiding cc menu in videos with translations 2015-02-13 10:30:57 -05:00
Chris
9c82195808 Merge pull request #6880 from edx/clrux/lms-navigation-icon-update 
Adding markup for icon fonts; adding custom styles for said icons
 2015-02-13 09:59:17 -05:00
Will Daly
125f6957fc Skip country access check if feature flag is disabled 2015-02-13 08:57:37 -05:00
Will Daly
7da15ea1d2 Merge pull request #6957 from edx/will/country-access-part-3 
Finish Country Access (Part 3 of 3): Block enrollment from third party auth
 2015-02-12 22:25:07 -05:00
Chris Rodriguez
0326c1917a Adding markup for icon fonts; adding custom styles for said icons 2015-02-12 18:50:47 -05:00
John Eskew
2a4a89a9b6 Add course traversal mongo call count for old Mongo. 2015-02-12 15:45:13 -05:00
John Eskew
28e1ecc5c4 Change test filename again. 2015-02-12 13:36:10 -05:00
John Eskew
c3d2962b48 Refactor contentstore/modulestore builders to wrap both in a single 
contextmananger. Add ddt to mongo call count testing.
 2015-02-12 13:34:07 -05:00
Akiva Leffert
388139778d Add optional email_opt_in parameter to enrollment end point. 
JIRA: MA-286
 2015-02-12 10:40:27 -05:00
Piotr Mitros
eb2d8c4e68 Merge pull request #6867 from edx/pmitros/add-referer 
Add referer and accept_language to tracking logs
 2015-02-12 08:34:04 -05:00
Jesse Zoldak
2b3d927f68 Merge pull request #6964 from edx/zoldak/TE-745 
Fix flaky library test TE-745
 2015-02-12 06:55:50 -05:00
marjev
f444d9b5e7 Updated unit tests for video module 2015-02-12 10:51:32 +01:00
David Ormsbee
ba5cbb64d5 Add course publish signal to old Mongo modulestore. 2015-02-11 16:13:10 -05:00
David Ormsbee
574319fa35 Minor update to SignalHandler to better document how it should be used. 2015-02-11 16:13:10 -05:00
David Ormsbee
24fcab7f24 Very rough cut at generating a course outline after publishing. 2015-02-11 16:13:10 -05:00
Piotr Mitros
cf719a40ba Add referer and accept_language to tracking logs 
3 line patch, together with a world of pain due to buggy code, broken abstractions in tests, etc.
 2015-02-11 13:35:27 -05:00
Will Daly
5e732ea25c Country Access: Block enrollment from third party auth 
Users who are blocked from enrolling in a course
due to an embargo are redirected to the blocked
message page after authentication completes.
 2015-02-11 13:18:15 -05:00
Will Daly
70ec4c5f66 Merge pull request #6948 from edx/will/country-access-part-2 
Finish Country Access (Part 2 of 3)
 2015-02-11 13:15:38 -05:00
Jesse Zoldak
405c92f4f4 Fix flaky library container test TE-745 2015-02-11 12:47:02 -05:00
John Eskew
3565435edc Change filename of Split mongo call count tests. 2015-02-11 10:55:33 -05:00
John Eskew
f143b7f013 Move lazy-loading override logic into cache_items and add explanation. 2015-02-11 10:50:32 -05:00
John Eskew
1b66b1a40a Add new tests for number of MongoDB calls upon course import/export 
and depth-first course tree traversal beginning at root.
 2015-02-11 10:50:32 -05:00
John Eskew
0e6bc21019 Add missing caching for SplitBulkWriteMixin:get_definitions(). 
If a particular depth is requested, override lazy definition loading.
 2015-02-11 10:50:32 -05:00
Awais Qureshi
f3c3202341 Merge pull request #6931 from edx/awais786/ECOM-1028-add-profile-linkedin 
ECOM-1028 adding linked-in button , config model and migration for linke...
 2015-02-11 20:45:30 +05:00
Waqas Khalid
4f326a8ca3 Merge pull request #6832 from edx/waqas/tnl1149-discussion-mathjax-solution 
Discussion forum should be independent of mathjax
 2015-02-11 20:27:45 +05:00
Adam
20c9a8af19 Merge pull request #6510 from smarnach/safari-video-speed 
Work around a Youtube API bug that causes Safari to ignore the stored speed
 2015-02-11 10:17:29 -05:00
Awais
57ef60de0a ECOM-1028 adding linked-in button , config model and migration for linked url. 
ECOM-1028 update the migration and move the code into class method.
 2015-02-11 19:09:30 +05:00