David Ormsbee
|
67dea0c3c3
|
Merge pull request #1224 from MITx/content/rocha/media-kit
Add media kit page
|
2013-01-03 14:50:57 -08:00 |
|
Diana Huang
|
fe86c25f72
|
Bug fixes for the JS and the peer grading service
|
2013-01-03 17:23:30 -05:00 |
|
Carlos Andrés Rocha
|
2e6ac2f72c
|
Fix link to root page on the main page footer
|
2013-01-03 17:21:54 -05:00 |
|
Brian Talbot
|
a67b54bf82
|
media kit - added initial styles to media kit page
|
2013-01-03 17:10:16 -05:00 |
|
Diana Huang
|
28501ca58e
|
Merge branch 'master' into diana/peer-grading-views
|
2013-01-03 16:23:14 -05:00 |
|
Diana Huang
|
078b2a5b95
|
Fix up some minor state issues and
complete basic JS functionality for page
|
2013-01-03 16:19:04 -05:00 |
|
Brian Talbot
|
e10e87e6ec
|
media kit - revised link styling on homepage
|
2013-01-03 14:21:07 -05:00 |
|
Diana Huang
|
becffd4dbb
|
Updated html and javascript for new pages as well
as a fix for the peer grading service
|
2013-01-03 14:08:56 -05:00 |
|
Diana Huang
|
c0001597a3
|
Update some of the templates so that they don't break
|
2013-01-03 13:47:29 -05:00 |
|
Diana Huang
|
1c1034c63b
|
Pass location as a parameter, not as a part of the url
|
2013-01-03 13:47:03 -05:00 |
|
Carlos Andrés Rocha
|
bd0a2f6630
|
Add content and assets for media kit
[# 41872203]
|
2013-01-03 13:28:45 -05:00 |
|
Diana Huang
|
962d83d71b
|
Display a message when there are no problems to grade
|
2013-01-03 13:00:02 -05:00 |
|
Diana Huang
|
bd47b0c79a
|
New urls and corresponding views in the grading service
|
2013-01-03 12:59:34 -05:00 |
|
Chris Dodge
|
0743adb1cd
|
update grade download csv content
|
2013-01-03 12:58:59 -05:00 |
|
David Ormsbee
|
2daddff2ef
|
Merge pull request #1217 from MITx/feature/zoldak/lms-acceptance-testing
Merge the lettuce acceptance test framework to master
|
2013-01-03 09:06:47 -08: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 |
|
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 |
|
Diana Huang
|
8737009679
|
Merge branch 'master' into diana/peer-grading-views
|
2013-01-02 15:04:18 -05: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 |
|
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 |
|
Jay Zoldak
|
10275e9709
|
Add item checking within courseware tabs
|
2013-01-02 10:44:19 -05:00 |
|
Jay Zoldak
|
a40ea202d2
|
Cleanup of imports in courseware tests
|
2013-01-02 10:44:19 -05:00 |
|