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

11117 Commits

Author SHA1 Message Date
Waheed Ahmed
0448c9942d Fixed video not playing after changing speed to anything other than 1. 
BLD-1221
 2014-09-15 14:30:37 +05:00
Waheed Ahmed
f336d0490c Html escaped from display name in xblock. 
LMS-11194
 2014-09-15 13:33:48 +05:00
lduarte1991
a1541b61f2 [TNL-288] Annotation Tools: Give staff/instructors full permissions 
- changed role to 'in' condition

 - fixed comment about get_real_user

 - Adding Tests and Fixing Pep8 Violations
 2014-09-13 13:42:06 -04:00
Sarina Canelake
825dbddd95 Merge pull request #5165 from lduarte1991/lduarte-harvardx-pr25 
Annotation Tool: Fixed TinyMCE issue when changing units
 2014-09-12 16:40:02 -04:00
Renzo Lucioni
9239253614 Remove Django Waffle 2014-09-12 16:22:03 -04:00
Sarina Canelake
abb2c6bc56 Merge pull request #5146 from lduarte1991/lduarte-harvardx-pr23 
Text Annotation Tool: Reply/Grouping Bug Fix
 2014-09-12 15:48:06 -04:00
Renzo Lucioni
cc6e63dd22 Prepare track selection page for new audit track 2014-09-12 13:58:13 -04:00
lduarte1991
cf95dc0b75 [TNL-293] Annotation Tool: Fixed TinMCE issue when changing units 
- fixed tinymce editors condition to check only positive numbers
 2014-09-12 13:12:56 -04:00
Anton Stupak
535e6e4f57 Merge pull request #4983 from lduarte1991/lduarte-harvardx-pr20 
Annotation Tools: Turn off Private/Public option and add missing css group to MyNotes
 2014-09-12 16:24:44 +03:00
Waheed Ahmed
a1e911ae39 Fixed InvalidKeyError in course handler in studio. 
LMS-11141
 2014-09-12 15:16:36 +05:00
Adam
d9567c3537 Merge pull request #5178 from edx/release 
Release
 2014-09-11 15:15:13 -04:00
Christina Roberts
610710cff8 Merge pull request #5133 from edx/christina/cohorts-api 
Create auto cohorts when list_cohorts is called.
 2014-09-11 14:30:45 -04:00
cahrens
020094b8fb Create auto cohorts when list_cohorts is called and return number of users per cohort. 
TNL-186
 2014-09-11 13:51:34 -04:00
Ben Patterson
ef383891f2 TE-468 JS test: Use the correct array for validating onSeek logs 
This particular test is failing in Solano workers; there the log
is written in a different order, which was causing objects not to
be found.
 2014-09-11 12:22:16 -05:00
lduarte1991
3204016487 Annotation Tools: Clean-up 2014-09-11 12:38:48 -04:00
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
Usman Khalid
fc895fe8bf Moved imports to startup.py. 2014-09-11 20:14:37 +05: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
lduarte1991
d649e208a7 Annotation Tools: Adding Check for Grouping in MyNotes 
- Grouping instance checked instead of prototype

- adding comments
 2014-09-10 13:31:33 -04:00
Don Mitchell
534d1b52f2 Merge branch 'release' 2014-09-10 12:40:43 -04:00