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

8943 Commits

Author SHA1 Message Date
Adam
d9567c3537 Merge pull request #5178 from edx/release 
Release
 2014-09-11 15:15:13 -04:00
Andy Armstrong
82675b2baa Merge pull request #5176 from edx/andya/lms-ux-reference-templates 
Add support for UX reference templates in LMS
 2014-09-11 14:32:25 -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
Andy Armstrong
7683cba2c3 Add support for UX reference templates in LMS 2014-09-11 13:52:48 -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
Nimisha Asthagiri
dedd88ccf4 Merge pull request #4977 from edx/split/paver 
Split/paver LMS-11211
 2014-09-11 12:28:41 -04:00
Brian Talbot
35d92f42c8 Merge pull request #4963 from edx/talbs/platform-footer 
LMS: edX-centric  New Footer Style/Markup clean-up
 2014-09-11 11:23:48 -04:00
Usman Khalid
fc895fe8bf Moved imports to startup.py. 2014-09-11 20:14:37 +05:00
Nimisha Asthagiri
7637f063e9 LMS-11371 Fix register bug - encoding of course_id. 2014-09-11 10:53:05 -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
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
Waheed Ahmed
5fd1ade766 Fixed 404 on courseware when users last visited subsection becomes unpublished. 
LMS-6492
 2014-09-11 18:35:58 +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
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
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
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
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
Chris Dodge
1379158e8d make the 'ENABLE_THIRD_PARTY_AUTH' feature flag be microsite aware 2014-09-10 12:38:40 -04:00
Sarina Canelake
f0c8139ad8 Transifex config: add Swedish and Swahili language codes 2014-09-10 11:48:45 -04:00
Will Daly
a9389747df Merge pull request #5155 from edx/will/fix-cybersource-unicode-error 
Fix a unicode error in CyberSource2
 2014-09-10 11:17:53 -04:00
Will Daly
5759a3fd29 Fix a unicode error in CyberSource2 2014-09-10 11:07:01 -04:00
Will Daly
b6474304db Merge pull request #5122 from edx/will/ecom-218 
Change shopping cart status once sent to Cybersource (ECOM-218)
 2014-09-10 11:03:28 -04:00
Will Daly
2388e7b8cb Fix a unicode error in CyberSource2 2014-09-10 10:47:38 -04:00
Will Daly
c47673bb8b Add a test for the course ID merchant defined field data 2014-09-10 10:08:07 -04:00
Brian Talbot
f77466d0b3 LMS: resolves focus background-color issue of 3rd party login buttons 2014-09-09 12:49:28 -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
Piotr Mitros
6d914e2b0a AWS settings for XBlocks to have filesystem-like storage 
Upgrades to latest pyfs to support auth not through environment variables
 2014-09-09 08:43:18 -04:00
Gabe Mulley
7900e8d346 Add event tracking endpoint to be called by segment.io 2014-09-09 07:25:54 -04:00
Carson Gee
6b95ec8de2 Corrected NameError for invalid variable 2014-09-08 21:45:14 -04:00
Diana Huang
4f67f0dad9 Add course_id as merchant defined data 2014-09-08 15:43:44 -04:00
Clinton Blackburn
ee036ecaa6 Updated Analytics Dashboard Message 
Message to dashboard now includes the name of the application.
 2014-09-08 15:37:34 -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
Sarina Canelake
b0c2b73d80 Merge pull request #5112 from edx/sarina/quality-clean 
Quality cleanup
 2014-09-08 13:48:57 -04:00
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -04:00
Piotr Mitros
a12c795944 Merge pull request #5120 from edx/pmitros/aws-djpyfs 
AWS settings for XBlocks to have filesystem-like storage
 2014-09-08 11:59:23 -04:00
Greg Price
3cf2481e6c Merge pull request #5077 from edx/gprice/forum-cohort-selector-test 
Test cohort selector in NewPostView
 2014-09-08 11:54:30 -04:00