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

30778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
5ff2a3af3f tidying up loose ends from sass compilation to css dir change 
* adding in missing web certs Sass/CSS asset settings
* updating .gitignore
 2015-06-10 14:23:13 -04:00
Renzo Lucioni
0349090815 Merge pull request #8456 from edx/renzo/payment-button-ui 
Payment button UI modifications
 2015-06-10 14:04:59 -04:00
Awais Qureshi
2374685dc5 Merge pull request #8462 from edx/awais786/ECOM-1644-message-format 
ECOM-1644 minor message updation.
 2015-06-10 22:59:32 +05:00
Awais
d5ca25e197 ECOM-1644 minor message updation. 2015-06-10 22:08:23 +05:00
Peter Fogg
a3976705ed Merge pull request #8453 from edx/peter-fogg/team-api-test-fix 
Fix updating immutable request dictionary.
 2015-06-10 11:57:24 -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
Renzo Lucioni
d6c0460483 Payment button UI modifications 
Includes button copy revision and a styling tweak to make the selected payment button appear active while disabled.
 2015-06-10 11:28:51 -04:00
Peter Fogg
d74bb36634 Fix updating immutable request dictionary. 
Django's `QueryDict`s are immutable during normal running, and so they
must be copied if any updates are to be made to them. In testing,
though, `request.DATA._mutable` is `True`, so tests can falsely pass.
 2015-06-10 11:15:02 -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