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

26029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Stupak
f221f010e9 Merge pull request #4930 from e-kolpakov/master 
Fix for TNL-147
 2014-10-01 14:52:34 +03:00
Waheed Ahmed
e9529c4271 Merge pull request #5330 from edx/waheed/tnl269-fix-multiple-jsinput 
Fixed multiple JsInput's in problem.
 2014-10-01 15:25:01 +05:00
Waheed Ahmed
e2ce977756 Fixed multiple JsInput's in problem. 
TNL-269
 2014-10-01 14:21:25 +05:00
E. Kolpakov
dcc82e1abe Added default font to a list of available fonts in text editor XModule 
Added acceptance test scenario to test for existense of "Default" font and all tinyMCE built-in fonts
Updated AUTHORS
 2014-10-01 12:52:38 +04:00
Renzo Lucioni
e895e10185 Merge pull request #5427 from edx/renzo/profile-page-preferred-language 
Allow changing of language preference from profile page
 2014-09-30 23:34:52 -04:00
Renzo Lucioni
254a0ce6c8 Allow changing of language preference from profile page 2014-09-30 21:11:02 -04:00
Alison Hodges
4ad2c4923f Merge pull request #5446 from edx/ahodges/doc/xreffix 
Fixes and xref
 2014-09-30 17:58:08 -04:00
Alison Hodges
d73e1f3992 Fixes and xref 2014-09-30 17:57:45 -04:00
Alison Hodges
89b618fc97 Merge pull request #5437 from edx/ahodges/doc/DOC1037 
Release notes for Insights
 2014-09-30 17:32:23 -04:00
Alison Hodges
2c37dfcb70 Release notes for Insights 2014-09-30 17:31:58 -04:00
Don Mitchell
3622d0d09f Merge pull request #5439 from edx/mixed_ms_coverage 
Test caching of courses in mixed maps
 2014-09-30 16:58:31 -04:00
Calen Pennington
87558c2c9c Merge pull request #5212 from cpennington/split/import-export-performance 
Improve performance of split-mongo import/export performance
 2014-09-30 15:44:04 -04:00
Don Mitchell
30155d33bd Test caching of courses in mixed maps 2014-09-30 15:01:20 -04:00
Alison Hodges
cd1a4d1d0b Merge pull request #5371 from edx/ahodges/doc/insights 
Updates to browser and preface files
 2014-09-30 14:24:41 -04:00
Alison Hodges
01a3c4e3ce Updates to browser and preface files 2014-09-30 14:24:18 -04:00
Brian Talbot
76207bbe89 Merge pull request #5426 from edx/talbs/fix-lms-header-boxmodel 
FIX: LMS - New Global Header Vertical Alignment
 2014-09-30 13:40:58 -04:00
Dave St.Germain
b7429cddde Merge pull request #5429 from edx/dcs/mobile-delint 
Cleaning up pylint and pep8 errors in mobile API.
 2014-09-30 11:10:43 -04:00
Brian Talbot
872dae0f27 LMS: resolving vertical alignment issues with new header global nav items 2014-09-30 08:44:02 -04:00
Calen Pennington
1a17b31a8b Make definitions and structures truly append-only 2014-09-29 22:35:42 -04:00
Calen Pennington
ef23c19bf4 Prevent queries into split using deprecated CourseLocators, BlockUsageLocators, or DefinitionLocators 2014-09-29 22:35:41 -04:00
Calen Pennington
1a682dacd1 Include caching definitions in split bulk operations 2014-09-29 22:35:41 -04:00
Calen Pennington
40c3253d81 Use more idiomatic python for deleting an attribute 2014-09-29 22:35:41 -04:00
Calen Pennington
57f9701ab2 Clean up exception definitions 2014-09-29 22:35:41 -04:00
Calen Pennington
4b0686836b Make modulestores properly propogate **kwargs 2014-09-29 22:35:41 -04:00
Calen Pennington
a14fbe4c6b Clean up coverage counting a little bit 2014-09-29 22:35:41 -04:00
Calen Pennington
f9c78e07a7 Turn the course envelope into an actual object that just stores an existing course_key 2014-09-29 22:35:40 -04:00
Calen Pennington
eea1552e0b Upgrade to a more performant version of opaque-keys 2014-09-29 22:35:40 -04:00
Calen Pennington
0aaf481782 Turn on bulk operations for xml export 2014-09-29 22:35:40 -04:00
Calen Pennington
52beec8878 Switch inheritance in split-mongo over to using InheritingFieldData. 2014-09-29 22:35:40 -04:00
Calen Pennington
687708c3d0 Use InheritanceMixin in more modulestore tests 2014-09-29 22:23:02 -04:00
Greg Price
115c3543e3 Merge pull request #5347 from edx/gprice/notifier-api-cohorts 
Add a new user API for the notifier
 2014-09-29 17:04:45 -04:00
Greg Price
887bcb5578 Add a new user API for the notifier 
This new endpoint is designed specifically to fill the needs of the
notifier and should not be used by other clients.
 2014-09-29 17:04:23 -04:00
Dave St.Germain
bd581fdbb5 Cleaning up pylint and pep8 errors. 2014-09-29 16:39:32 -04:00
David Baumgold
c5530b758d Merge pull request #5421 from edx/db/update-djpyfs 
Update djpyfs
 2014-09-29 15:38:02 -04:00
Will Daly
9b4c59cdfc Merge pull request #5417 from edx/will/profile-feature-flag-third-party-auth 
Put student profile third party auth behind a feature flag
 2014-09-29 15:00:55 -04:00
Dave St.Germain
f1d08b3b62 Merge pull request #5406 from edx/dcs/mobile-api-tests 
Added tests for mobile API
 2014-09-29 14:45:41 -04:00
Dave St.Germain
575a8123bd Tests for mobile api 2014-09-29 13:37:36 -04:00
David Baumgold
223efa168b Update djpyfs 
And move from base.txt to github.txt
 2014-09-29 12:23:30 -04:00
Don Mitchell
872221a642 Merge pull request #5249 from edx/split/view_test_setup 
Split/view test setup
 2014-09-29 12:17:47 -04:00
Calen Pennington
234c18053d Inherit from JSONField rather than Field for json-based fields 2014-09-29 11:56:40 -04:00
Calen Pennington
d60117d7c2 Make Studio CoursePage objects generate the correct CourseLocator based on whether the DEFAULT_STORE is set or not 2014-09-29 11:56:40 -04:00
Calen Pennington
3f065a5fef Export xml from the destination store during cross-modulestore import/export tests 2014-09-29 11:56:40 -04:00
Calen Pennington
b57a5a6007 Make xml exports more comparable by sorting and indenting json 2014-09-29 11:56:38 -04:00
Don Mitchell
dc9654283e Fix unit tests for generated 
course ids.
 2014-09-29 11:25:56 -04:00
Don Mitchell
8fe55c9aee Fix acceptance tests to work w/ split 
11300
 2014-09-29 11:25:55 -04:00
Don Mitchell
4ca5012f3c Use split to test views 2014-09-29 11:25:55 -04:00
Will Daly
9083c49f07 Put student profile third party auth behind a feature flag 2014-09-29 11:05:53 -04:00
Calen Pennington
8acef4c637 Allow Timedelta and RelativeTime fields to handle from_json being passed timedelta objects 2014-09-29 10:32:15 -04:00
Calen Pennington
ab75ef9963 Teach mongo_connection to retry read operations in the face of AutoReconnect errors 2014-09-29 10:32:15 -04:00
Calen Pennington
46c6a5de8a Bump version of PyContracts so that it will disable the 'check' function 2014-09-29 10:32:15 -04:00