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

28200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Martyn James
1faa732823 Changes to default settings for LMS as recommended by Matasano 2014-09-29 10:34:14 -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
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
Waheed Ahmed
18d020f5fc Merge pull request #5404 from edx/waheed/tnl353-wrote-annotation-bok-choy-test 
Converted annotation lettuce test into bok-choy test.
 2014-09-29 14:17:28 +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
Sarina Canelake
c57f1c818b Merge pull request #5290 from mitocw/bdero/fix-grade-summary-opaque-keys 
Remove unimplemented legacy dashboard grade_summary feature
 2014-09-28 16:02:49 -04:00
Clinton Blackburn
a616decf29 Merge pull request #5401 from edx/insights-for-all 
Displaying Insights Link for All Instructors
 2014-09-26 18:08:43 -04:00
Waqas Khalid
1dcab98ecb Merge pull request #5388 from mlkwaqas/waqas/tnl469-error-loading-following-threads 
Click on posts I'm following should load threads
 2014-09-27 01:37:54 +05:00
polesye
e588fb8f05 TNL-272: Fix double loading of cms-modules.js. 2014-09-26 21:28:54 +03:00
srpearce
0130a83724 Merge pull request #5273 from edx/sylvia/docs/DOC-759 
Sylvia/docs/doc 759
 2014-09-26 13:22:25 -04:00
Sylvia Pearce
e663c9328d Add molecule viewer tool to Exercises and Tools section 2014-09-26 13:21:41 -04:00
Brandon DeRosier
5bfa313dcb Remove unimplemented grade_summary feature. 2014-09-26 12:53:53 -04: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
clytwynec
aba76a0912 Merge pull request #5391 from edx/clytwynec/skip_firefox_version_check_if_not_using_firefox 
skipping the firefox version validation if firefox is not the browser be...
 2014-09-26 10:45:12 -04:00
Adam
b6a5bea072 Merge pull request #5400 from edx/merge-conflicts-release 
Merge conflicts release
 2014-09-26 09:34:16 -04:00
Mark Hoeber
792c8eaf82 Merge pull request #5304 from edx/markhoeber-doc910 
Updated help link and content of Studio container page
 2014-09-26 08:52:21 -04:00
Stephen Sanchez
c88e914077 Merge pull request #5398 from edx/sanchez/fix_about_page_header 
Allowing new styles on White Label about pages.
 2014-09-26 08:18:08 -04:00
Ned Batchelder
4d56f62d99 Merge pull request #5199 from edx/ned/remove-jsdraw 
Remove JSDraw
 2014-09-25 23:03:50 -04:00
Clinton Blackburn
4f9725a0c0 Displaying Insights Link for All Instructors 2014-09-25 17:58:38 -04:00
Adam Palay
01f2f81c53 Merge remote-tracking branch 'origin/release' into merge-conflicts-release 
Conflicts:
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
 2014-09-25 17:35:29 -04:00
Adam
79a3bfcb98 Merge pull request #5397 from edx/hotfix-annotations 
Hotfix annotations
 2014-09-25 17:31:07 -04:00
Sarina Canelake
fbd9cc1310 Merge pull request #5386 from open-craft/fix-anonymous-ids-unicode 
Fix UnicodeError with anonymous student IDs
 2014-09-25 16:43:18 -04:00
Stephen Sanchez
3fd3bd4e43 Crude solution to allowing new styles on White Label about pages. 2014-09-25 20:31:18 +00:00
Christine Lytwynec
b059d37b95 skipping the firefox version validation if firefox is not the browser being used 2014-09-25 16:29:21 -04:00
Andy Armstrong
0ed3a95d3a Merge branch 'release' 
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
 2014-09-25 16:25:45 -04:00
Adam
73b3e21823 Merge pull request #5395 from lduarte1991/lduarte-harvardx-pr30 
Annotation Tools: Fixes issue - Thumbnail check breaks tool on creation
 2014-09-25 15:14:52 -04:00
srpearce
2fbf67b257 Merge pull request #5374 from edx/markhoeber-documentaton-doc995 
Release Notes - Sept 25, 2014
 2014-09-25 15:10:30 -04:00
lduarte1991
7f8dd6a11e Annotation Tools: Thumbnail check breaks on creation 
- Fixed second similar function.

Conflicts:
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
 2014-09-25 15:07:43 -04:00
Sylvia Pearce
23cba83028 Revisions to mobile FAQ for students 2014-09-25 13:25:11 -04:00
Will Daly
daeddf3eaf Merge pull request #5387 from edx/will/account-and-profile-more-tests 
Added test for email activation and confirmation
 2014-09-25 12:18:58 -04:00
Jesse Zoldak
77178e9fd0 Merge pull request #5378 from edx/zoldak/look-into-languagetest 
Add explanation and small optimizations to LanguageTest
 2014-09-25 12:17:14 -04:00
Julia Hansbrough
c5ae921dea Merge pull request #5328 from edx/flowerhack/auto-login 
Automatically log in users who access third party login after trying to register for a course
 2014-09-25 10:40:33 -04:00
Will Daly
84463ef1a5 Added test for email activation and confirmation 2014-09-25 09:46:02 -04:00