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

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
0f6de7f922 Discard changes rewrite. 
STUD-1860
 2014-08-07 12:16:19 -04:00
Ben McMorran
f8f0ef1ffa Removes unnecessary PUT after DELETE 2014-08-07 12:16:19 -04:00
Ben McMorran
572b4fc030 Displays the date, time, and username of the most recent save and publish 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
 2014-08-07 12:16:19 -04:00
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
lduarte1991
c9e51b9956 Annotation Tools: Adding Loading Bar to Annotations Table 
- added label below loading gif

 - fixed spacing issues

  - change the error messages in annotator code
 2014-08-07 11:47:05 -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
Xavier Antoviaque
e8259b8234 secure-cookies: Allow to use secure HTTPS cookies (Django setting) 
Cf https://docs.djangoproject.com/en/1.4/ref/settings/#std:setting-SESSION_COOKIE_SECURE
 2014-08-07 09:30:51 +02: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
Will Daly
86515df763 Merge pull request #4722 from edx/will/ora2-hotfix-2014-08-06 
ORA2 hotfix 2014-08-06
 2014-08-06 14:38:16 -04:00
Will Daly
41ba395900 ORA2 hotfix 2014-08-06 2014-08-06 13:59:31 -04:00
Alison Hodges
311391788f Separated August changes into new table in chg log 2014-08-06 12:30:27 -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
Jim Abramson
fdca788845 Merge pull request #4719 from edx/waheed/lms6622-implemented-process-response-method-rc 
Implemented process_response method to clear requestcontext global variable in mako middleware.
 2014-08-06 11:41:48 -04:00
chrisndodge
2734ab767d Merge pull request #4718 from edx/cdodge/fix-visual-bug 
add space to table header
 2014-08-06 11:32:41 -04:00
Alexander Kryklia
16601d5405 Request IFRAME API every time with https scheme. 2014-08-06 11:13:26 -04:00
Waheed Ahmed
05b87fd99b Implemented process_response method to clear requestcontext global variable in mako middleware. 
LMS-6622
 2014-08-06 19:58:20 +05: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
Chris Dodge
ed06700afb add space to table header 2014-08-06 09:50:32 -04:00
Stephen Sanchez
b7e585c101 Merge pull request #4709 from edx/ora2/hotfix-2014-8-5 
Updating ORA2 hash for hotfix August 5th, 2014
 2014-08-06 09:26:02 -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