Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,661 Commits 1 Branch 0 Tags
7683cba2c39b3c08a602a4e02f83f7130b49b6b5
Commit Graph

9299 Commits

Author SHA1 Message Date
Nimisha Asthagiri
dedd88ccf4 Merge pull request #4977 from edx/split/paver 
Split/paver LMS-11211
 2014-09-11 12:28:41 -04:00
Calen Pennington
3ec3bbbe99 Merge pull request #5162 from cpennington/split/import-export-performance 
Performance improvements to split mongo and old-mongo, based on import/export tests.
 2014-09-11 11:54:22 -04:00
Calen Pennington
b9908ec2f1 Only format test assertion messages when they are needed (they are a performance hit when testing large courses) 2014-09-11 11:52:10 -04:00
Calen Pennington
c0616aeb2c Remove unneccesary uses of SON (which is slower than dict) 2014-09-11 11:52:09 -04:00
Calen Pennington
a72cbfe68a Add an index on _id.revision to allow separating draft and published during export 2014-09-11 11:52:09 -04:00
Calen Pennington
ce88f61670 Create indexes before running cross-modulestore import/export tests 2014-09-11 11:52:06 -04:00
Julia Hansbrough
3a0dea20e1 Merge pull request #5168 from edx/flowerhack/third-party-stats 
Flowerhack/third party stats
 2014-09-11 11:04:38 -04:00
Don Mitchell
935d5dee34 LMS-11331, LMS-11345 Make auth check branch agnostic; fix deserialize keys 2014-09-11 10:53:05 -04:00
Nimisha Asthagiri
3a772752de LMS-11286 Paver Bokchoy support for Split; default store set to Split. 2014-09-11 10:48:09 -04:00
Nimisha Asthagiri
4d36276573 LMS-11297 BokChoy and Acceptance tests configure default_store with update_module_store_settings. 2014-09-11 10:48:08 -04:00
Calen Pennington
b033a214cf Merge pull request #5131 from cpennington/split/prod-import-export-tests 
Split-mongo block uniqueness constraint [LMS-11364]
 2014-09-11 10:43:43 -04:00
Don Mitchell
4ebe26696e Merge branch 'release' 
Conflicts:
	common/djangoapps/student/views.py
 2014-09-11 10:31:53 -04:00
Waheed Ahmed
02a2851019 Merge pull request #4329 from edx/waheed/lms6492-fix-404-when-users-last-visted-subsection-unpublished 
Fixed 404 on courseware when users last visited subsection becomes unpublished.
 2014-09-11 19:24:16 +05:00
Will Daly
f6bcf84edb Merge pull request #5167 from edx/will/third-party-acceptance 
Enable third party auth in LMS acceptance tests
 2014-09-11 09:55:08 -04:00
Julia Hansbrough
059d0dfff3 Login analytics 2014-09-11 13:53:29 +00:00
Calen Pennington
7b81dcc3ea Make split_mongo assert block identity uniqueness only over (block_type, block_id) tuples [LMS-11364] 2014-09-11 09:38:13 -04:00
Calen Pennington
df6dc21939 Make split_draft correctly autopublish both parent and child during create_child 2014-09-11 09:37:13 -04:00
Calen Pennington
bc40b8f149 Fix auto-publish test to work with old-mongo 2014-09-11 09:37:12 -04:00
Calen Pennington
3fd4e395f4 Verify using mixed that auto-publish actually updates child pointers 2014-09-11 09:37:12 -04:00
Calen Pennington
4ab343ffef Add test of import around duplicate url names [LMS-11345] 2014-09-11 09:37:12 -04:00
Calen Pennington
6cd7e08c1b Assert course equality in bulk, so that all differences are displayed 2014-09-11 09:37:12 -04:00
Waheed Ahmed
5fd1ade766 Fixed 404 on courseware when users last visited subsection becomes unpublished. 
LMS-6492
 2014-09-11 18:35:58 +05:00
Tim Babych
f1da4efb8e Merge pull request #5152 from edx/tim/less-has-changes 
Calculate has_changes only Section/Subsection only on Outline page
 2014-09-11 16:11:42 +03:00
zubair-arbi
27c29d0dfd Merge pull request #5140 from edx/zub/bugfix/plat-101-playercontrolsnotvisible 
show video controls for all youtube videos
 2014-09-11 17:35:49 +05:00
