Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,796 Commits 1 Branch 0 Tags
601f160271f80be3bd52c7e7403e37d0fdf235e4
Commit Graph

11570 Commits

Author SHA1 Message Date
Andy Armstrong
601f160271 Merge pull request #6503 from edx/pull-out-lms-underscore-templates 
Pull discussion underscore templates out into individual files
 2015-07-28 22:33:34 -04:00
Awais Jibran
ece64cf2fd Merge pull request #9097 from edx/aj/plat-760-fix-flaky-test_import_timestamp 
Fixed Flaky test
 2015-07-28 22:30:42 +05:00
Awais Jibran
bceb2ae378 Fixed Flaky test (TestLibraryImport.test_import_timestamp) 
PLAT-760
 2015-07-28 21:04:16 +05:00
Clinton Blackburn
f33b451e8a Merge pull request #9081 from edx/clintonb/course-detail-whitelist 
White-listed course detail API calls
 2015-07-28 11:01:11 -04:00
Christina Roberts
f384400bdf Merge pull request #9026 from edx/christina/tnl1653-incorrect-textbook-link 
Fix View Live link on Textbooks page in Studio.
 2015-07-28 10:04:03 -04:00
David Baumgold
c1a38a6dc7 Pull discussion underscore templates out into individual files 
No need to go through Mako
 2015-07-28 09:36:31 -04:00
Peter Fogg
505b64730a Merge pull request #9082 from edx/peter-fogg/team-list-accessibility 
Give teams view error messages focus.
 2015-07-28 09:03:40 -04:00
Jim Abramson
3a1f9bd816 Merge pull request #9084 from edx/jsa/xcom-497 
commerce/api: Don’t allow setting expiration of prof modes.
 2015-07-27 17:13:03 -04:00
cahrens
44b1971a7c Fix View Live link on Textbooks page in Studio. 
TNL-1653
 2015-07-27 16:58:18 -04:00
Peter Fogg
becf15e50a Give teams view error messages focus. 2015-07-27 16:22:34 -04:00
jsa
03717f3940 commerce/api: Don’t allow setting expiration of prof modes. 
XCOM-497
 2015-07-27 15:56:53 -04:00
David Ormsbee
8d9e907635 Merge pull request #9070 from edx/ormsbee/test_ms_class_setup_teardown 
Modulestore test base class using setUpClass() and tearDownClass()
 2015-07-27 15:05:46 -04:00
Clinton Blackburn
e5ba2a5801 White-listed course detail API calls 
XCOM-518
 2015-07-27 14:06:44 -04:00
Jesse Zoldak
66aac6a246 Mark CourseTeamPageTest testcase class as flaky 2015-07-27 13:57:23 -04:00
John Eskew
756008aa9b Merge pull request #8768 from open-craft/jump_to_children_ospr 
Jump to children
 2015-07-27 13:42:32 -04:00
David Ormsbee
58f36d3e93 Enable faster ModuleStore tests with SharedModuleStoreTestCase. 
This is a new TestCase base class, intended for situations where
you only want to initialize course content in the setUpClass(),
as opposed to setUp(). This is done for performance reasons, since
many test cases only use courses in a read-only fashion,
particularly in LMS tests.

This commit also converts the following modules to use this new
base class:

  lms/djangoapps/ccx/tests/test_ccx_modulestore.py (38s -> 4s)
  lms/djangoapps/discussion_api/tests/test_api.py (2m45s -> 51s)
  lms/djangoapps/teams/tests/test_views.py (1m17s -> 33s)
 2015-07-27 13:02:16 -04:00
Christine Lytwynec
b5e6607bc4 Merge pull request #9005 from edx/clytwynec/mark-test_import_timestamp-as-flaky 
mark test_import_timestamp as flaky
 2015-07-27 12:03:23 -04:00
David Ormsbee
ce9d2439ac Merge pull request #9068 from edx/ormsbee/test_course_bulk_ops 
Optimize test course creation with bulk_operations
 2015-07-27 10:53:16 -04:00
Christine Lytwynec
802725a5f9 mark test_import_timestamp as flaky 2015-07-27 09:46:05 -04:00
Braden MacDonald
5aa127a9bf Merge pull request #8995 from open-craft/masquerade-cohorts 
Allow previewing cohorted content when masquerading (SOL-1064)
 2015-07-26 11:18:23 -07:00
David Ormsbee
701f5fc1c6 Optimize test course creation with bulk_operations. 
Use bulk operations to both minimize the number of writes
to MongoDB, as well as to suppress signals which could
trigger things like search indexing or course structure
caching.
 2015-07-24 19:45:10 -04:00
Christina Roberts
cb21756393 Merge pull request #9063 from edx/christina/tnl-231 
Delete mention of direction from checkboxgroup.
 2015-07-24 16:58:26 -04:00
Peter Fogg
454a0adab1 Merge pull request #9061 from edx/peter-fogg/i18n-cleanup 
Convert to named arguments for localized strings.
 2015-07-24 16:08:40 -04:00
