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

37497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
e1c898ff40 Remove unneeded .write() method 2015-09-17 15:40:34 -04:00
Ned Batchelder
bc13f450a7 Fix mako argument syntax 2015-09-17 15:40:33 -04:00
David Baumgold
0d35f6a855 Document disparity between footer.html and themable-footer.html 2015-09-17 15:40:33 -04:00
Ned Batchelder
1d6e91404d Rename google_analytics.html to use a hyphen instead. 2015-09-17 15:40:33 -04:00
Brian Talbot
cb921fd7ff Comprehensive Theming: setting sass !default flag on themeable LMS base variables 2015-09-17 15:40:33 -04:00
Brian Talbot
b815a86e8a Comprehensive Theming: re-organizing/minor simplifying of existing LMS Sass variables 2015-09-17 15:40:32 -04:00
Ned Batchelder
c0856232e1 Use sass interpolation instead of concatenation for -path 2015-09-17 15:39:04 -04:00
Ned Batchelder
5d64f9a80b Minor changes, responding to pull request comments 2015-09-17 15:39:03 -04:00
Ned Batchelder
a8dd9ca99d Use the proper 'off' default for COMP_THEME_DIR. 2015-09-17 15:39:03 -04:00
David Baumgold
6ebf2515f4 Comprehensive theming 
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
 2015-09-17 15:39:03 -04:00
Kevin Falcone
dd7121f686 Merge pull request #9812 from edx/hotfix-2015-09-17b 
Hotfix 2015-09-17b
 2015-09-17 15:06:34 -04:00
Gabe Mulley
b56d4a0295 Revert "Fix order of tracking backends" 2015-09-17 15:04:21 -04:00
Gabe Mulley
034570b31a Merge pull request #9650 from edx/gabe/fix-backend-order 
Fix order of tracking backends
 2015-09-17 15:01:15 -04:00
Christopher Lee
655b02a581 Merge pull request #9739 from edx/clee/dapi-vote-bug-2 
fixed vote bug in discussion api
 2015-09-17 14:46:46 -04:00
Daniel Friedman
4fc3593c1f Document child order in course structure api docs 2015-09-17 18:42:45 +00:00
Dennis Jen
305f88f646 Merge pull request #9488 from edx/dsjen/courses-via-overview 
Optimize OpenID Course Claims for users.
 2015-09-17 13:35:49 -04:00
Adam
788e54beba Merge pull request #9811 from edx/adam/delete-published-orphans-patch 
Adam/delete published orphans patch
 2015-09-17 11:54:41 -04:00
Adam Palay
8aa23de55a add ability to delete published orphans from courses (PLAT-832) 
fix quality violations

create child parent mapping to avoid potential performance hit when deleting items
 2015-09-17 11:52:19 -04:00
Adam Palay
8834bbad90 delete_item should not delete any child that has a parent we do not intend to delete 2015-09-17 11:52:18 -04:00
Clinton Blackburn
99c410dc16 Treating final grade as string 
Floating point values should be treated as strings to ensure values such as 1.0 are not converted to 1. Such conversion invalidates the signature generated for the credit request. Additionally, JSON has no concept of a floating point datatype.

ECOM-2172
 2015-09-17 11:49:54 -04:00
Kevin Falcone
567f2172d2 Merge pull request #9800 from edx/hotfix-2015-09-17 
Hotfix 2015 09 17
 2015-09-17 11:42:03 -04:00
Dennis Jen
844edac443 Optimize OpenID Course Claims for users. 
- Course overviews will cache courses upon publish.
- Added management command to warm up cache.
- OAuth2 handler returns courses via course overviews.
 2015-09-17 11:29:28 -04:00
Zia Fazal
14c14b07db moved SOCIAL_SHARING_SETTINGS out of FEATURES 
fixed object has no attribute 'get'

fixed 'LazySettings' object has no attribute

add social settings to cms/env/aws
 2015-09-17 19:24:09 +05:00
christopher lee
ccc921bce8 MA-1149 fixed vote bug in discussion api 
An incorrect response was being returned when voting for a comment
or thread.
 2015-09-17 09:55:03 -04:00
