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

11925 Commits

Author SHA1 Message Date
Bill DeRusha
d75a36a347 Merge pull request #9853 from edx/bderusha/mailchimp-sync 
Add mailchimp list fields and config for new users
 2015-09-23 12:44:57 -04:00
Sarina Canelake
d8d49f7544 Merge pull request #9606 from Colin-Fredericks/ColinF-PC-not-dropdown 
TNL-3197 Partial Credit (not Dropdown)
 2015-09-22 15:10:13 -04:00
Jim Abramson
358f8056dd Merge pull request #9345 from open-craft/smarnach/enrollment-api 
Allow staff users to request a list of courses a student is enrolled in via the Enrollment API.
 2015-09-22 13:22:50 -04:00
Colin-Fredericks
350387c0a9 TNL-3197 Partial Credit (not Dropdown) 
Updated templates

Updating responsetype tests.

Updating other tests for PC

Putting OptionInput back the way it was.

Acceptance tests for partial credit

Testing tools

pep8

scss name fix

Missing }

icon fix

icon fix
 2015-09-22 13:20:39 -04:00
Bill DeRusha
ccc43cfe98 Add mailchimp list fields and config for new users 2015-09-22 10:24:24 -04:00
Clinton Blackburn
8cd297ec08 Merge pull request #9816 from edx/clintonb/admin-updates 
Additional Admin Updates
 2015-09-21 15:34:02 -04:00
Mike Bifulco
13c6550aea fix label for check/final check 
This label hadn't been updated to change its message depending on whether students were on their "final" submission attempt.
 2015-09-21 12:12:49 -04:00
David Baumgold
03aeae4bd7 Merge pull request #8271 from edx/sass-theming 
Comprehensive Theming
 2015-09-21 10:55:18 -04:00
Sarina Canelake
9a0152724b Merge pull request #9846 from edx/sarina/tooltips 
Make LMS courseware tooltips better
 2015-09-21 10:32:07 -04:00
Sarina Canelake
94b73dc921 Remove blank lines from tooltip display 2015-09-21 09:29:24 -04:00
Matt Drayer
95da57ccf0 Merge pull request #9783 from edx/ziafazal/SOL-1226 
SOL-1226: scroll to top after saving
 2015-09-20 22:53:53 -04:00
clrux
dfaef63595 Merge pull request #9140 from edx/clrux/ux-2620-new-post-focus 
Assigning focus to the selected topic
 2015-09-19 11:52:19 -04:00
Sarina Canelake
eb2be53876 Merge pull request #9639 from jolyonb/feqtext 
Adding trailing_text to formulaequationinput
 2015-09-18 14:05:19 -04:00
Brian Talbot
2797ebc0e8 fixup! simplifying needed sass assets for xmodule sass compilation 2015-09-18 12:32:31 -04: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
Peter Fogg
547844c0f4 Update verified track message. 
ECOM-2300
 2015-09-18 10:52:37 -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
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
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
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
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
David Baumgold
6ebf2515f4 Comprehensive theming 
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
 2015-09-17 15:39:03 -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 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
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
Matt Drayer
cac9f97e77 Merge pull request #9785 from edx/saleem-latif/SOL-1199 
SOL-1199
 2015-09-17 07:44:55 -04:00
Saleem Latif
3741d065c2 CSS Animations disabled for test 2015-09-17 14:42:32 +05: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
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
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
Clinton Blackburn
7625c6eec3 Built a better course enrollment admin 2015-09-16 14:28:58 -04:00
Zia Fazal
5effbf14f2 scroll to top after saving 
fixed broken bok choy tests
 2015-09-16 20:10:16 +05:00
Max Rothman
628eb86654 Merge pull request #9558 from edx/max/set-superuser 
Add management command for granting superuser access
 2015-09-16 10:59:37 -04:00
Ben Patterson
9751b00b1c Merge pull request #9774 from edx/benp/sept2015-bok-choy-shard-rebal 
Bok-choy rebalance. Shard 5 is getting long comparatively.
 2015-09-16 10:56:42 -04:00
Adam Palay
cf71f48589 update_course_index should be passed a course key as a kwarg 2015-09-15 17:16:51 -04:00
Ben Patterson
754145a180 Rebalance. Shard_5 is getting long comparatively. 2015-09-15 15:19:38 -04:00
Mushtaq Ali
4f6a1fe766 Merge pull request #9760 from edx/mushtaq/tnl3252-fix-mathjax-rendering 
Fix Mathjax rendering bug
 2015-09-15 23:49:37 +05:00
David Ormsbee
da62662659 Merge pull request #9704 from lduarte1991/lti-iframe-userinfo 
Allows username and user email to be sent to an LTI.
 2015-09-15 12:00:54 -04:00
Sven Marnach
6ce7a60cf7 Clarify docstring of the enrollment list endpoint of the Enrollment API. 2015-09-15 16:35:46 +02:00