Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,790 Commits 1 Branch 0 Tags
7cb5c4d7b8dcc0daf766b97a5e6e2d566411e416
Commit Graph

24790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
7cb5c4d7b8 Updates based on merge with master. 2014-08-07 12:16:18 -04:00
Ben McMorran
d40ef5e089 Adds warning when editing a container visible to students 
styling for editing a live unit
 2014-08-07 12:16:18 -04:00
Daniel Friedman
24e5837389 Fix whitespace problems in xblock string field editor. 
Whitespace is now trimmed from input. If after trimming input is empty
(pure whitespace or the empty string), the field is not updated.
 2014-08-07 12:16:18 -04:00
cahrens
d6475f4558 New publishing controls on unit page (continued) 
STUD-1707
 2014-08-07 12:16:18 -04:00
Frances Botsford
bbcc0030ea cleanup of unit, container, and xblock sass; added modules and layout sass; publishing states and actions on new unit 2014-08-07 12:16:18 -04:00
Andy Armstrong
d65e887d1a New Publishing controls on Unit page. 
STUD-1707
 2014-08-07 12:16:17 -04:00
Andy Armstrong
b1eccdf2d4 Replace unit page with the container page. 
STUD-1754
 2014-08-07 12:16:17 -04:00
Clinton Blackburn
3796f8c689 Merge pull request #4639 from edx/clintonb/link-to-analytics-dashboard 
Added link from instructor dashboard to analytics dashboard
 2014-08-07 12:15:11 -04:00
Clinton Blackburn
1a4e067712 Added link from instructor dashboard to analytics dashboard 2014-08-07 12:13:34 -04:00
Waqas Khalid
b19e534c8c Merge pull request #4461 from mlkwaqas/waqas/for108-discussion-blackout-period-inconsistent-ui 
Fix inconsistent ui issues on discussion during blackout period
 2014-08-07 20:10:01 +05:00
Waqas Khalid
3d5dde8195 Fix inconsistent ui issues on discussion during blackout period 
FOR-108
 2014-08-07 19:33:40 +05:00
David Baumgold
74f5adae00 Merge pull request #4602 from edx/db/expand-on-click-or-enter 
make expanding explanation accessible
 2014-08-07 08:45:47 -04:00
David Baumgold
e99a14eb3f Merge pull request #4654 from edx/db/kill-check-for-code 
Replace `check_for_get_code` with `assert_request_status_code`
 2014-08-07 08:28:50 -04:00
Usman Khalid
7e3e8d0468 Merge pull request #4678 from edx/usman/lms11189-user-api-middleware-exception-2 
Catch InvalidKeyError in UserTagsEventContextMiddleware and static_tab view.
 2014-08-07 17:18:14 +05:00
Usman Khalid
9599c31aa0 Catch InvalidKeyError in static_tab view. 
LMS-11189
 2014-08-07 15:41:07 +05:00
Usman Khalid
46b1c850f8 Catch InvalidKeyError in UserTagsEventContextMiddleware. 
LMS-11189
 2014-08-07 15:41:07 +05:00
muhammad-ammar
adaf2eb575 Merge pull request #4731 from edx/ammar/fix-property-call 
Fix property call issue
 2014-08-07 15:08:58 +05:00
Muhammad Ammar
9bdf16d832 Fix property call issue 2014-08-07 09:35:08 +00:00
muhammad-ammar
45c2abbb9d Merge pull request #4261 from edx/ammar/video-tests-refactoring 
Refactor Bok-Choy LMS Video Tests
 2014-08-07 12:49:48 +05:00
muhammad-ammar
f0e737a753 Merge pull request #4715 from edx/ammar/decrease-video-player-init-timeout 
Decrease Video Player Init Wait Timeout
 2014-08-07 12:47:30 +05:00
Minh-Tue Vo
7b3bacaa47 Merge pull request #4636 from edx/mvo/update_bok_choy_db_caches 
update bok choy db caches
 2014-08-06 19:41:51 -04:00
Minh Tue Vo
54e90c944d Merge branch 'mvo/update_bok_choy_db_caches' of https://github.com/edx/edx-platform into mvo/update_bok_choy_db_caches 2014-08-06 17:55:45 -04:00
Minh Tue Vo
7f674a016f update bok choy db caches 2014-08-06 17:54:40 -04:00
Sarina Canelake
ea8fa20b33 Merge pull request #4504 from lduarte1991/lduarte-harvardx-pr11 
Annotation Tools: Added Grouping Plug-In
 2014-08-06 17:19:14 -04:00
lduarte1991
0ca9bfa7e4 Annotation Tools: Added Grouping Plug-In 
- adding comments

 - spacing issues and indentation
 2014-08-06 14:49:40 -04:00
