Don Mitchell
2db0401273
Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag
...
Conflicts:
cms/envs/common.py
2013-01-23 14:13:17 -05:00
Brian Talbot
25df02fedd
studio - syncing cheatsheet language with new class name for heading 1 again
2013-01-23 13:04:16 -05:00
Brian Talbot
0e061ca726
studio - syncing cheatsheet language with new class name for heading 1
2013-01-23 13:02:33 -05:00
Don Mitchell
7cca46e691
Requirejs doesn't belong here
2013-01-23 13:00:01 -05: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
Don Mitchell
6a4c6ad4d8
Merge pull request #1333 from MITx/feature/christina/misc
...
Import requireJS.
2013-01-23 09:35:50 -08: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
Don Mitchell
4d0d46462c
Fixed the y axis drop problem by requiring it to be within the x bounds.
2013-01-23 12:12:40 -05:00
jmvt
549a5e9fe9
Merge remote-tracking branch 'origin/master' into jmpm-analytics
2013-01-23 12:02:48 -05:00
Ned Batchelder
6f322bcd81
Simplify the construction of the ErrorDescriptor
2013-01-23 11:34:42 -05:00
Ned Batchelder
376575dedd
Make system.xblock_model_data more explicit to fix the problem where error descriptors can't get any data because the schema and the data don't match.
2013-01-23 11:34:24 -05:00
Chris Dodge
54ee1607b8
add unit test to test DraftModuleStore.get_items() fix
2013-01-23 11:22:37 -05:00
Don Mitchell
ad5f00f270
Drag and drop for sections, subsections, and units works with following
...
caveats: - it drops wherever the y of the cursor is no matter the x for
the cursor. I've constrained the draggables to never change x; so, the
drop doesn't care where the x of the cursor is only the y.
- if you force auto scroll, the visual thing you'll dragging gets out of
sync w/ the mouse cursor; however, the mouse cursor is the "true"
location; so, the drop's posit is the mouse cursor y not the visual
clone's y.
2013-01-23 11:16:04 -05:00
cahrens
2609ba4093
Delete unused icon, reorder dropdown.
2013-01-23 11:02:16 -05:00
Deena Wang
ca185c034f
Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing
...
Conflicts:
lms/djangoapps/courseware/tests/test_module_render.py
2013-01-23 10:50:37 -05:00
Deena Wang
3fd69bcae4
more tests in test_views.py
2013-01-23 10:41:12 -05:00
Don Mitchell
c7d9eb23f1
Merge pull request #1328 from MITx/fix/cdodge/subsection-crash-no-display-name
...
use property rather than referencing the metadata dictionary. This is be...
2013-01-23 07:40:52 -08: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
jmvt
4f005044d6
Added time of query display.
2013-01-23 10:17:17 -05:00
David Ormsbee
eab9511466
Merge pull request #1295 from MITx/feature/jarv/certificate-force-update
...
Feature/jarv/certificate force update
2013-01-23 06:32:41 -08:00
Chris Dodge
0042131588
use property rather than referencing the metadata dictionary. This is better because if there is no 'display_name' defined, then we get back a string of the location name
2013-01-23 09:12:24 -05:00
Diana Huang
5ca1586e0c
Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates
2013-01-23 08:57:47 -05:00
Diana Huang
71e4541c69
Merge branch 'master' into feature/diana/rubric-input
2013-01-23 08:56:55 -05:00
Victor Shnayder
07785e3c07
Merge pull request #1327 from MITx/bugfix/brian/openid_provider_post
...
Fix handling of openid provider requests that use POST
2013-01-23 05:53:54 -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
David Ormsbee
ae6dd4965b
Merge pull request #796 from MITx/feature/cale/cms-master
...
CMS Master
2013-01-22 14:47:01 -08:00
Don Mitchell
1f261e6556
Removed unused and stylistically incorrect class defs
2013-01-22 17:34:45 -05:00
Don Mitchell
c2fcdfde3b
RequireJS included 2x in main_vendor_js list
2013-01-22 17:26:12 -05:00
Don Mitchell
2ae92cbd88
Added RequireJS to fix expectation that it's included.
...
Unit drag and drop works correctly now.
2013-01-22 17:25:28 -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
b381881a02
studio html editor - adding in font references to tinyMCE css
2013-01-22 16:05:06 -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
marco
7b12dac021
added make visible to menu, and visibility description to threads
2013-01-22 15:47:23 -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
Ned Batchelder
532285e558
Only need one of these lines.
2013-01-22 15:22:30 -05:00
Ned Batchelder
85c3779286
Use the v0.1 tag in the XBlock repo.
2013-01-22 15:21:18 -05:00
Brian Talbot
e3a2749ff8
studio html editor - added in styles for TinyMCE table elements
2013-01-22 15:20:25 -05:00
Jay Zoldak
26ee9a24ef
Add test for TOC rendering
2013-01-22 15:15:47 -05:00
Deena Wang
7884e2c690
more tests
2013-01-22 15:08:44 -05:00
Calen Pennington
75b0a8eed6
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2013-01-22 14:47:52 -05:00
Calen Pennington
82eee4af84
Merge pull request #1325 from MITx/feature/cale/anon-user-bugfix
...
Anonymous users don't have an email attribute, and shouldn't be checked ...
2013-01-22 11:11:07 -08:00
Calen Pennington
bbcab7314a
Anonymous users don't have an email attribute, and shouldn't be checked for CourseEnrollmentAllowed
2013-01-22 14:10:01 -05:00
Deena Wang
3565023389
created test_courses.py
2013-01-22 14:01:01 -05:00
