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

31783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Friedman
c8e4f2ca7d Merge pull request #9103 from edx/dan-f/fix-team-count 
Fix team count in topic serializers
 2015-07-28 14:10:01 -04:00
Ben Patterson
77d7a38bd5 Merge pull request #9099 from edx/benp/fix-lettuce-flaky-jul2015 
Fix flaky lettuce test.
 2015-07-28 13:40:05 -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
Daniel Friedman
db6add1c59 Fix team count in topic serializers 
TNL-2892
 2015-07-28 13:14:18 -04:00
Awais Jibran
bceb2ae378 Fixed Flaky test (TestLibraryImport.test_import_timestamp) 
PLAT-760
 2015-07-28 21:04:16 +05:00
Ben Patterson
54062801fe Fix flaky test. 
This test failed on master because it saw "Loading" and did not wait.
 2015-07-28 11:52:28 -04: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
Zia Fazal
41d9338fcc Merge pull request #9076 from edx/ziafazal/SOL-1062 
SOL-1062: generate verify_uuid for web based certificates also
 2015-07-28 19:57:34 +05: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
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
Aamir
1061274b52 Merge pull request #9078 from edx/aamir-khan/ECOM-1916-grade-progress-page 
ECOM-1916: updated the dispaly
 2015-07-28 17:06:10 +05:00
Arbab Nazar
84af54b2b1 Merge pull request #8848 from edx/arbab/cert-whitelist-mod 
modify the whitelist cert script to take list of users
 2015-07-28 16:58:21 +05:00
aamir-khan
9f0f081a1f ECOM-1916: updated the dispaly 2015-07-28 14:59:48 +05:00
Awais Qureshi
bee837bed4 Merge pull request #9074 from edx/awais786/ECOM-1807-credit-provider-image 
ECOM-1807 Adding provider thumbnail url.
 2015-07-28 12:41:59 +05:00
AlasdairSwan
c37df8d2f7 Merge pull request #8970 from jolyonb/jolyonb/footercss 
Fixing printing for footer v3
 2015-07-27 17:28:15 -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
jsa
6c83bff5be commerce/api: pass expiration_datetime when updating modes 2015-07-27 15:56:27 -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
chrisndodge
b40fa0a929 Merge pull request #9089 from edx/cdodge/revert-accidental-requirements-edit 
mistaken update of edx_proctoring repo hash update, this was meant fo…
 2015-07-27 14:53:03 -04:00
Jesse Zoldak
296697ab49 Merge pull request #9086 from edx/zoldak/TNL-2667 
Mark CourseTeamPageTest testcase class as flaky
 2015-07-27 14:50:48 -04:00
Chris Dodge
8da554c57e mistaken update of edx_proctoring repo hash update, this was meant for a working branch 2015-07-27 14:48:34 -04:00
Jesse Zoldak
4f9dec8b36 Merge pull request #9060 from edx/zoldak/fix-library-index-test 
Fix library index test
 2015-07-27 14:25:38 -04:00
chrisndodge
574319c412 Update github.txt 2015-07-27 14:17:26 -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
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
Awais
95faeb4abf ECOM-1807 Adding personal email in authors file. 2015-07-27 20:06:17 +05:00
Awais
1d2bc6fd67 ECOM-1807 Adding provider thumbnail url. 2015-07-27 20:04:05 +05: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
Jolyon Bloomfield
ecf8792c77 Inserting RTL support 2015-07-27 10:37:56 -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
Zia Fazal
588a4e64ed generate verify_uuid for web based certificates also 2015-07-27 17:09:38 +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