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

31743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Blackburn
e5ba2a5801 White-listed course detail API calls 
XCOM-518
 2015-07-27 14:06:44 -04:00
Clinton Blackburn
2dc781005e Merge pull request #9071 from edx/clintonb/mode-names 
Corrected CourseMode Display Name
 2015-07-27 12:49:15 -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
Clinton Blackburn
56e9625a8f Corrected CourseMode Display Name 
The Commerce API now sets the correct display name for known course modes, but continues to default to the mode slug for unknown course modes.
 2015-07-27 11:26:08 -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
Sarina Canelake
dccc36a452 Merge pull request #9077 from edx/20150727-translations-update 
Update translations (autogenerated message)
 2015-07-27 10:30:51 -04:00
Sarina Canelake
c88aeb5fc1 Update translations (autogenerated message) 2015-07-27 09:58:15 -04:00
Christine Lytwynec
802725a5f9 mark test_import_timestamp as flaky 2015-07-27 09:46:05 -04:00
Awais Jibran
d838686c1b Merge pull request #9043 from edx/aj/tnl-2879-xml-course-error 
Grading doesn't work for XML courses
 2015-07-27 18:38:54 +05:00
zubair-arbi
0f94910d2f Merge pull request #9012 from edx/zub/bugfix/ecom-1525-update-eligibility-email-caching 
update caching for eligibility email content and edx-logo
 2015-07-27 13:36:43 +05:00
Vedran Karačić
e6c9e1bd0a Merge pull request #9037 from edx/vkaracic/TNL-394-confirmation-msg 
TNL-394: Fixed the confirmation message
 2015-07-27 09:43:36 +02:00
zubair-arbi
a2dd5d91f6 update caching for eligibility email content and edx-logo 
ECOM-1525
 2015-07-27 11:14:38 +05:00
Dongwook Yoon
e6cba609d1 Merge pull request #9057 from edx/dongwook/djpyfs 
allows platform version formatting as a part of static url served by …
 2015-07-27 02:02:52 -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
Dongwook
e7aa8fc176 allows platform version formatting as a part of static url served by djpyfs 2015-07-24 20:05:20 +00:00
Dongwook
46ff32b0b9 update authors 2015-07-24 20:05:20 +00: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
Christina Roberts
a66d4e481a Merge pull request #9054 from edx/christina/tnl-2848 
Sort the grade cutoffs.
 2015-07-24 14:14:50 -04:00
Ben Patterson
a7635f8127 Merge pull request #8890 from edx/benp/write-python-complexity 
Post complexity metric to a file for downstream collection.
 2015-07-24 14:10:58 -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
cahrens
1b93dd122e Sort the grade cutoffs. 
TNL-2848
 2015-07-24 12:52:56 -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
cahrens
2eae368136 Fix the teams factory spec so it runs. 2015-07-24 10:25:53 -04:00
Awais Jibran
334005ef2f Grading doesn't work for XML courses 
TNL-2879
 2015-07-24 19:17:46 +05:00
Christina Roberts
f4e386268b Merge pull request #9029 from edx/christina/tnl-296 
Make active menu highlight in blue.
 2015-07-24 09:33:55 -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
vkaracic
1c6e139edc TNL-394: Fixed the confirmation message 2015-07-24 08:17:57 +00:00
Will Daly
ac0d79628f Merge pull request #9033 from edx/will/icrv-advanced-problems 
Add in-course reverification to advanced components.
 2015-07-23 21:29:38 -07:00
John Eskew
b4b23575dd Merge pull request #8185 from AkA84/PLAT-295-reset-advertised-date-on-rerun 
PLAT-295: Reset advertised date on course rerun

Thanks @AkA84 !
 2015-07-23 17:33:39 -04: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
Will Daly
fc9ed032ad Add in-course reverification to advanced components. 2015-07-23 14:02:48 -07:00
Will Daly
a365b11080 Merge pull request #8984 from edx/will/ecom-1911 
ECOM-1911: Fixes to credit requirements in Studio.
 2015-07-23 13:48:23 -07:00
cahrens
fbb9c9fa22 Make active menu highlight in blue. 
TNL-296
 2015-07-23 16:32:10 -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
Will Daly
17f713aa4a ECOM-1911: Fixes to credit requirements in Studio. 
* Exclude orphaned XBlocks from requirements because they have been deleted.
* Sort ICRV requirements by start date, then by display name.
 2015-07-23 13:07:13 -07:00