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

30772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
1cc776ff19 Remove V2 of the EdX.org footer 2015-06-10 13:13:32 -04:00
Ben Patterson
2e9759ee43 Merge pull request #8451 from edx/benp/cohort-search-flakiness-jun2015 
Fix for flaky behavior in cohort search tests. TNL-2362
 2015-06-10 11:46:08 -04:00
Ben Patterson
35aed4bf87 Fix for flaky behavior in cohort search tests. TNL-2362 2015-06-10 11:44:56 -04:00
Calen Pennington
3c2bfc70a3 Merge pull request #8259 from jazkarta/include-ccx-key-dependency 
MIT CCX add ccx-keys as a dependency of edx
 2015-06-10 09:57:45 -04:00
Awais Qureshi
16bbdc7fca Merge pull request #8329 from edx/awais786/ECOM-1494-remove-midcourse-models 
ECOM-1494 removing models.
 2015-06-10 18:24:39 +05:00
Tyler Nickerson
767ccbd1e7 Merge pull request #8235 from edx/nickersoft-include-expired 
Added optional GET parameter to the enrollment API that includes expired course modes
 2015-06-10 09:01:04 -04:00
Sven Marnach
40b4bc65f6 Merge pull request #8411 from open-craft/smarnach/bump-submissions-hash 
Bump edx-submissions hash to latest version.
 2015-06-10 11:51:59 +02:00
Awais
ed02d9cc5c ECOM-1494 removing models only. 2015-06-10 11:19:51 +05:00
Marco Morales
f39cef25be Merge pull request #8440 from Stanford-Online/giulio/font-awesome-icon-main-platform-fixes 
BUGFIX: fix  FA4 conversion for a few icons
 2015-06-09 22:35:11 -07:00
Sarina Canelake
cc85bfe81e Merge pull request #8019 from jazkarta/testjs 
Add Jasmine specs to test CCX schedule tab
 2015-06-09 21:36:08 -04:00
Brian Talbot
71cdb8f0f8 Merge pull request #8447 from edx/talbs/fix-css-output-paths 
FIX - Revising expected output paths for Django Pipeline
 2015-06-09 19:33:27 -04:00
Carlos de la Guardia
85111ceb5a Add jasmine tests for ccx schedule code. 2015-06-09 16:31:57 -05:00
Brian Talbot
387f7d149e revising expected output paths for Django Pipeline 2015-06-09 17:31:38 -04:00
Nickersoft
8c1d3ae412 Added includes_expired parameter to enrollment API 
- Adding ?include_expired=1 to course detail requests will now include expired course verifications
 2015-06-09 17:12:30 -04:00
David Baumgold
77facf13ba Merge pull request #8419 from edx/sass-output-to-css-dir 
Compile Sass to CSS dirs, move Creative Commons CSS into Sass
 2015-06-09 17:00:15 -04:00
Matt Drayer
ae819b0ecb Merge pull request #8443 from edx/mattdrayer/SOL-952 
mattdrayer/SOL-952: Update default URLs and add backwards migration
 2015-06-09 16:02:09 -04:00
Matt Drayer
e756685418 mattdrayer/SOL-952: Update default URLs and add backwards migration 2015-06-09 15:11:48 -04:00
Sarina Canelake
85f5708d6b Merge pull request #8388 from edx/sarina/allow-preview-of-launched-langs 
Allow released languages to be previewed under dark lang
 2015-06-09 15:04:46 -04:00
Giulio Gratta
0b741aa3c4 BUGFIX: fix FA4 conversion for a few icons 
- course-about sidebar info icon -> correct icon: "fa-info-circle"
- wiki search add file -> correct icon: "fa-plus-circle"
- wiki history paragraph info -> correct icon: "fa-info-circle"
 2015-06-09 10:18:35 -07:00
Mark Hoeber
7c2a4bc737 Merge pull request #8214 from edx/markhoeber-doc1987 
Profile Images API doc
 2015-06-09 12:51:58 -04:00
Christine Lytwynec
65b4e33629 Merge pull request #8422 from edx/clytwynec/rebalance_bokchoy_shards 
Clytwynec/rebalance bokchoy shards
 2015-06-09 12:45:16 -04:00
Mark Hoeber
0df14f53d9 Profile Images API doc 2015-06-09 11:54:31 -04:00
David Ormsbee
73b3af6c94 Merge pull request #8426 from mcgachey/mcgachey-lti-enrollment-fix 
[LTI Provider] Fix bug preventing unenrolled users from accessing content
 2015-06-09 11:49:57 -04:00
tlindaliu
dad7fb1c4a Merge pull request #8435 from edx/lliu/adding-author 
lliu - linda adding name to authors file
 2015-06-09 11:37:35 -04:00
Awais Qureshi
4eef610833 Merge pull request #8328 from edx/awais786/awais786/ECOM-1572-icrv-emails-format-new 
ECOM-1572 implementing code to new branch.
 2015-06-09 20:24:16 +05:00
