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

9334 Commits

Author SHA1 Message Date
Waheed Ahmed
8efa9daec1 Fixed bok choy flaky test for studio. 
TNL-284
 2014-09-16 16:04:08 +05:00
Don Mitchell
032ff1cd61 Merge pull request #5200 from edx/split/lms-11396 
Updating active_versions should not send old and new
 2014-09-15 16:44:10 -04:00
Don Mitchell
043c08bf5b Updating active_versions should not send old and new 
but just use old to get query info.
LMS-11396
 2014-09-15 16:02:53 -04:00
Don Mitchell
7090ef6588 Ensure deleting a direct only removes it from published 
as well as draft
LMS-11395
 2014-09-15 16:00:02 -04:00
Don Mitchell
040b1c3da5 Merge pull request #5197 from edx/reruns/count_queries 
Explain query counts
 2014-09-15 15:57:11 -04:00
Don Mitchell
6568463513 Merge pull request #5223 from edx/bug/lms-11361 
Bug/lms 11361
 2014-09-15 15:25:26 -04:00
Sarina Canelake
95a9ca131a Merge pull request #5148 from lduarte1991/lduarte-harvardx-pr24 
Annotation Tools: Give staff/instructors full permissions (bug fix)
 2014-09-15 14:25:19 -04:00
Don Mitchell
bf0c4f5185 Don't let destructive loc change 
leak out to callers.
Also, use the return from update_item rather than assume
it was just side effecting.
LMS-11361
 2014-09-15 13:47:07 -04:00
Jesse Zoldak
a1eb44d9c6 skip intermittently failing test TNL-392 2014-09-15 12:13:06 -04:00
Don Mitchell
4c3b4a59b4 Merge pull request #5208 from edx/split/misc_fixups 
Split/misc fixups
 2014-09-15 11:18:25 -04:00
Renzo Lucioni
1fbccdaa20 Merge pull request #5183 from edx/renzo/new-audit-track-selection 
Prepare track selection page for new audit track
 2014-09-15 10:09:26 -04:00
Waqas Khalid
81e297a677 Merge pull request #5032 from mlkwaqas/waqas/tnl148-reset-newpost-form-on-cancel 
Forums new post form should reset state when user cancels
 2014-09-15 18:53:56 +05:00
Renzo Lucioni
f896d64ac0 Merge pull request #5195 from edx/renzo/remove-waffle 
Remove Django Waffle
 2014-09-15 09:43:22 -04:00
Don Mitchell
ad57cbe932 Get rid of obsolete field checking 2014-09-15 09:22:49 -04:00
Don Mitchell
f04e75db90 Get rid of unused fragment 2014-09-15 09:01:34 -04:00
Don Mitchell
b137f8d7ad Explain query counts 
Fix trivial excesses (2 splits configured & don't fetch courses if there are none)
LMS-11220, LMS-11391, LMS-11390
 2014-09-15 08:50:10 -04:00
Waqas Khalid
6dec04ba0f Cancel the new post resets the state of form 
When user is creating new post and then cancel it
the data remains in the form which appears when we
click on new post again. The state of form should
be reset.

TNL-148
 2014-09-15 16:10:52 +05:00
Waheed Ahmed
e18e18a855 Merge pull request #5055 from edx/waheed/bld1221-fix-video-not-play-in-firefox-on-speed-change 
Fixed video not playing after changing speed to anything other than 1.
 2014-09-15 15:06:56 +05:00
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
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