Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nimisha Asthagiri
7637f063e9 LMS-11371 Fix register bug - encoding of course_id. 2014-09-11 10:53:05 -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
Calen Pennington
1d9c272a2e LMS-11282 Paver Lettuce Acceptance support for Split; default store set to Draft. 2014-09-11 10:48:08 -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
Usman Khalid
660cdf79c0 Added instructor persmission to _has_access_error_desc() in courseware.access. 
TNL-208
 2014-09-11 19:17:57 +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
Brian Talbot
5d16e802bb LMS: optimizing header PNG asset 2014-09-11 07:37:27 -04:00
Brian Talbot
337d6cbc2b LMS: revising markup/styling of edx-specific footer 2014-09-11 07:37:26 -04:00
Brian Talbot
a04c4bf12f LMS: renaming edx-specific footer template files/references 2014-09-11 07:37:26 -04:00
Brian Talbot
def8b5bf24 LMS: removing breakpoint-centric styling + small comment cleaning on edx-specific footer 2014-09-11 07:37:26 -04:00
Tim Babych
8b37dd7f95 Calculate has_changes only Section/Subsection only on Outline page 2014-09-11 12:42:56 +03:00
Ben Patterson
b3594b699a Merge pull request #5169 from edx/benp/solano2-jstest-failure 
TE-468 JS test improvement: test for attributes specifically
 2014-09-10 18:44:16 -04: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
Ben Patterson
32071af4b6 TE-468 JS test improvement: test for attributes specifically 
This test is failing in a different test environment (Solano) because
the built html has reversed the order of the width and height attributes
from what we are expecting. This change focuses the assertion to the
pieces that are important (as noted in the unchanged comment above
the assertion).
 2014-09-10 16:59: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
Ben Patterson
e05f7770e3 Merge pull request #5161 from edx/benp/solano2-lms-failures 
Acceptance tests (lettuce): hardcode sleeps to fix flakiness
 2014-09-10 15:32:59 -04:00
Clinton Blackburn
9f8e2cf5aa Merge pull request #5132 from edx/insights-message-update 
Updated Analytics Dashboard Message
 2014-09-10 15:11:59 -04:00
Diana Huang
484f13c3cf Merge pull request #5154 from edx/diana/pass-along-course-id 
Pass along course id to CyberSource
 2014-09-10 14:58:26 -04:00
Feanil Patel
5f4dd7bbe2 Merge pull request #5164 from edx/feanil/revert_gunicorn 
Downgrade gunicorn.
 2014-09-10 14:48:50 -04:00
Feanil Patel
8f1a285c33 Downgrade gunicorn. 2014-09-10 14:44:49 -04:00
Sarina Canelake
4596e8c212 Merge pull request #5151 from open-craft/mentoring-enforce 
mentoring: Allow partial answers when dependency isn't enforced
 2014-09-10 14:22:11 -04:00
Ben Patterson
dc75f6870a Acceptance tests (lettuce): hardcode sleeps to fix flakiness 
This is a quick fix (because the long fix was taking far too long
due to animation). The truer fix is to port these tests to bok-choy.
 2014-09-10 13:44:49 -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
lduarte1991
34e1128521 Annotation Tools: Removed Public/Private Permissions Trigger 2014-09-10 13:31:33 -04:00
lduarte1991
005bdeebc0 HTML Textbooks: Adding annotation css files group 2014-09-10 13:31:33 -04:00
Sarina Canelake
ed97d98be7 Merge pull request #5158 from edx/sarina/update-transifex-langs 
Transifex config: add Swedish and Swahili language codes
 2014-09-10 13:11:02 -04:00
Tim Babych
c34fb143ba Merge pull request #5093 from edx/tim/update-django-1.4.14 
Update Django version to release 1.4.14
 2014-09-10 20:09:28 +03:00
Mark Hoeber
adeafaad8b Merge pull request #5134 from edx/markhoeber-doc904 
9/9/14 Release Notes
 2014-09-10 12:53:44 -04:00
Mark Hoeber
e95e6584d7 9-10-14 release notes 2014-09-10 12:52:45 -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