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

32908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zia Fazal
2bd26fc0e4 fixed bug in certificate html view 
Fixed bug: When certificate id previewed by a user who already has a
certificate generated with different mode it would not display
certificate in right preview mode.
 2015-09-23 15:12:32 -04:00
Brian Beggs
55e2a326cb Merge pull request #9835 from edx/rc/2015-09-22 
Release candidate for 2015 09 22
 2015-09-23 12:39:23 -04:00
Brian
10e07d0f3e Merge branch 'hotfix/2015-09-21' into rc/2015-09-22 2015-09-23 08:40:22 -04:00
Brian Beggs
ad7db1b5db Merge pull request #9883 from edx/hotfix/2015-09-21 
merge hotfix/2015-09-21 in to release
 2015-09-23 08:31:18 -04:00
Brian Beggs
8b39e1bf2b Merge pull request #9857 from edx/cdodge/proctoring-0.9.6e 
Bump proctoring to 0.9.6e
 2015-09-21 17:03:09 -04:00
Chris Dodge
94377662fd Bump proctoring to 0.9.6e 2015-09-21 15:43:54 -04:00
Chris Dodge
d98510e1e9 use edx-proctoring 0.9.6d 2015-09-21 14:47:29 -04:00
Brian Beggs
78c279235c Merge pull request #9844 from edx/cdodge/update-proctoring 
bump edx-proctoring 0.9.6d
 2015-09-20 10:03:17 -04:00
Chris Dodge
3832144a41 bump edx-proctoring 0.9.6d 2015-09-20 09:56:21 -04:00
Brian Beggs
d7c20b6476 Merge pull request #9839 from edx/aj/tnl3204-cohort-course-grading-issue-rc 
In cohort courses, student progress pages differ from the grade report.
 2015-09-18 15:20:26 -04:00
Awais Jibran
13e8761aa4 In cohort courses, student progress pages differ from the grade report. 
TNL-3204
 2015-09-18 23:43:26 +05:00
Peter Fogg
aacd239b41 Merge pull request #9813 from edx/peter-fogg/verified-track-message-update 
Update verified track message.
 2015-09-18 11:43:57 -04:00
Sarina Canelake
15b5cdecfb Merge pull request #9828 from edx/sarina/20150918-update-translations 
Update translations (autogenerated message)
 2015-09-18 11:11:29 -04:00
Peter Fogg
547844c0f4 Update verified track message. 
ECOM-2300
 2015-09-18 10:52:37 -04:00
Brian Beggs
6ece587f43 Merge pull request #9623 from edx/ammar/update-django-debug-toolbar 
update django-debug-toolbar
 2015-09-18 10:39:58 -04:00
Afzal Wali Naushahi
57b25d0d7c Merge pull request #9827 from edx/hasnain-naveed/including_name_in_authors 
Added my name in authors
 2015-09-18 19:30:06 +05:00
Bill DeRusha
271bc54071 Merge pull request #9765 from edx/bderusha/readonly-enrollment 
Readonly for enrollment end date/time on edX (for non-global-staff)
 2015-09-18 10:14:15 -04:00
Muhammad Ammar
edf88962b5 Merge pull request #9534 from edx/ammar/update-factory-boy 
Update factory_boy
 2015-09-18 19:04:48 +05: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
Sarina Canelake
8171a2775e Update translations (autogenerated message) 2015-09-18 09:44:22 -04:00
Bill DeRusha
c6b54aa61f Readonly for enrollment end date/time on edX (for non-global-staff) 
TNL-2694

Add accessibility aria-readonly attributes
 2015-09-18 09:39:18 -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
Hasnain
5fffa108f9 Added my name in authors 2015-09-18 18:18:43 +05: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
muhammad-ammar
6a5ce5d544 Upgrade factory_boy 
TNL-3179
 2015-09-18 18:02:38 +05: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