zubair-arbi
e3f499a757 show video controls for all youtube videos 
TNL-184
 2014-09-11 17:02:27 +05:00
Tim Babych
8b37dd7f95 Calculate has_changes only Section/Subsection only on Outline page 2014-09-11 12:42:56 +03:00
Daniel Friedman
95a06d92ae Merge pull request #5088 from edx/dan-f/test-lms-passes-group-id 
Ensure LMS passes correct group_id when querying content
 2014-09-10 17:18:28 -04:00
chrisndodge
789193ef10 Merge pull request #5166 from edx/cdodge/hotfix-disable-social-auth-for-white-labels 
make the 'ENABLE_THIRD_PARTY_AUTH' feature flag be microsite aware
 2014-09-10 16:52:57 -04:00
Daniel Friedman
4d9517b456 Ensure LMS passes correct group_id when querying content 2014-09-10 16:43:06 -04:00
Will Daly
b3762ae1b3 Enable third party auth in LMS acceptance tests 
Update db cache
 2014-09-10 16:23:09 -04:00
Don Mitchell
8f90e39626 Merge pull request #5149 from edx/mongo/bulk_operation 
Generalize bulk_operations logic
 2014-09-10 16:16:40 -04:00
Don Mitchell
4faed64859 Generalize bulk_operations logic 
LMS-11366
 2014-09-10 15:35:28 -04:00
Don Mitchell
534d1b52f2 Merge branch 'release' 2014-09-10 12:40:43 -04:00
Chris Dodge
1379158e8d make the 'ENABLE_THIRD_PARTY_AUTH' feature flag be microsite aware 2014-09-10 12:38:40 -04:00
Will Daly
541419e362 Merge pull request #5141 from edx/will/fix-embargo-tests 
Fix embargo middleware with tests
 2014-09-10 07:58:23 -04:00
Ben Patterson
d21384fe12 Merge pull request #5143 from edx/benp/solano2-bokchoy-course-outline 
bok-choy: Fix flakiness in date-picker steps under studio tests
 2014-09-09 14:51:11 -04:00
Adam
a346fcca2c Merge pull request #5144 from edx/adam/fix-copy 
fixes help copy for annotation settings
 2014-09-09 13:34:07 -04:00
Adam Palay
12b49ef2d4 fixes help copy for annotation settings 2014-09-09 11:43:32 -04:00
Ben Patterson
a8843aa7c7 TE-468 - bok-choy: Fix flakiness in date-picker steps under studio 
These were failing on Solano builds because the save button was clicked
before the datepicker was done its work. (The EmptyPromise was still satisfied
because the input field value had been updated, but the datepicker widget
caused issues about 3/4 of the time.)
 2014-09-09 10:17:02 -04:00
Gabe Mulley
c606c295e1 Merge pull request #5002 from mulby/gabe/add-segmentio-hook 
Add event tracking endpoint to be called by segment.io
 2014-09-09 09:17:07 -04:00
Will Daly
512db7be99 Fix embargo middleware with tests 2014-09-09 08:50:10 -04:00
Don Mitchell
ee71eba15b Merge pull request #5109 from edx/split/inherited_settings 
Cache inherited settings outside of structure
 2014-09-09 08:48:45 -04:00
Gabe Mulley
7900e8d346 Add event tracking endpoint to be called by segment.io 2014-09-09 07:25:54 -04:00
Greg Price
e26457748e Merge pull request #5127 from aboudreault/discussion-request-abort-issue 
Fix discussion error popup on http request abort
 2014-09-08 17:46:16 -04:00
Renzo Lucioni
12d5c9b281 Do not call upper on a profile country code of None 2014-09-08 17:33:02 -04:00
Don Mitchell
0f8355fd47 Test inheritance to new xblocks in same request 2014-09-08 16:13:30 -04:00
Don Mitchell
74c44c5e2b Cache inherited settings outside of structure 
LMS-11363
 2014-09-08 15:55:45 -04:00
Alan Boudreault
78fd5cc12a Fix discussion error popup on http request abort 2014-09-08 15:43:37 -04:00
Renzo Lucioni
ba7ff67a55 Merge pull request #5113 from edx/renzo/remove-unused-js 
Remove unused analytics JS left over by 3rd party auth changes
 2014-09-08 15:36:05 -04:00
Renzo Lucioni
0b2840ee6f Skip audit enrollment if user is in the experimental branch 2014-09-08 14:17:04 -04:00