Commit Graph

  • 31d5d513f8 MA-1337 xBlock Rendering View Nimisha Asthagiri 2015-09-18 08:58:37 -04:00
  • 94377662fd Bump proctoring to 0.9.6e Chris Dodge 2015-09-21 15:43:54 -04:00
  • 8cd297ec08 Merge pull request #9816 from edx/clintonb/admin-updates Clinton Blackburn 2015-09-21 15:34:02 -04:00
  • 3c70af3ba8 Merge pull request #9814 from edx/dan-f/update-course-structure-api-doc Daniel Friedman 2015-09-21 15:16:53 -04:00
  • d98510e1e9 use edx-proctoring 0.9.6d Chris Dodge 2015-09-21 12:54:22 -04:00
  • f96d4b7142 Manage focus on modal confirmation prompt Christine Lytwynec 2015-08-27 15:47:01 -04:00
  • 8797a4f67d Merge pull request #9855 from edx/gymnasium/fix-final-check-label Sarina Canelake 2015-09-21 13:13:02 -04:00
  • 8a876a5ec3 Add the ability to change the SESSION_SAVE_EVERY_REQUEST django setting Jesse Zoldak 2015-09-16 14:27:16 -04:00
  • 13c6550aea fix label for check/final check Mike Bifulco 2015-09-10 10:39:56 -04:00
  • 1665993f0e Merge pull request #9851 from edx/ned/coverage-40 Ned Batchelder 2015-09-21 11:23:06 -04:00
  • 03aeae4bd7 Merge pull request #8271 from edx/sass-theming David Baumgold 2015-09-21 10:55:18 -04:00
  • 9a0152724b Merge pull request #9846 from edx/sarina/tooltips Sarina Canelake 2015-09-21 10:32:07 -04:00
  • 5711fd42b0 Merge pull request #9818 from edx/ned/fix-xmodule-scss David Baumgold 2015-09-21 09:58:39 -04:00
  • 94b73dc921 Remove blank lines from tooltip display Sarina Canelake 2015-09-20 11:10:30 -04:00
  • ad465d6ba6 Discussion forum styling cleanup to correct current visual styling issues in addition to cleaning up styles in preparation for adding post images Marco Morales 2015-09-01 14:28:57 -04:00
  • 3c74219c3d Use coverage.py 4.0 final, and coveralls to match Ned Batchelder 2015-09-21 08:22:54 -04:00
  • 3a2c97a02f SOL-1188 fix asadiqbal 2015-09-21 17:08:27 +05:00
  • 553804d7d8 Merge pull request #9834 from edx/talbs/fix-xmodule-scss Brian Talbot 2015-09-21 08:02:09 -04:00
  • 58488eaa0b Merge pull request #9782 from edx/asadiqbal08/SOL-1188 Matt Drayer 2015-09-20 23:01:34 -04:00
  • 95da57ccf0 Merge pull request #9783 from edx/ziafazal/SOL-1226 Matt Drayer 2015-09-20 22:53:53 -04:00
  • ffb7f9b9a0 Merge pull request #9804 from edx/asadiqbal08/SOL-1224 Matt Drayer 2015-09-20 22:50:00 -04:00
  • f8e1224f00 Merge pull request #9805 from edx/ziafazal/SOL-1193-escapejs Matt Drayer 2015-09-20 22:48:35 -04:00
  • c480fb8fd5 Remove second tooltip from LMS Sequentials Sarina Canelake 2015-09-20 10:59:04 -04:00
  • 78c279235c Merge pull request #9844 from edx/cdodge/update-proctoring Brian Beggs 2015-09-20 10:03:17 -04:00
  • 3832144a41 bump edx-proctoring 0.9.6d Chris Dodge 2015-09-20 09:56:21 -04:00
  • dfaef63595 Merge pull request #9140 from edx/clrux/ux-2620-new-post-focus clrux 2015-09-19 11:52:19 -04:00
  • c0eccb0764 Merge pull request #9832 from edx/feanil/monitor_requirements Feanil Patel 2015-09-18 15:59:27 -04:00
  • d7c20b6476 Merge pull request #9839 from edx/aj/tnl3204-cohort-course-grading-issue-rc Brian Beggs 2015-09-18 15:20:26 -04:00
  • 13e8761aa4 In cohort courses, student progress pages differ from the grade report. Awais Jibran 2015-09-11 17:51:18 +05:00
  • eb2be53876 Merge pull request #9639 from jolyonb/feqtext Sarina Canelake 2015-09-18 14:05:19 -04:00
  • 2797ebc0e8 fixup! simplifying needed sass assets for xmodule sass compilation Brian Talbot 2015-09-18 12:26:01 -04:00
  • aacd239b41 Merge pull request #9813 from edx/peter-fogg/verified-track-message-update Peter Fogg 2015-09-18 11:43:57 -04:00
  • 15b5cdecfb Merge pull request #9828 from edx/sarina/20150918-update-translations Sarina Canelake 2015-09-18 11:11:29 -04:00
  • 547844c0f4 Update verified track message. Peter Fogg 2015-09-17 14:13:04 -04:00
  • 6ece587f43 Merge pull request #9623 from edx/ammar/update-django-debug-toolbar Brian Beggs 2015-09-18 10:39:58 -04:00
  • fca207d4ac Add requirements files that can be used with package monitorig tool. Feanil Patel 2015-09-18 10:39:07 -04:00
  • 57b25d0d7c Merge pull request #9827 from edx/hasnain-naveed/including_name_in_authors Afzal Wali Naushahi 2015-09-18 19:30:06 +05:00
  • 271bc54071 Merge pull request #9765 from edx/bderusha/readonly-enrollment Bill DeRusha 2015-09-18 10:14:15 -04:00
  • edf88962b5 Merge pull request #9534 from edx/ammar/update-factory-boy Muhammad Ammar 2015-09-18 19:04:48 +05:00
  • 56fd445f5c Merge pull request #9798 from edx/christina/teams-dashboard Christina Roberts 2015-09-18 09:54:36 -04:00
  • 8171a2775e Update translations (autogenerated message) Sarina Canelake 2015-09-18 09:44:22 -04:00
  • c6b54aa61f Readonly for enrollment end date/time on edX (for non-global-staff) Bill DeRusha 2015-09-15 10:36:44 -04:00
  • 01aea1a494 Merge pull request #9335 from mitocw/error_message_student_notfound_ccx_coach_dashboard Peter Pinch 2015-09-18 09:33:02 -04:00
  • 5fffa108f9 Added my name in authors Hasnain 2015-09-18 18:18:43 +05:00
  • 4ae62f370e Merge pull request #9673 from edx/ammar/update-python-social-auth Muhammad Ammar 2015-09-18 18:10:55 +05:00
  • 07428c9ff6 Merge pull request #9247 from ubc/xcompass/pu/ubcpi Sarina Canelake 2015-09-18 09:06:30 -04:00
  • 6a5ce5d544 Upgrade factory_boy muhammad-ammar 2015-08-31 13:52:20 +05:00
  • 287cc843df SOL-1224 asadiqbal 2015-09-17 12:45:25 +05:00
  • 0a2cfbe31c Merge pull request #9738 from edx/peter-fogg/change-studio-help-links Peter Fogg 2015-09-17 22:42:57 -04:00
  • 81abdbe81b Merge pull request #9819 from edx/release Kevin Falcone 2015-09-17 21:30:48 -04:00
  • a428385d46 Merge pull request #9817 from edx/jibsheet/teams-xss-fix Kevin Falcone 2015-09-17 19:03:28 -04:00
  • dbc0803fc9 Quality fix (team isn't used) Kevin Falcone 2015-09-17 17:53:11 -04:00
  • f63ff69097 Assigning focus to the selected topic Chris Rodriguez 2015-07-30 15:01:56 -04:00
  • 027a571957 Import the correct scss files for xmodule styling Ned Batchelder 2015-09-17 17:22:51 -04:00
  • 0d99449899 Emit event when last_activity_at is updated. cahrens 2015-09-16 16:14:33 -04:00
  • 341d936056 Updated admin interfaces for credit models Clinton Blackburn 2015-09-17 16:43:41 -04:00
  • fec5129a49 Remove Tender and change Studio help links. Peter Fogg 2015-09-14 10:40:13 -04:00
  • 0f78989220 Escape team name in screenreader text. Peter Fogg 2015-09-17 16:14:57 -04:00
  • 22b3c0bc9b Merge pull request #9815 from edx/revert-9650-gabe/fix-backend-order Gabe Mulley 2015-09-17 15:56:53 -04:00
  • f7a7cce881 Using a better admin interface for UserProfiles Clinton Blackburn 2015-09-17 15:51:16 -04:00
  • d0a4284893 Corrected read-only field display for CourseEnrollment admin Clinton Blackburn 2015-09-17 15:49:15 -04:00
  • 200adfaa06 A test for optional_include_mako Ned Batchelder 2015-09-09 07:01:31 -04:00
  • e1c898ff40 Remove unneeded .write() method Ned Batchelder 2015-09-08 12:42:32 -04:00
  • bc13f450a7 Fix mako argument syntax Ned Batchelder 2015-09-08 07:13:47 -04:00
  • 0d35f6a855 Document disparity between footer.html and themable-footer.html David Baumgold 2015-09-04 11:53:34 -04:00
  • 1d6e91404d Rename google_analytics.html to use a hyphen instead. Ned Batchelder 2015-09-03 14:19:21 -04:00
  • cb921fd7ff Comprehensive Theming: setting sass !default flag on themeable LMS base variables Brian Talbot 2015-08-26 22:08:40 -04:00
  • b815a86e8a Comprehensive Theming: re-organizing/minor simplifying of existing LMS Sass variables Brian Talbot 2015-08-26 13:31:18 -04:00
  • c0856232e1 Use sass interpolation instead of concatenation for -path Ned Batchelder 2015-08-27 16:01:23 -04:00
  • 5d64f9a80b Minor changes, responding to pull request comments Ned Batchelder 2015-08-24 14:57:03 -04:00
  • a8dd9ca99d Use the proper 'off' default for COMP_THEME_DIR. Ned Batchelder 2015-08-13 06:11:52 -04:00
  • 6ebf2515f4 Comprehensive theming David Baumgold 2015-05-14 16:07:09 -04:00
  • dd7121f686 Merge pull request #9812 from edx/hotfix-2015-09-17b Kevin Falcone 2015-09-17 15:06:34 -04:00
  • b56d4a0295 Revert "Fix order of tracking backends" Gabe Mulley 2015-09-17 15:04:21 -04:00
  • 034570b31a Merge pull request #9650 from edx/gabe/fix-backend-order Gabe Mulley 2015-09-17 15:01:15 -04:00
  • 655b02a581 Merge pull request #9739 from edx/clee/dapi-vote-bug-2 Christopher Lee 2015-09-17 14:46:46 -04:00
  • 4fc3593c1f Document child order in course structure api docs Daniel Friedman 2015-09-17 18:42:45 +00:00
  • 305f88f646 Merge pull request #9488 from edx/dsjen/courses-via-overview Dennis Jen 2015-09-17 13:35:49 -04:00
  • 788e54beba Merge pull request #9811 from edx/adam/delete-published-orphans-patch Adam 2015-09-17 11:54:41 -04:00
  • 8aa23de55a add ability to delete published orphans from courses (PLAT-832) Adam Palay 2015-09-11 12:54:58 -04:00
  • 8834bbad90 delete_item should not delete any child that has a parent we do not intend to delete Adam Palay 2015-09-15 10:10:34 -04:00
  • 99c410dc16 Treating final grade as string Clinton Blackburn 2015-09-17 00:08:31 -04:00
  • 567f2172d2 Merge pull request #9800 from edx/hotfix-2015-09-17 Kevin Falcone 2015-09-17 11:42:03 -04:00
  • 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. Dennis Jen 2015-08-25 09:56:40 -04:00
  • 14c14b07db moved SOCIAL_SHARING_SETTINGS out of FEATURES Zia Fazal 2015-09-16 16:03:40 +05:00
  • ccc921bce8 MA-1149 fixed vote bug in discussion api christopher lee 2015-08-21 13:40:50 -04:00
  • d0b6d18134 Merge pull request #9767 from edx/benp/pin-coveralls Ben Patterson 2015-09-17 09:19:53 -04:00
  • cac9f97e77 Merge pull request #9785 from edx/saleem-latif/SOL-1199 Matt Drayer 2015-09-17 07:44:55 -04:00
  • 4ab368720e Added error message in enrollment tab ccx coach dashboard amir-qayyum-arbisoft 2015-04-28 20:26:33 +05:00
  • 3741d065c2 CSS Animations disabled for test Saleem Latif 2015-09-16 16:54:15 +05:00
  • eb33c337b5 escape string literal also Zia Fazal 2015-09-17 12:57:36 +05:00
  • 394c2906e5 Updated edx-proctoring to 0.9.6b Clinton Blackburn 2015-09-16 17:15:03 -04:00
  • d0536c50a5 Updated credit provider logo styling on receipt page Clinton Blackburn 2015-09-16 17:08:29 -04:00
  • 12a4e85d94 Fixed payment page bug Clinton Blackburn 2015-09-16 15:30:05 -04:00
  • 675d0e1413 Add Peer Instruction XBlock Pan Luo 2015-08-07 22:28:29 -07:00
  • 7ee03f336e Merge pull request #9799 from edx/hotfix-2015-09-16b Kevin Falcone 2015-09-16 17:51:11 -04:00
  • 70866104bf Merge pull request #9790 from edx/clintonb/enrollment-admin Clinton Blackburn 2015-09-16 17:28:34 -04:00
  • 22672ed8dc Merge pull request #9797 from edx/jeskew/resolve_issues_with_release John Eskew 2015-09-16 17:22:43 -04:00
  • a1f0f12d03 Allow .html files in the static pipeline Andy Armstrong 2015-09-16 16:29:34 -04:00
  • 6b12ec97cc Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release John Eskew 2015-09-16 16:23:52 -04:00