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 |
|
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 |
|
Feanil Patel
|
fca207d4ac
|
Add requirements files that can be used with package monitorig tool.
|
2015-09-18 10:39:07 -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 |
|
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 |
|