Christina Roberts
540d67a670 Merge pull request #4687 from lduarte1991/lduarte-harvardx-pr16 
TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool
 2014-08-06 12:26:46 -04:00
clytwynec
22582f4931 Merge pull request #4634 from edx/clytwynec/removing_remaining_rake_references 
removing rake and  outdated references to it
 2014-08-06 10:20:30 -04:00
David Baumgold
9b99213b02 Toggle aria-expanded attribute 2014-08-06 09:59:48 -04:00
David Baumgold
3f29fe4fb0 make expanding explanation accessible 
LMS-11161
 2014-08-06 09:59:48 -04:00
Muhammad Ammar
c23b0bc90a Decrease Video Player Init Wait Timeout 2014-08-06 13:21:41 +00:00
Muhammad Ammar
c237364e2d Refactor LMS Video Tests 2014-08-06 13:20:39 +00:00
Alexander Kryklia
2bdc4bf0a2 Merge pull request #4717 from edx/alex/fix_test 
Request IFRAME API every time with https scheme.
 2014-08-06 15:39:09 +03:00
Alexander Kryklia
c9ef2f3efa Request IFRAME API every time with https scheme. 2014-08-06 14:59:17 +03:00
zubair-arbi
9caff20036 Merge pull request #4250 from edx/zub/story/listallexportfaildcourses 
update export_all_courses management command to count and list all faile...
 2014-08-06 16:19:10 +05:00
Don Mitchell
753c67a73a Merge pull request #4698 from mitocw/cg/fix_student_migration_35 
Correct UnboundLocalError exception in student_migration_35
 2014-08-05 18:26:45 -04:00
jmclaus
9f313fcbdd Merge pull request #4613 from edx/jmclaus/easy-access-group-configurations-page 
BLD 1020: Easy access to Group Configurations page from Content Experiment component.
 2014-08-05 23:45:55 +02:00
lduarte1991
fe009f5989 TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool 
- fixed missing media and link buttons on image

 - fixed a CSS issue with the sharing button
 2014-08-05 15:05:56 -04:00
John Jarvis
043d495a90 Merge pull request #4673 from edx/jarv/rsyslog-handler 
Jarv/rsyslog handler
 2014-08-05 14:31:30 -04:00
jmclaus
459c241e3b BLD 1020: Easy access to Group Configurations page from Content Experiment component. 2014-08-05 19:44:21 +02:00
David Baumgold
5457775cfe Replace check_for_get_code with assert_request_status_code 
More flexible, uses the word "assert", method instead of function
 2014-08-05 13:36:49 -04:00
Sarina Canelake
1673448d08 Merge pull request #4518 from lduarte1991/lduarte-harvardx-pr13 
Text Annotation Tool: Safari Colored Highlights Bug Fix
 2014-08-05 13:17:45 -04:00
Sarina Canelake
1184cc063a Merge pull request #4675 from lduarte1991/lduarte-harvardx-pr14 
Annotations Tools: Fixing major Firefox/Tinymce bug in annotations
 2014-08-05 13:16:33 -04:00
chrisndodge
246a431760 Merge pull request #4590 from edx/cdodge/fix-reg-codes 
eCommerce enhancements (pt. 2)
 2014-08-05 13:12:52 -04:00
lduarte1991
a1684d2e64 Text Annotation Tool: Safari Colored Highlights Bug Fix 
- fixed spacing
 2014-08-05 12:04:29 -04:00
Carson Gee
7bb780335d Correct UnboundLocalError exception in student_migration_35 2014-08-05 11:51:49 -04:00
Alexander Kryklia
9a2c96cabd Merge pull request #4693 from edx/anton/fix-video-tests 
Fix failing video tests due to wrong IFRAME_API_RESPONSE
 2014-08-05 18:28:56 +03:00
polesye
4f391f664d Update youtube api. 2014-08-05 18:27:55 +03:00
Diana Huang
1e1b321b69 Merge pull request #4655 from edx/diana/allow-only-verified 
Allow verified to be offered without audit
 2014-08-05 11:26:29 -04:00
lduarte1991
0b770e1d53 Annotations Tools: Fixing major Firefox/Tinymce bug in annotations 
- fixed issue in Firefox where the init gets called multiple times

 - fixed spacing issues and added more comments

 - fixed indentation, added missing parens in comment, and fixed typo
 2014-08-05 11:22:37 -04:00
Calen Pennington
ea4e76b0bc Merge pull request #4254 from marcore/fix-branding-course-listing-opaque 
Fix filter with new opaque key, allowing user to set COURSE_LISTING as o...
 2014-08-05 10:31:33 -04:00