Commit Graph

2642 Commits

Author SHA1 Message Date
Victor Shnayder
0e78eaaf80 Add a course_groups djangoapp with a CourseUserGroup model. 2013-01-24 15:12:52 -05:00
Victor Shnayder
c655f62f7a Remove out-of-date text about user replication, askbot 2013-01-24 15:12:51 -05:00
chrisndodge
fe8e25e72d Merge pull request #1341 from MITx/feature/christina/tiny-mce
Toggling of code should mark editor as dirty.
2013-01-23 13:25:01 -08:00
cahrens
2969a9e48d Toggling of code should mark editor as dirty. 2013-01-23 16:19:17 -05:00
Chris Dodge
9d5ac308b1 remove flag to hide progress tab 2013-01-23 15:11:41 -05:00
Christina Roberts
cd78b27b50 Merge pull request #1334 from MITx/bug/btalbot/cms-problemmenu
studio - resolved bug with .header CSS inheritance and problem editor
2013-01-23 11:40:24 -08:00
Brian Talbot
5fee7eeaec studio - further resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:58:20 -05:00
Brian Talbot
2ca267dc52 studio - resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:50:10 -05:00
cahrens
a1eeb56839 Import requireJS. 2013-01-23 12:30:06 -05:00
Don Mitchell
b0bbb34644 Merge pull request #1331 from MITx/feature/christina/tiny-mce
Feature/christina/tiny mce
2013-01-23 09:14:42 -08:00
cahrens
2609ba4093 Delete unused icon, reorder dropdown. 2013-01-23 11:02:16 -05:00
Don Mitchell
966db4fbaf Merge pull request #1329 from MITx/fix/cdodge/draft-store-get-items
add optional course_id parameter to DraftMongoStore.get_items()
2013-01-23 07:39:36 -08:00
Brian Wilson
9d28c37724 add more test coverage for openid provider. 2013-01-23 04:23:30 -05:00
Brian Wilson
ba62a657bf Merge remote-tracking branch 'origin/master' into bugfix/brian/openid_provider_post 2013-01-22 23:50:38 -05:00
Brian Talbot
5e7726079e studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon 2013-01-22 23:32:51 -05:00
Don Mitchell
1f261e6556 Removed unused and stylistically incorrect class defs 2013-01-22 17:34:45 -05:00
Brian Talbot
023dadd074 studio - resolved base variable missing issue on lms side 2013-01-22 16:31:42 -05:00
Brian Talbot
fd3ae2c478 studio html editor - matched up styles for <pre> elements 2013-01-22 16:16:30 -05:00
cahrens
731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
Conflicts:
	cms/static/css/tiny-mce.css
2013-01-22 16:15:27 -05:00
Brian Talbot
aec7692d27 studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules) 2013-01-22 15:51:12 -05:00
cahrens
13945994f0 change class on right element! 2013-01-22 15:47:09 -05:00
cahrens
b554eb5afe Cleanup of format dropdown, toolbar buttons. 2013-01-22 15:28:47 -05:00
Calen Pennington
75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2013-01-22 14:47:52 -05:00
Chris Dodge
9520290018 add optional course_id parameter to DraftMongoStore.get_items() 2013-01-22 11:55:36 -05:00
Don Mitchell
edda80d485 New style base python classes and basestring type. 2013-01-22 11:30:24 -05:00
Brian Wilson
9653631e9a Add initial openid_provider tests (covers xrds and authentication requests) 2013-01-22 11:15:30 -05:00
Alexander Kryklia
91281915c4 update of deleted comment 2013-01-21 19:28:49 +02:00
Alexander Kryklia
00f966a94a populate -> __init__ 2013-01-21 19:22:23 +02:00
Alexander Kryklia
a95e809824 documentation extended 2013-01-21 19:05:30 +02:00
Alexander Kryklia
2d67ee477e commend about rule in simple form 2013-01-21 18:58:30 +02:00
Alexander Kryklia
0f5e7cd9e4 explained for - else 2013-01-21 18:55:29 +02:00
Alexander Kryklia
e78c020a52 removed dublicate comment 2013-01-21 18:38:03 +02:00
Alexander Kryklia
07c1085966 improved readability of drag and drop render test 2013-01-21 18:33:17 +02:00
Alexander Kryklia
3e0333309d removed openendedinput 2013-01-21 18:03:04 +02:00
Valera Rozuvan
47d1173394 Refactoring and cleaning of code. 2013-01-21 15:56:39 +02:00
Valera Rozuvan
3cc4a663ff Refactoring and cleaning of code. 2013-01-21 15:56:38 +02:00
Alexander Kryklia
a228c163c7 added test for alternative answer notation 2013-01-21 15:56:38 +02:00
Valera Rozuvan
5457f35f81 Drag and Drop: Further testing of new feature "can reuse". 2013-01-21 15:56:38 +02:00
Valera Rozuvan
7ad6ef21f4 Removed unnecessary debug information. 2013-01-21 15:56:38 +02:00
Valera Rozuvan
1eec7bada7 Updated docs. Added debug output info for tracing problem related to server communications. 2013-01-21 15:56:38 +02:00
Valera Rozuvan
0f7b89facc Bug fixes for new functionality: Draggable "is reusable". 2013-01-21 15:56:38 +02:00
Valera Rozuvan
5001680356 Implemented isReusable feature. Not fully tested. 2013-01-21 15:56:38 +02:00
Valera Rozuvan
98977cabdb Refactoring of Drag and Drop complete. Draggable properties isUsable, isOriginal included, but functionality connected with them is not complete. Found and fixed bug with z-index ordering. 2013-01-21 15:56:37 +02:00
Valera Rozuvan
f15887383e Refactoring. 2013-01-21 15:56:37 +02:00
Valera Rozuvan
8b3a8a30ab Refactoring. 2013-01-21 15:56:37 +02:00
Alexander Kryklia
4215f4f923 add and update tests 2013-01-21 15:56:37 +02:00
Valera Rozuvan
79f5e98dfc Drag and Drop: refactoring + preparing for reuse of draggables. 2013-01-21 15:56:36 +02:00
Alexander Kryklia
e47f0e45f2 unorderly->unordered 2013-01-21 15:56:36 +02:00
Alexander Kryklia
e017297d3f fix 2013-01-21 15:56:36 +02:00
Alexander Kryklia
c8bbcacfef labels reuse logic and tests 2013-01-21 15:56:36 +02:00