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 |
|
Diana Huang
|
24f23176af
|
Add the ability to set up custom text for short form and
and long form results.
|
2013-01-22 13:17:37 -05:00 |
|
Chris Dodge
|
9520290018
|
add optional course_id parameter to DraftMongoStore.get_items()
|
2013-01-22 11:55:36 -05:00 |
|
Don Mitchell
|
6ce300a3c8
|
Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag
Conflicts:
cms/static/js/base.js
cms/static/js/hesitate.js
|
2013-01-22 11:47:49 -05:00 |
|
Don Mitchell
|
1b64faf610
|
Caching to change branches for other work
|
2013-01-22 11:42:23 -05:00 |
|
Don Mitchell
|
48fa4b4a5e
|
Cache in order to try updated sortable lib
|
2013-01-22 11:39:23 -05:00 |
|
Don Mitchell
|
edda80d485
|
New style base python classes and basestring type.
|
2013-01-22 11:30:24 -05:00 |
|
Diana Huang
|
9a53c37530
|
Use something more visually easy to use for self-assessment.
|
2013-01-22 11:25:12 -05:00 |
|
Brian Wilson
|
9653631e9a
|
Add initial openid_provider tests (covers xrds and authentication requests)
|
2013-01-22 11:15:30 -05:00 |
|
Deena Wang
|
6e773909e4
|
added test_views
|
2013-01-22 10:36:05 -05:00 |
|
Diana Huang
|
ba1cd8117f
|
Rename 'Pending' column to something more descriptive
|
2013-01-22 10:33:07 -05:00 |
|
Diana Huang
|
a34a9dd038
|
Merge branch 'master' into diana/open-ended-ui-updates
|
2013-01-22 08:40:40 -05:00 |
|
Diana Huang
|
e7bc32fd4d
|
Merge branch 'master' into feature/diana/rubric-input
|
2013-01-22 08:38:17 -05:00 |
|
ichuang
|
5d6c5de8e9
|
Merge pull request #1324 from MITx/pbaratta/symmath
Added some symmath comments
|
2013-01-22 05:01:48 -08:00 |
|
Peter Baratta
|
45f2a690d0
|
Commented on high level functions
|
2013-01-22 01:40:13 -07:00 |
|
Victor Shnayder
|
26f7b984a7
|
Merge pull request #1323 from MITx/content/rocha/lewin-announcement
Content/rocha/lewin announcement
|
2013-01-21 14:19:54 -08:00 |
|
Carlos Andrés Rocha
|
183721ecf5
|
Correct last screenshot caption of media-kit page.
[#159]
|
2013-01-21 16:58:35 -05:00 |
|
Carlos Andrés Rocha
|
899c501d3d
|
Add announcement of Walter Lewin's course
[#157]
|
2013-01-21 16:58:27 -05:00 |
|
Victor Shnayder
|
715a179015
|
Merge pull request #1321 from MITx/feature/alex/drag_and_drop-mitx
Feature/alex/drag and drop mitx
|
2013-01-21 09:36:11 -08: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 |
|