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
Calen Pennington
59ee0c5abf
Merge pull request #1018 from MITx/fix/cdodge/delete-last-component-does-not-stick
...
Fix/cdodge/delete last component does not stick
2012-11-08 05:52:02 -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
ab0e7cf4ae
Change AUTH_TOKENS index reference to a get so it doesn't explode the whole app if I did Puppet incorrectly.
2012-11-07 17:36:50 -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
Brian Talbot
3b42ea7e9e
added basic settings markup and revised sections based on additional fields/info needed
2012-11-07 15:00:48 -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
Victor Shnayder
27cffb9387
Update requirements.txt
...
Taking out MySQL-python for now because it requires mysql to be installed, so breaks updates on content folks' envs.
2012-11-07 11:39:42 -05:00
Calen Pennington
b7e0625bb4
Merge pull request #971 from MITx/feature/cdodge/import-course-info
...
implement importing of course info sections as modules in the course
2012-11-07 07:12:30 -08: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
Chris Dodge
afd8584569
remove explicit 'null' for child collection on saveName on unit code paths. I had seen cases where save was posting back an empty set on renames - deleting the components. But I can no longer reproduce it now.
2012-11-07 09:34:44 -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
Calen Pennington
9d92711d25
Merge pull request #1015 from MITx/feature/cdodge/mongo-perf-instrumenting
...
add django performance metering
2012-11-07 06:14:19 -08:00
Chris Dodge
5f1e5c2d70
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/delete-last-component-does-not-stick
2012-11-07 09:14:16 -05:00
David Ormsbee
53c5170dbc
Simple PEP8 issues.
2012-11-06 18:14:57 -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
Victor Shnayder
a544175bef
Merge pull request #1020 from MITx/feature/alex/doc
...
Feature/alex/doc
2012-11-06 10:32:36 -08:00
Victor Shnayder
5870260e1a
Merge pull request #1021 from MITx/feature/ichuang/add_mongo_use_docs
...
add doc file about use of mongo (by cms+lms)
2012-11-06 10:28:23 -08:00
David Ormsbee
847b2eb7e0
Merge branch 'master' into feature/dave/pearson_setup
2012-11-06 11:54:13 -05:00
Chris Dodge
3f01bef1eb
Add changelog information
2012-11-06 10:34:51 -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
ichuang
1162f6f319
add doc file about use of mongo (by cms+lms)
2012-11-06 09:29:23 -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
6cdc41505e
Fixed incorrect dev.py commit
2012-11-06 08:50:06 -05:00
Александр
95960d0901
claning
2012-11-06 14:41:15 +02:00
Александр
3bae16fbdf
update of documentation
2012-11-06 14:39:53 +02: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
Vik Paruchuri
92e931b15b
Rename hint to hints
2012-11-05 19:02:36 -05:00
Vik Paruchuri
9310267e0b
Proper instance state storage, remove correctmap vars
2012-11-05 18:57:19 -05:00
Vik Paruchuri
dfbfc7905f
Work on templating, bugfix
2012-11-05 18:48:41 -05:00
Vik Paruchuri
e94a78c6bb
Refactor code to make it simpler, pull out templates
2012-11-05 18:42:55 -05:00
Arjun Singh
d9b553b378
Adding a better command for assigning roles.
2012-11-05 15:29:49 -08:00
Victor Shnayder
914e9c9b83
Mid-cleanup.
...
- remove all the html-module-specific cruft
2012-11-05 18:01:31 -05:00
Don Mitchell
7f4bb63dff
Final ie8 fixes hopefully. Now renders correctly for staff. Moved the
...
debug fns from per problem to part of courseware w/ context info passed
as parms. Known issues: ie8 complains that getlog is not defined if you
click on QA and does not show the debug info popup.
2012-11-05 13:55:09 -05:00
Victor Shnayder
f6a56a1914
Merge pull request #1016 from MITx/content/rocha/job-page-update
...
Remove openings from job page
2012-11-05 10:17:47 -08:00