David Baumgold
9bdf64d385 Merge pull request #8433 from edx/db/json-as-dicts 
Use dicts when defining JSON
 2015-06-09 11:15:56 -04:00
Will Daly
36d1eb22cd Merge pull request #8338 from edx/will/credit-provider-integration 
Credit provider integration Python API (Part 1 of 3)
 2015-06-09 11:12:51 -04:00
David Baumgold
141892a9fd Move _creative-commons.scss into elements directory 2015-06-09 11:08:40 -04:00
David Baumgold
a7c710a0de Moved Creative Commons CSS into Sass 
Also reconfigured paver to compile Sass into CSS directories
 2015-06-09 10:55:20 -04:00
Ben Patterson
242b3736a0 Merge pull request #8429 from edx/benp/fix-flaky-lms-answer-jun2015 
Fix flaky lettuce test. TE-572.
 2015-06-09 10:44:19 -04:00
Utkarsh
7d33892284 Update testing.rst 2015-06-09 10:43:46 -04:00
Christine Lytwynec
570c524b0e move lms edx notes tests to shard_4 2015-06-09 10:13:31 -04:00
David Baumgold
9643aca40e Use dicts when defining JSON 2015-06-09 10:02:58 -04:00
Utkarsh
00970a0f5a Update testing.rst 
Adding information about paver
 2015-06-09 10:02:49 -04:00
Awais Jibran
3cd48e4d61 Merge pull request #8317 from edx/aj/plat643-cms-export-command-export-to-wrong-place 
Fixed cms course export using management command.
 2015-06-09 18:59:03 +05:00
Brian Talbot
0003bf7aaf Merge pull request #8319 from edx/talbs/UX-2011-v4 
Web Certificates: Add Base/Distinguished Print Styling - Take 3
 2015-06-09 09:38:05 -04:00
Ben Patterson
e54ce29587 Fix flaky lettuce test. TE-572. 
This should be ported to bok-choy, but until then we should fix the flakiness in
this test. It needs to wait for the page to change after the user clicks 'reset'.
 2015-06-09 09:37:36 -04:00
Greg Price
b91287bfe3 Merge pull request #8425 from edx/gprice/discussion-api-parent-id 
Use parent_id returned from the comments service
 2015-06-09 09:33:17 -04:00
Christine Lytwynec
73ce054c54 Merge pull request #8415 from edx/clytwynec/re-enable_acid_block_tests 
unskip acid xblock tests
 2015-06-09 09:31:34 -04:00
Awais Qureshi
ab46de59c2 Merge pull request #8407 from edx/awais786/ECOM-1644-course-access-roles 
ECOM-1644 Implementing course-access roles.
 2015-06-09 18:23:03 +05:00
Matt Drayer
c4175c7dc6 Merge pull request #8363 from edx/ziafazal/SOL-861 
refactored code to make certificate PDF generation optional
 2015-06-09 09:01:04 -04:00
Awais Jibran
fee8f6db64 Merge pull request #8037 from edx/aj/tnl2167-pause-vide-event-not-emitting-at-video-end 
pause_video event does not emit when a video ends
 2015-06-09 16:18:51 +05:00
Awais
956e41348e ECOM-1644 Implementing course-access roles. 2015-06-09 15:29:19 +05:00
Awais Jibran
3e6670d1a4 PLAT-643 
Fixed cms course export
 2015-06-09 11:19:46 +05:00
Phil McGachey
0c7623d530 [LTI Provider] Fix bug preventing unenrolled users from accessing content 
Change https://github.com/edx/edx-platform/pull/8240 refactored the LTI
provider template rendering code and introduced an issue where a user was
required to be enrolled in a course before that course's content could be
accessed over LTI. According to the LTI design spec:
    https://docs.google.com/document/d/185hdPvIxcKtiDOLjb4sTGovA_WYXWz5Cd79gCzQwBms
we delegate access control over LTI content to the LTI consumer, rather
than requiring that users enroll in edX courses explicitly (and that admins
keep edX and LTI provider enrollemnts consistent when students add or drop
courses).

This change fixes the immediate issue, which is disrupting the LTI Provider
pilot currently running at Harvard.
 2015-06-08 23:01:43 -04:00
Kelketek
9a55497e72 Merge pull request #8417 from open-craft/badges-events-rename 
Tweaked names of badge events.
 2015-06-08 20:45:33 -05:00
Brian Talbot
33b7fbbbd4 UX-2011: adding print-based styles for Open edX web certs 2015-06-08 20:58:38 -04:00
Greg Price
2c7590d197 Use parent_id returned from the comments service 
This depends on cs_comments_service commit 0487891.
 2015-06-08 16:59:21 -04:00
Christopher Lee
96a9a7e7cc Merge pull request #8355 from edx/clee/discussion_api_delete_thread 
MA-661: Clee/discussion api delete thread
 2015-06-08 16:34:28 -04:00
Peter Fogg
8ffe7c65e6 Merge pull request #8397 from edx/peter-fogg/category-subnavigation 
TNL-1891 Browse Teams: Category Subnavigation
 2015-06-08 16:32:41 -04:00