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

9474 Commits

Author SHA1 Message Date
Jesse Zoldak
d9b9630c56 Merge pull request #5265 from edx/zoldak/fix-test 
Increase randomness of course name in testcase
 2014-10-01 12:13:10 -04:00
Waqas Khalid
26ad885ab5 Merge pull request #5403 from mlkwaqas/waqas/tnl90-ordering-of-pinned-thread-ignored 
Pinned thread should come first when sorting
 2014-10-01 20:45:20 +05:00
Christina Roberts
7f4cc1c75c Merge pull request #5407 from edx/cohort-management 
Cohorts UI
 2014-10-01 11:01:03 -04:00
Calen Pennington
8b789bb76b Merge pull request #5441 from cpennington/split/get-item-bulk-operation 
Wrap get_item inside bulk_operations internally, to cache query for active versions
 2014-10-01 10:25:39 -04:00
Adam
6a5fc054ba Merge pull request #5445 from edx/release 
Release
 2014-10-01 09:32:23 -04:00
Andy Armstrong
6219ecacfe Support adding cohorts from the instructor dashboard 
TNL-162
 2014-10-01 09:22:32 -04:00
Andy Armstrong
8627fdef32 Support adding students to a cohort via the instructor dashboard. 
TNL-163
 2014-10-01 09:22:31 -04:00
Nimisha Asthagiri
b4c826e747 TNL-329 Client-side work for displaying cohort description. 2014-10-01 09:22:30 -04:00
Nimisha Asthagiri
f72974d4df TNL-328 Server-side work for displaying type of cohort. 2014-10-01 09:22:30 -04:00
Nimisha Asthagiri
3bb1ab080d TNL-160 Default cohorts, automatically created. 2014-10-01 09:22:30 -04:00
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
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
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
37cfed61e9 Wrap get_item inside bulk_operations internally, to cache query for active versions 
[LMS-11402]
 2014-09-30 16:06:01 -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
Waqas Khalid
92d2a332d6 Pinned thread should come first when sorting 
Pinned threads come on the top when we sort threads
by most recent activities but in the most activities
and most vote case it doesn't come on top. Pinned
thread should come on top in any case of sorting

TNL-90
 2014-09-30 17:37:40 +05: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
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
Adam Palay
0c4f98a89b update password reset template (TNL-503) 2014-09-29 16:15:31 -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
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
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
7c1438034b Fix BulkAssertionMixin so that it actually asserts the truth/falsity of the contained assertions 2014-09-29 10:32:15 -04:00
Calen Pennington
d43d5d7d4e Merge pull request #5396 from cpennington/split/specialize-regex-for-case-insensitive 
Wrap get_item in bulk_operations to limit the number of queries for course structure.
 2014-09-29 09:59:26 -04:00
Calen Pennington
fe28d3873f Only execute regex queries for case-insitive lookup in split. 
[LMS-11402]
 2014-09-29 09:57:58 -04:00
Tim Babych
3f2346260c Merge pull request #5393 from edx/anton/js-double-loading-studio 
Fix double loading of cms-modules.js.
 2014-09-29 16:39:40 +03:00
zubair-arbi
570a922661 Merge pull request #5362 from edx/zub/bugfix/plat-88-importstatusinvalidkeyerror 
add couse key verification decorator in common for use in both studio an...
 2014-09-29 15:44:02 +05:00
zubair-arbi
40f270c945 add couse key verification decorator in common for use in both studio and lms 
PLAT-88
 2014-09-29 13:26:43 +05:00
Waheed Ahmed
29aa933140 Converted annotation lettuce test into bok-choy test. 
TNL-353
 2014-09-29 13:12:06 +05:00
polesye
e588fb8f05 TNL-272: Fix double loading of cms-modules.js. 2014-09-26 21:28:54 +03:00
Waqas Khalid
787f880009 Click on posts I'm following should load threads 
When as course moderator when we click on posts
I'm followng from sidebar dropdown it gives error
that threads cannot be loaded. It should show all
the threads the user is following.

TNL-469
 2014-09-26 19:50:33 +05:00
Adam
b6a5bea072 Merge pull request #5400 from edx/merge-conflicts-release 
Merge conflicts release
 2014-09-26 09:34:16 -04:00