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

24813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben McMorran
73bd863712 Fix staff outline bug 2014-08-07 12:27:11 -04:00
Ben McMorran
f31475a2fd Add bokchoy tests for outline page 2014-08-07 12:27:11 -04:00
cahrens
327a97f7c6 Failing test for create_item populating edit information. 2014-08-07 12:27:11 -04:00
cahrens
49e4ffbeb0 Work around for JQuery sortable bug (placeholder smaller than component). 
STUD-1967
 2014-08-07 12:27:11 -04:00
Ben McMorran
620e990616 Adds more comprehensive bokchoy testing for publishing changes 2014-08-07 12:27:10 -04:00
Daniel Friedman
31993cf4b3 Escape xblock model field in string editor 
Also add standalone spec

STUD-1984
 2014-08-07 12:27:10 -04:00
cahrens
285beb388f Clean up from rebase with master. 2014-08-07 12:26:50 -04:00
cahrens
d447c07540 Support staff locking on the unit page 
STUD-1873
 2014-08-07 12:16:22 -04:00
Frances Botsford
cf70eb6e2a in-context editor for xblock string field 2014-08-07 12:16:21 -04:00
Andy Armstrong
d2b61f146f Support faster deletes of sections 2014-08-07 12:16:21 -04:00
cahrens
20782f04e5 Mark UnitPublishingTest as a test. 2014-08-07 12:16:21 -04:00
Ben McMorran
d223e5ba7f Fixes view and preview buttons on unit page 2014-08-07 12:16:21 -04:00
Frances Botsford
bfb6db76fb fixed discussion preview back to the way it was 2014-08-07 12:16:21 -04:00
Andy Armstrong
538ce6d478 Fix merge problem 2014-08-07 12:16:20 -04:00
Ben McMorran
436d773987 Displays release date of unit in sidebar 2014-08-07 12:16:20 -04:00
Frances Botsford
9fe41e768b improved buttons styles in studio - updated unit sass to include new styles 2014-08-07 12:16:20 -04:00
Frances Botsford
0230ee40f1 unit publishing widget cleanup 2014-08-07 12:16:20 -04:00
cahrens
005491587f Updates for create_and_save_xmodule doing an extra lookup. 2014-08-07 12:16:20 -04:00
Andy Armstrong
f061bbc08b Backbone version of the course outline page 
STUD-1726
 2014-08-07 12:16:20 -04:00
Andy Armstrong
49e0c642e2 Fix test that broke on rebase 2014-08-07 12:16:19 -04:00
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
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