Carlos Andrés Rocha
|
5f5f56bbbd
|
Fix syntax on dashboard template
|
2012-11-09 21:40:55 -05:00 |
|
Carlos Andrés Rocha
|
8c2cbede9e
|
Quickfix to render the dashboard when there is no certificate db tables
|
2012-11-09 20:58:02 -05:00 |
|
John Jarvis
|
157c98a79d
|
only check cert_status when certificates feature flag is enabled
|
2012-11-09 20:31:05 -05:00 |
|
Victor Shnayder
|
ca9cb86a7d
|
show proper course will-start/started/ended text on dashboard
|
2012-11-09 18:18:37 -05:00 |
|
Victor Shnayder
|
1b2371d64a
|
fix bug in has_ended
|
2012-11-09 18:18:37 -05:00 |
|
Victor Shnayder
|
2846c61d15
|
Revert "remove (almost) all references to askbot."
This reverts commit 793354a0dc.
|
2012-11-09 18:18:37 -05:00 |
|
Victor Shnayder
|
0b69870d05
|
Reverting askbot removal for now
Revert "add migration to remove askbot columns"
This reverts commit 9281f3c140.
|
2012-11-09 18:18:36 -05:00 |
|
Victor Shnayder
|
cf33d85ef9
|
Wire up cert status
|
2012-11-09 18:18:36 -05:00 |
|
Victor Shnayder
|
d636d729c6
|
add migration to remove askbot columns
|
2012-11-09 18:18:33 -05:00 |
|
Victor Shnayder
|
76f0cf4a86
|
remove (almost) all references to askbot.
|
2012-11-09 18:18:33 -05:00 |
|
Victor Shnayder
|
f88cb685aa
|
split out the assess and reflect states. Still need matching js
|
2012-11-09 16:20:53 -05:00 |
|
Chris Dodge
|
da3c3e5f20
|
initial xlint implementation. Accumulate all import errors during XmlModuleStore importing. Also do checks post XmlModuleStore import and assert that the structure (course->chapter->sequential->vertical) is present in the courses.
|
2012-11-09 13:54:12 -05:00 |
|
Chris Dodge
|
da8efc17de
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint
|
2012-11-09 09:37:21 -05:00 |
|
Chris Dodge
|
5a02e37cce
|
make sure we strip away the leading '/' from the subpath for static content otherwise the naming expectations will break
|
2012-11-09 09:11:56 -05:00 |
|
Victor Shnayder
|
fb3b52b99f
|
refactor + style self-assessment in progress
|
2012-11-08 18:01:09 -05:00 |
|
Chris Dodge
|
3774c95b5e
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint
|
2012-11-08 16:12:26 -05:00 |
|
chrisndodge
|
13700316a6
|
Merge pull request #1025 from MITx/feature/cdodge/static-tab-edit
Feature/cdodge/static tab edit
|
2012-11-08 13:10:51 -08:00 |
|
Chris Dodge
|
981f5cee45
|
initial buildout of a 'xlint' test to verify legacy coursewar
|
2012-11-08 16:07:17 -05:00 |
|
Chris Dodge
|
c3c6a7af7e
|
address feedback from cale
|
2012-11-08 13:29:46 -05:00 |
|
Calen Pennington
|
171e932266
|
Merge branch 'master' into feature/cale/cms-master
Conflicts:
rakefile
|
2012-11-08 12:28:40 -05:00 |
|
Calen Pennington
|
3230345204
|
Make coverage reports only include code from the source directories
|
2012-11-08 12:25:12 -05:00 |
|
Ned Batchelder
|
28bb4724e7
|
Put the coverage data files in the reports dir, where they will be treated like the disposable things they are.
|
2012-11-08 11:20:23 -05:00 |
|
Ned Batchelder
|
3dc23eb131
|
Coverage xml and html reports are now a separate 'xml' and 'html' step from 'test'.
|
2012-11-08 11:20:22 -05:00 |
|
Ned Batchelder
|
90e3386751
|
WIP for quieter tests with coverage.
|
2012-11-08 11:19:33 -05:00 |
|
Chris Dodge
|
b432db1aba
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/static-tab-edit
|
2012-11-08 09:55:56 -05:00 |
|
Chris Dodge
|
7dbabce4db
|
fix up styling by reusing existing CSS class names. Also refactor some code regarding the management of static_tabs so that it's in the course as course contains references to static_tabs in the current data model
|
2012-11-08 09:55:52 -05:00 |
|
chrisndodge
|
e3d65a0c08
|
Merge pull request #997 from MITx/feature/cale/js-tests
Feature/cale/js tests
|
2012-11-08 06:44:49 -08:00 |
|
David Ormsbee
|
459c5e322f
|
Merge pull request #1024 from MITx/feature/dave/pearson_setup
Simple Pearson Testing
|
2012-11-07 16:29:29 -08:00 |
|
David Ormsbee
|
e90d321142
|
Comments, whitespace from review.
|
2012-11-07 19:28:22 -05:00 |
|
Carlos Andrés Rocha
|
25d482099e
|
Merge pull request #955 from MITx/louis/srt_downloads
Add support for subtitle download link
|
2012-11-07 15:31:02 -08:00 |
|
Victor Shnayder
|
e3c213dd38
|
Refactor html and js.
Next:
- more clear states (logic in python, view in js)
- style
|
2012-11-07 18:18:35 -05:00 |
|
David Ormsbee
|
4b02b2af2a
|
Rearrange how we handle the auth tokens for our fake Pearson preliminary testing
|
2012-11-07 17:20:49 -05:00 |
|
Chris Dodge
|
a99277275d
|
add new files
|
2012-11-07 15:56:16 -05:00 |
|
Chris Dodge
|
9cc1af5052
|
first pass at static tab editing. Doesn't yet support drag/drop as well as new tab creation, which needs to modify the policy on the course
|
2012-11-07 15:27:44 -05:00 |
|
David Ormsbee
|
528fcd7f4e
|
Create a config option for enabling a Pearson login in a totally hacky manner.
|
2012-11-07 14:08:55 -05:00 |
|
David Ormsbee
|
92f2fbf0f8
|
Ugly, ugly hack needed so that Pearson can test something today, to be replaced by a real implementation later this week or early next.
|
2012-11-07 13:55:08 -05:00 |
|
Chris Dodge
|
87ff18dc56
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
|
2012-11-07 09:35:21 -05:00 |
|
David Ormsbee
|
ad93f70e65
|
Re-add TestCenterUser along with a basic command to make an entry for a given user already in the system.
|
2012-11-07 09:24:38 -05:00 |
|
Carlos Andrés Rocha
|
07da271747
|
Merge pull request #1022 from MITx/ie8patch
revert to using getElementsByClassName in .dialog b/c jQuery was
|
2012-11-06 14:14:07 -08:00 |
|
Don Mitchell
|
ce623bcf17
|
revert to using getElementsByClassName in .dialog b/c jQuery was
undefined on the content passed in & whole widget is disabled in ie8.
|
2012-11-06 17:05:44 -05:00 |
|
Calen Pennington
|
bca0134a35
|
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
|
2012-11-06 16:13:31 -05:00 |
|
Chris Dodge
|
55c69a1e13
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
Conflicts:
lms/djangoapps/courseware/module_render.py
|
2012-11-06 14:20:59 -05:00 |
|
David Ormsbee
|
847b2eb7e0
|
Merge branch 'master' into feature/dave/pearson_setup
|
2012-11-06 11:54:13 -05:00 |
|
Vik Paruchuri
|
b66a559b1d
|
Add some more docs to code, remove some old code that assigned points.
|
2012-11-06 09:49:00 -05:00 |
|
Vik Paruchuri
|
fee0facd39
|
Add in some docs for tests, factor out class name in js
|
2012-11-06 09:30:59 -05:00 |
|
Calen Pennington
|
6212507b55
|
Merge pull request #1008 from MITx/ie8patch
merge to master
|
2012-11-06 06:18:01 -08:00 |
|
Vik Paruchuri
|
71547e29da
|
Added tests for selfassessment import and export (both pass)
|
2012-11-06 09:17:35 -05:00 |
|
Vik Paruchuri
|
b209018c46
|
Adding tests
|
2012-11-06 09:03:59 -05:00 |
|
Vik Paruchuri
|
2aeb6150d3
|
Work on documentation
|
2012-11-05 19:18:04 -05:00 |
|
Vik Paruchuri
|
88491f7bb1
|
moved everything to templates, added hint prompt
|
2012-11-05 19:13:48 -05:00 |
|