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

32886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
fca207d4ac Add requirements files that can be used with package monitorig tool. 2015-09-18 10:39:07 -04:00
Christina Roberts
56fd445f5c Merge pull request #9798 from edx/christina/teams-dashboard 
Emit event when last_activity_at is updated.
 2015-09-18 09:54:36 -04:00
Peter Pinch
01aea1a494 Merge pull request #9335 from mitocw/error_message_student_notfound_ccx_coach_dashboard 
Added error message in enrollment tab inside CCX coach dashboard
 2015-09-18 09:33:02 -04:00
Muhammad Ammar
4ae62f370e Merge pull request #9673 from edx/ammar/update-python-social-auth 
update python-social-auth
 2015-09-18 18:10:55 +05:00
Sarina Canelake
07428c9ff6 Merge pull request #9247 from ubc/xcompass/pu/ubcpi 
Add Peer Instruction (PI) XBlock
 2015-09-18 09:06:30 -04:00
Peter Fogg
0a2cfbe31c Merge pull request #9738 from edx/peter-fogg/change-studio-help-links 
Remove Tender and change Studio help links.
 2015-09-17 22:42:57 -04:00
Kevin Falcone
81abdbe81b Merge pull request #9819 from edx/release 
Release
 2015-09-17 21:30:48 -04:00
Kevin Falcone
a428385d46 Merge pull request #9817 from edx/jibsheet/teams-xss-fix 
Escape team name in screenreader text.
 2015-09-17 19:03:28 -04:00
Kevin Falcone
dbc0803fc9 Quality fix (team isn't used) 2015-09-17 17:53:11 -04:00
cahrens
0d99449899 Emit event when last_activity_at is updated. 
TNL-3303
 2015-09-17 17:19:17 -04:00
Peter Fogg
fec5129a49 Remove Tender and change Studio help links. 
TNL-2695
 2015-09-17 16:30:40 -04:00
Peter Fogg
0f78989220 Escape team name in screenreader text. 2015-09-17 16:15:50 -04:00
Gabe Mulley
22b3c0bc9b Merge pull request #9815 from edx/revert-9650-gabe/fix-backend-order 
Revert "Fix order of tracking backends"
 2015-09-17 15:56:53 -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
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
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
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