Ben Patterson
d0b6d18134 Merge pull request #9767 from edx/benp/pin-coveralls 
Pin coveralls to specific version.
 2015-09-17 09:19:53 -04:00
Matt Drayer
cac9f97e77 Merge pull request #9785 from edx/saleem-latif/SOL-1199 
SOL-1199
 2015-09-17 07:44:55 -04:00
amir-qayyum-arbisoft
4ab368720e Added error message in enrollment tab ccx coach dashboard 2015-09-17 14:49:55 +05:00
Saleem Latif
3741d065c2 CSS Animations disabled for test 2015-09-17 14:42:32 +05:00
Zia Fazal
eb33c337b5 escape string literal also 2015-09-17 12:57:36 +05:00
Clinton Blackburn
394c2906e5 Updated edx-proctoring to 0.9.6b 
PHX-154
 2015-09-16 21:36:20 -04:00
Clinton Blackburn
d0536c50a5 Updated credit provider logo styling on receipt page 
ECOM-2172
 2015-09-16 21:36:19 -04:00
Clinton Blackburn
12a4e85d94 Fixed payment page bug 
Using SKU to choose course mode when creating an order.

ECOM-2172
 2015-09-16 21:36:19 -04:00
Pan Luo
675d0e1413 Add Peer Instruction XBlock 2015-09-16 15:31:17 -07:00
Kevin Falcone
7ee03f336e Merge pull request #9799 from edx/hotfix-2015-09-16b 
Allow .html files in the static pipeline
 2015-09-16 17:51:11 -04:00
Clinton Blackburn
70866104bf Merge pull request #9790 from edx/clintonb/enrollment-admin 
Built a better course enrollment admin
 2015-09-16 17:28:34 -04:00
John Eskew
22672ed8dc Merge pull request #9797 from edx/jeskew/resolve_issues_with_release 
Resolve issues with release 2015-09-15 merge to master
 2015-09-16 17:22:43 -04:00
Andy Armstrong
a1f0f12d03 Allow .html files in the static pipeline 
TNL-3296
 2015-09-16 16:54:30 -04:00
John Eskew
6b12ec97cc Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 16:23:52 -04:00
Kevin Falcone
2b24d3dfb2 Merge pull request #9789 from edx/hotfix/2015-09-16 
Hotfix/2015 09 16
 2015-09-16 16:18:01 -04:00
John Eskew
684f901760 Fix quality issue. 2015-09-16 16:04:51 -04:00
John Eskew
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
Ben Patterson
c88b43b72d Pin coveralls to specific version. 
The latest version is compatible with the new coverage.py.
 2015-09-16 15:50:02 -04:00
Matt Drayer
ac0d926492 Merge pull request #9717 from edx/ziafazal/SOL-1193 
SOL-1193: moved variables from template to view
 2015-09-16 15:06:57 -04:00
Clinton Blackburn
7625c6eec3 Built a better course enrollment admin 2015-09-16 14:28:58 -04:00
Andy Armstrong
536783e6c9 hotfix/2015-09-16-3: Re-enable uglification of JavaScript in production. 2015-09-16 14:27:09 -04:00
Clinton Blackburn
011062e570 hotfix/2015-09-16-2: Credit Fixes 
- Updated checkout page to disallow purchase of credit seats (the credit payment page is hosted in ecommerce)
- Corrected path to providers endpoint
- Cleaned receipt page styling
- Updated receipt page copy
- Added provider thumbnail to receipt page

ECOM-2172
 2015-09-16 14:26:59 -04:00
Matt Drayer
05a2b54b5a hotfix/2015-09-16-1: Removed signatory org char limit 2015-09-16 14:24:57 -04:00
John Eskew
fa39016dfe Merge pull request #9729 from edx/rc/2015-09-15 
Rc/2015 09 15
 2015-09-16 14:01:18 -04:00
Ned Batchelder
da58885ebf Merge pull request #9788 from edx/ned/fix-mako-comments 
Mako comments have to be double-hash, or they are included on the page.
 2015-09-16 13:02:32 -04:00
Zia Fazal
cf80c07c14 moved variables from template to view 
fixed broken tests and quality violations

moved twitter_url to view also

escaped string for js
 2015-09-16 20:42:04 +05:00