Commit Graph

28601 Commits

Author SHA1 Message Date
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
eb22e1ba23 Merge pull request #6994 from edx/jeskew/skip_mongo_call_count_test
Skip import/export mongo call count test - off by one call sometimes.
2015-02-13 16:49:52 -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
Chris
48b50fa097 Merge pull request #6971 from edx/clrux/rtl-1630-fix
RTLifying the forgot password link
2015-02-13 15:15:24 -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
Chris Rodriguez
a1143d45ba RTLifying the forgot password link 2015-02-13 13:25:20 -05:00
Sarina Canelake
0217f50f12 Merge pull request #6986 from edx/sarina/fix-link
Fix translator's guide link
2015-02-13 12:53:55 -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
Muzaffar yousaf
5d4e84eb37 Merge pull request #6984 from edx/muzaffar/studio-group-config-tnl1446
Applying unicode to the content experiment display name.
2015-02-13 20:58:41 +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
Sarina Canelake
eb04ba2e9b Fix translator's guide link
various pylint fixes
2015-02-13 10:51:58 -05:00
Chris
2c8698c087 Merge pull request #6970 from edx/clrux/rtl-1629-fix
Adding new logistration Sass partial to RTL compiled
2015-02-13 10:46:54 -05:00
Chris
7766ed64a3 Merge pull request #6972 from edx/clrux/rtl-1631-fix
RTL-ifying footer
2015-02-13 10:45:16 -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
Chris Rodriguez
23557b9800 RTL-ifying footer 2015-02-13 09:44:17 -05:00
Chris Rodriguez
be7b3f2949 Adjusting RTL styles for UX-1628 2015-02-13 09:44:17 -05:00
Will Daly
125f6957fc Skip country access check if feature flag is disabled 2015-02-13 08:57:37 -05:00
Sarina Canelake
1b07bcdf67 Merge pull request #6949 from stvstnfrd/gettext/empty
Remove superfluous empty string check
2015-02-13 08:31:31 -05:00
muzaffaryousaf
bff205579b Minor refactoring.
TNL-1146
2015-02-13 14:56:33 +05:00
muzaffaryousaf
4189bd19f7 Applying unicode to the usage label with test.
TNL-1146
2015-02-13 14:54:34 +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
bed9d2f5da Adjusting line height and labels 2015-02-12 18:53:20 -05:00
Chris Rodriguez
7c02782f90 Adding new logistration Sass partial to RTL compiled 2015-02-12 18:53:20 -05:00
Chris
7e2d4decd9 Merge pull request #6966 from edx/clrux/rtl-1628-fix
Adjusting RTL styles for UX-1628
2015-02-12 18:51:44 -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
Christina Roberts
60836459d5 Merge pull request #6965 from edx/christina/course-reruns-default
Enable course reruns by default.
2015-02-12 14:15:20 -06: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
ee03612a20 Merge pull request #6959 from edx/aleffert/email-opt-with-enrollment
Add optional email_opt_in parameter to enrollment end point.
2015-02-12 11:58:07 -05:00
Chris Rodriguez
23e2b8b702 Adjusting RTL styles for UX-1628 2015-02-12 11:29:59 -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
Muzaffar yousaf
5bcb3a5e92 Merge pull request #6611 from edx/muzaffar/change-submission-version-tnl1125
Changing the edx-submissions version to latest commit.
2015-02-12 18:04:15 +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
muzaffaryousaf
71e267eb69 Changing the edx-submission repo version to the latest commit.
TNL-1125
2015-02-12 15:54:30 +05:00
marjev
f444d9b5e7 Updated unit tests for video module 2015-02-12 10:51:32 +01:00
cahrens
0d2969909f Enable course reruns by default.
TNL-1380
2015-02-11 17:16:52 -05:00
David Ormsbee
88681ba91a Make the Course Structure admin slightly more usable (list/search fields) 2015-02-11 16:13:10 -05: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
John Eskew
b3cc2f576f Merge pull request #6716 from edx/jeskew/update_pycontracts_version
Updated version of PyContracts.
2015-02-11 16:10:06 -05:00
Christine Lytwynec
ecad6784fe Merge pull request #6863 from edx/clytwynec/split_unittests_into_shards
split unittests into shards for in jenkins
2015-02-11 15:01:05 -05:00