Christina Roberts
09b352cca3 Merge pull request #9056 from edx/christina/tnl-645 
Set default value of showanswer to Never since it doesn't work.
 2015-07-24 15:12:45 -04:00
Peter Fogg
9d0dd4bbb2 Merge pull request #9034 from edx/peter-fogg/round-grades 
WIP: Display rounded problem results.
 2015-07-24 14:55:50 -04:00
Peter Fogg
4b0c3be75c Convert to named arguments for localized strings. 2015-07-24 14:51:17 -04:00
cahrens
85b8a88152 Delete mention of direction from checkboxgroup. 
It was never implemented.
TNL-231
 2015-07-24 14:44:08 -04:00
Peter Fogg
814cc5688c Display rounded problem results. 2015-07-24 14:18:14 -04:00
Peter Fogg
8fc5444095 Merge pull request #9020 from edx/peter-fogg/404-not-live 
Redirect to dashboard from non-live courses.
 2015-07-24 13:49:45 -04:00
cahrens
8276172802 Set default value of showanswer to Never since it doesn't work. 
TNL-645
 2015-07-24 13:32:56 -04:00
Peter Fogg
c8ed59ac61 Redirect to dashboard from non-live courses. 
TNL-2693
 2015-07-24 13:05:47 -04:00
Peter Fogg
50f6ca891b Merge pull request #9045 from edx/peter-fogg/fix-true-false-response 
Fix TrueFalse responses with single answers.
 2015-07-24 12:52:43 -04:00
Christina Roberts
b7a74f5790 Merge pull request #9044 from edx/christina/verify-tests-running 
Teams-related JS test cleanup
 2015-07-24 12:14:10 -04:00
frances botsford
cc7762e090 Merge pull request #7593 from jolyonb/jolyonb/inline-div 
CSS: Fixing spans inside inline divs (capa)
 2015-07-24 11:20:43 -04:00
cahrens
41d9e2effb Dependency cleanup. 2015-07-24 11:05:42 -04:00
Muzaffar yousaf
35503ebda2 Merge pull request #8636 from edx/muzaffar/youtube-api-v3 
Using youtube api v3.0 instead of v2.0 to get the video's metadata.
 2015-07-24 20:02:48 +05:00
Peter Fogg
95eccf6ea1 Fix TrueFalse responses with single answers. 2015-07-24 10:28:08 -04:00
muzaffaryousaf
45bb1abd59 Skipping the failing tests; which are also failing in master 
Can see if we remove skipIf from video base class.

TNL-2413
 2015-07-24 18:20:01 +05:00
muzaffaryousaf
38ef22b8a2 Using youtube api (v3) instead of v2 to get the video duration . 
TNL-2413
 2015-07-24 17:03:46 +05:00
Joel Barciauskas
c531c44512 Merge pull request #9022 from jbarciauskas/jbarciauskas/TNL-2267-fix-init-args 
Fix TNL-2267 - add missing service argument to HeartbeatFailure constructor
 2015-07-23 17:05:29 -04:00
Joel Barciauskas
5ebb93a1ee Set the second arg to __init__ for the HeartbeatFailure exception to 'mongo', create a split_mongo connection test 
Fixes TNL-2267

Clean up and PEP8 fixes to the test

Add missing paramater back

Add pylint pragma to ignore unused argument warning
 2015-07-23 16:26:27 -04:00
chrisndodge
5e195c8eeb Merge pull request #8962 from edx/cdodge/proctoring-studio 
Integrate timed and proctored exam authoring into Studio
 2015-07-23 15:53:17 -04:00
Will Daly
c2f0a68fba Merge pull request #9028 from edx/release 
Merge release back to master
 2015-07-23 12:48:17 -07:00
Chris Dodge
3748119961 Integrate timed and proctored exam authoring into Studio 2015-07-23 14:43:17 -04:00
Will Daly
eefbf77edf Allow course staff to bypass embargo rules. 2015-07-23 08:26:43 -07:00
Brian Talbot
b75f900b22 Merge pull request #8266 from edx/talbs/fix-font-face-calls 
LMS/Studio: Reduce font-face file calls
 2015-07-22 14:48:44 -04:00
Daniel Friedman
d61d193dab Merge pull request #8859 from edx/dan-f/teams-list-view 
Teams List View
 2015-07-22 13:24:02 -04:00
Daniel Friedman
21b39ca467 Add teams-for-topic list view to Teams page. 
TNL-1898

Also adds a generic paginated list view and Teams list view. The
common PaginatedView takes a collection and a view class for its items
and creates a header and footer with correct pagination. The topics
list view is refactored to use this generic view.

Authors:
  - Peter Fogg <pfogg@edx.org>
  - Daniel Friedman <dfriedman58@gmail.com>
 2015-07-22 12:02:40 -04:00
Davorin Sego
a43cf589e0 Update edx-search, fix lms filter generator and courseware index tests 2015-07-22 16:44:01 +02:00
Adam Palay
e515842395 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-07-22 08:10:26 -04:00