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
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
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
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
Александр
95960d0901
claning
2012-11-06 14:41:15 +02:00
Александр
3bae16fbdf
update of documentation
2012-11-06 14:39:53 +02: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
Chris Dodge
e37d4d7a1e
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/mongo-perf-instrumenting
2012-11-05 12:39:25 -05:00
Александр
5bae445538
docs close to structure, add snippet to autodoc django models
2012-11-05 18:56:02 +02:00
Carlos Andrés Rocha
31d3144532
Remove openings from job page
2012-11-05 10:23:58 -05:00
Victor Shnayder
b401a97ca2
Merge pull request #1014 from MITx/bugfix/dave/use_toy_course_for_discuss_test
...
Use one of our test courses when testing course permissions for the discussion client
2012-11-05 06:35:34 -08:00
Александр
86189b3b7c
changed witdh to 100%
2012-11-05 14:03:18 +02:00
David Ormsbee
d1aa0a254e
Use one of our test courses when testing course permissions for the discussion client, because we now have course policy level overrides.
2012-11-02 17:21:00 -04:00
David Ormsbee
f38ba3ce5c
Merge pull request #1012 from MITx/bugfix/victor/xml-loading
...
Fix a bug with pointer-tag detection on load
2012-11-02 14:04:53 -07:00
Victor Shnayder
55a0cada7b
Fix a bug with pointer-tag detection on load
...
if a tag has text but no children, wasn't properly detected as an inline definition.
2012-11-02 16:59:41 -04:00
David Ormsbee
7595ab4a24
Merge pull request #1006 from MITx/content/rocha/job-page-update
...
Remove learning designer and producer openings from job page
2012-11-02 13:52:38 -07:00
Calen Pennington
4608803182
Merge pull request #999 from MITx/feature/jm/fixing_devenv
...
Fixed install by adding mysql
2012-11-02 13:41:02 -07:00
Calen Pennington
e35d1483c6
Merge pull request #1009 from MITx/bug/lyla/latextemplate
...
fixed typo
2012-11-02 13:38:40 -07:00
Victor Shnayder
9db977feae
Merge pull request #1002 from MITx/feature/victor/inputtypes-refactor
...
More inputtype refactor …
2012-11-02 13:05:40 -07:00
Don Mitchell
8089be3354
Minor stylistic change on jQuery pattern.
2012-11-02 15:31:02 -04:00
Chris Dodge
918de8b4a9
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/mongo-perf-instrumenting
...
Conflicts:
requirements.txt
2012-11-02 15:09:54 -04:00
Chris Dodge
b75a814f7a
add django performance metering
2012-11-02 15:08:45 -04:00
Don Mitchell
afabb4ab16
Don't call fn before defined. [ie8 is only browser which seems to care.]
2012-11-02 14:25:25 -04:00
Victor Shnayder
79174259cb
Address Ike's comments.
...
- change a few comments / strings
- move extract_choices into the ChoiceGroup class
2012-11-02 14:00:51 -04:00
Александр
037b6823f5
doc logo prototype
2012-11-02 19:45:05 +02:00
Александр
d55565791b
sphinx documentations, beginnings, capa module added
2012-11-02 17:19:51 +02:00
Александр
b8dc44c6ca
commands for viewing and compiling docs
2012-11-02 17:17:12 +02:00
Calen Pennington
0bfa443520
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-02 11:09:19 -04:00
Александр
8d40b19c94
adde sphinx to pip req
2012-11-02 15:27:49 +02:00
Victor Shnayder
d05f6c8a06
Merge pull request #1005 from MITx/fix-alex-vsepr-2-mitx
...
Fix alex vsepr 2 mitx
2012-11-01 17:52:16 -07:00
Aaron Culich
4db61f2531
Fixed mysql_config not found error by adding libmysqlclient-dev to APT_PKGS
2012-11-01 19:31:19 +00:00
Chris Dodge
b788b9d659
add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc.
2012-11-01 15:08:26 -04:00
Carlos Andrés Rocha
32498f3468
Remove learning designer and producer openings from job page
2012-11-01 13:21:40 -04:00
Александр
3ed4b77d8c
removed testsing comments
2012-11-01 17:43:41 +02:00
Lyla Fischer
8ed4ef4412
fixed typo
2012-11-01 11:36:41 -04:00
Александр
07a2a105ca
added comments
2012-11-01 17:35:27 +02:00
Александр
5ba2c2e785
converted unittests
2012-11-01 16:48:44 +02:00
Александр
5755325a41
changed syntax to support e1,e2 in AX6 and add convert_to_p behavior
2012-11-01 16:26:54 +02:00
Aaron Culich
40ce5d2ff6
Fixed dependency problem introduced by MySQL-python by forcing distribute version >= 0.6.28 in pre-requirements
2012-11-01 14:08:24 +00:00
Aaron Culich
4712a039dc
Added DEBIAN_FRONTEND=noninteractive to sudo apt-get which is required for silent mysql-server installation
2012-11-01 14:06:03 +00:00
Aaron Culich
2203a0bd70
Updated APT_PKGS with valid Ubuntu package name: mysql -> mysql-server
2012-11-01 14:05:11 +00:00
David Ormsbee
482800064b
Merge pull request #1003 from MITx/feature/dave/close_forum
...
Support blackout periods for restricting student forum posts per class
2012-11-01 06:15:25 -07:00
David Ormsbee
ddc4f705e0
Remove raise that was there just for debugging purposes
2012-11-01 04:50:23 -04:00
David Ormsbee
8f756f0304
Document advertised_start and discussion_blackouts attributes of course
2012-11-01 04:45:00 -04:00
David Ormsbee
8a453e99ca
Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view.
2012-11-01 04:37:16 -04:00
