cahrens
|
b91e85c09f
|
Remove tiny_mce.
|
2013-01-03 10:53:42 -05:00 |
|
Chris Dodge
|
e70db062b2
|
Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
Conflicts:
requirements.txt
|
2013-01-03 10:46:24 -05:00 |
|
Chris Dodge
|
7229a9cdaf
|
perform a new merge from master, resolve conflicts
|
2013-01-03 10:43:03 -05:00 |
|
cahrens
|
e1b7a266fb
|
Remove askbot.
|
2013-01-03 10:42:54 -05:00 |
|
cahrens
|
4ede8d6ab6
|
tiny_mce
|
2013-01-03 09:50:35 -05:00 |
|
cahrens
|
f95499b14d
|
Work in progress, related to rich HTML editor.
|
2013-01-03 09:48:36 -05:00 |
|
Brian Wilson
|
c76f37050a
|
introduce form to template
|
2013-01-03 03:22:37 -05:00 |
|
valera-rozuvan
|
233a35e01e
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
7a8d83a17f
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
c5cd67a6a5
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
f2cce07bd7
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
37c7967e8c
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
213ca3fa32
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
fd0ec0ed8a
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
de63541049
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
d0c72ebe16
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
8af93229d3
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
7cf848db9e
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
c4f336d8fd
|
Added RequireJS.js to the files.json config so that is it also loaded when testing with Jasmine.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
8f120f1d27
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
c94530cb01
|
Added initial RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
62271fe5c6
|
Added namespaced RequireJS.
|
2013-01-03 10:14:06 +02:00 |
|
Brian Wilson
|
4abd9cd3d4
|
get closer to working again
|
2013-01-02 18:56:25 -05:00 |
|
Diana Huang
|
c89ff2ac0e
|
Basic peer grading view using mocks and some cleanup in
the peer grading service
|
2013-01-02 17:44:58 -05:00 |
|
Don Mitchell
|
4f32d5f34d
|
Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor
Conflicts:
cms/static/sass/_assets.scss
cms/static/sass/_base.scss
cms/static/sass/_unit.scss
cms/templates/unit.html
|
2013-01-02 17:39:27 -05:00 |
|
Calen Pennington
|
465c85b04b
|
Make model classes inherit their parents fields attribute
|
2013-01-02 15:08:49 -05:00 |
|
Calen Pennington
|
0bed19648e
|
Remove filename and giturl references
|
2013-01-02 15:08:27 -05:00 |
|
Calen Pennington
|
4040f9749d
|
Correctly parse timetuple into datetime
|
2013-01-02 15:08:09 -05:00 |
|
Calen Pennington
|
7f39dd974b
|
Minor whitespace cleanup
|
2013-01-02 15:07:56 -05:00 |
|
Calen Pennington
|
4bec871b0f
|
Don't return BadRequest classes, return instances
|
2013-01-02 15:07:12 -05:00 |
|
Calen Pennington
|
8e0d218c7d
|
Stop using .definition and .metadata directly
|
2013-01-02 15:06:43 -05:00 |
|
Diana Huang
|
8737009679
|
Merge branch 'master' into diana/peer-grading-views
|
2013-01-02 15:04:18 -05:00 |
|
chrisndodge
|
edd9b2bc7b
|
Merge pull request #1220 from MITx/fix/cdodge/handout-links
trigger another build
|
2013-01-02 12:02:24 -08:00 |
|
Diana Huang
|
37f261f906
|
Move peer grading so that there are the individual problem pages
and the problem list page
|
2013-01-02 15:01:59 -05:00 |
|
Chris Dodge
|
b5ccb4b8fc
|
trigger another build
|
2013-01-02 15:01:21 -05:00 |
|
chrisndodge
|
fa0fd4b50b
|
Merge pull request #1219 from MITx/fix/cdodge/handout-links
another comment commit just to trigger a new build
|
2013-01-02 11:29:56 -08:00 |
|
Chris Dodge
|
d008cb9f3c
|
another comment commit just to trigger a new build
|
2013-01-02 14:25:35 -05:00 |
|
Don Mitchell
|
94f396b988
|
Merge pull request #1218 from MITx/bug/btalbot/editview-images
studio - resolved overflowing images in unit editing
|
2013-01-02 10:19:36 -08:00 |
|
Brian Talbot
|
a5aafc42ad
|
studio - resolved unit editing bug where larger images would overflow out of editing visual area
|
2013-01-02 12:58:59 -05:00 |
|
Jay Zoldak
|
56d17d8a8a
|
Improve some comments and names in the acceptance test framework
|
2013-01-02 10:44:21 -05:00 |
|
Jay Zoldak
|
d5111b9ed9
|
Get lettuce tests running against test database
|
2013-01-02 10:44:21 -05:00 |
|
Jay Zoldak
|
ccc8b599f1
|
Fixed tests to work OK so far.
|
2013-01-02 10:44:21 -05:00 |
|
Jay Zoldak
|
7e5a67badf
|
Add new partner universities and remove cs50 from smart accordion testing
|
2013-01-02 10:44:20 -05:00 |
|
Jay Zoldak
|
7f6d55ad86
|
Create acceptance tests for open ended grading.
|
2013-01-02 10:44:20 -05:00 |
|
Jay Zoldak
|
6df565e468
|
Interim work on open-ended grading acceptance testing POC
|
2013-01-02 10:44:20 -05:00 |
|
Jay Zoldak
|
d65985b445
|
Use beautiful soup to massage the HTML for easier comparison.
Strip off the data-id tag for HTML diff of courseware
Strip data-id attributes so they are not compared in the HTML
|
2013-01-02 10:44:20 -05:00 |
|
Jay Zoldak
|
8934f54d6f
|
Save the HTML to a file for each section and comment out debug msgs
|
2013-01-02 10:44:20 -05:00 |
|
Jay Zoldak
|
5cad5d5fba
|
Add scenarios for all Fall 2012 courses to smart accordion feature.
|
2013-01-02 10:44:20 -05:00 |
|
Jay Zoldak
|
20cc930312
|
Bring over acceptance test changes from cms master branch.
|
2013-01-02 10:44:20 -05:00 |
|
Jay Zoldak
|
af4f1668d7
|
Stub out the video and capture the html files of the high level tabs for diff comparison
Conflicts:
lms/templates/video.html
|
2013-01-02 10:44:20 -05:00 |
|