Commit Graph

35669 Commits

Author SHA1 Message Date
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
asadiqbal
287cc843df SOL-1224 2015-09-18 11:19:12 +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
Chris Rodriguez
f63ff69097 Assigning focus to the selected topic
TNL-2620
2015-09-17 17:31:30 -04:00
Ned Batchelder
027a571957 Import the correct scss files for xmodule styling 2015-09-17 17:22:51 -04:00
cahrens
0d99449899 Emit event when last_activity_at is updated.
TNL-3303
2015-09-17 17:19:17 -04:00
Clinton Blackburn
341d936056 Updated admin interfaces for credit models
ECOM-2172
2015-09-17 16:43:41 -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
Clinton Blackburn
f7a7cce881 Using a better admin interface for UserProfiles
This interface should actually be useful as it doesn't attempt to load all users on the edit page.

ECOM-2172
2015-09-17 15:51:16 -04:00
Clinton Blackburn
d0a4284893 Corrected read-only field display for CourseEnrollment admin
Read-only fields are read-only for existing models. These values can be set when creating new models.

ECOM-2172
2015-09-17 15:49:15 -04:00
Ned Batchelder
200adfaa06 A test for optional_include_mako 2015-09-17 15:40:34 -04:00
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