Commit Graph

32944 Commits

Author SHA1 Message Date
Jesse Zoldak
d9dbc1f24b Merge pull request #9793 from edx/zoldak/django-session-cookie
Add the ability to change the SESSION_SAVE_EVERY_REQUEST django setting
2015-09-22 09:28:42 -04:00
Nimisha Asthagiri
946102a3e0 Merge pull request #9823 from edx/mobile/xblock-rendering-api
MA-1337 xBlock Rendering View
2015-09-21 17:00:05 -04:00
Nimisha Asthagiri
31d5d513f8 MA-1337 xBlock Rendering View 2015-09-21 16:17:11 -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
Daniel Friedman
3c70af3ba8 Merge pull request #9814 from edx/dan-f/update-course-structure-api-doc
Document child order in course structure api docs
2015-09-21 15:16:53 -04:00
Sarina Canelake
8797a4f67d Merge pull request #9855 from edx/gymnasium/fix-final-check-label
fix label for check/final check
2015-09-21 13:13:02 -04:00
Jesse Zoldak
8a876a5ec3 Add the ability to change the SESSION_SAVE_EVERY_REQUEST django setting 2015-09-21 13:01:42 -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
Ned Batchelder
1665993f0e Merge pull request #9851 from edx/ned/coverage-40
Use coverage.py 4.0 final, and coveralls to match
2015-09-21 11:23:06 -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
David Baumgold
5711fd42b0 Merge pull request #9818 from edx/ned/fix-xmodule-scss
Import the correct scss files for xmodule styling
2015-09-21 09:58:39 -04:00
Sarina Canelake
94b73dc921 Remove blank lines from tooltip display 2015-09-21 09:29:24 -04:00
Ned Batchelder
3c74219c3d Use coverage.py 4.0 final, and coveralls to match 2015-09-21 08:22:54 -04:00
Brian Talbot
553804d7d8 Merge pull request #9834 from edx/talbs/fix-xmodule-scss
Simplifying needed sass assets for xmodule sass compilation
2015-09-21 08:02:09 -04:00
Matt Drayer
58488eaa0b Merge pull request #9782 from edx/asadiqbal08/SOL-1188
SOL-1188 Cancel button Saving not Canceling
2015-09-20 23:01:34 -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
Matt Drayer
ffb7f9b9a0 Merge pull request #9804 from edx/asadiqbal08/SOL-1224
SOL-1224 Verified Preview not showing
2015-09-20 22:50:00 -04:00
Matt Drayer
f8e1224f00 Merge pull request #9805 from edx/ziafazal/SOL-1193-escapejs
escape string literal also
2015-09-20 22:48:35 -04:00
Sarina Canelake
c480fb8fd5 Remove second tooltip from LMS Sequentials 2015-09-20 10:59:04 -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
Feanil Patel
c0eccb0764 Merge pull request #9832 from edx/feanil/monitor_requirements
Add requirements files that can be used with package monitorig tool.
2015-09-18 15:59:27 -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
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