Commit Graph

10188 Commits

Author SHA1 Message Date
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
Chris Dodge
a9c4493a70 always make the spinner spin on unit renames 2012-11-05 12:26:44 -05:00
Chris Dodge
6b45b4c741 bind the disabling/enabling of the unit name input field based on whether the page state is public or not. We shouldn't be able to edit when public. 2012-11-05 12:02:08 -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
Vik Paruchuri
f9555d815a changed points in progress tab to being completion based, not correctness based 2012-11-05 08:55:15 -05: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
Vik Paruchuri
4bde46677b sync answer, correctness, hint, so they all save at the same time 2012-11-02 13:27:06 -04:00
Vik Paruchuri
35fa61cca3 add some documentation 2012-11-02 13:09:58 -04:00
Vik Paruchuri
3da43fc2ee add in ability to store multiple answers 2012-11-02 13:05:32 -04:00
Vik Paruchuri
0e38fe0389 add ability to store multiple answers 2012-11-02 12:46:34 -04:00
Vik Paruchuri
38d90b0899 persist hints to database, remove check button if too many attempts 2012-11-02 12:27:03 -04:00
Vik Paruchuri
f292fefedc python code to add in hint box and persist 2012-11-02 12:22:07 -04:00
Vik Paruchuri
0fe3c73ad9 adding in hint box 2012-11-02 12:18:00 -04: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
Vik Paruchuri
8734e492de added back in ie css file that was accidentally removed 2012-11-02 09:23:36 -04:00
Vik Paruchuri
8557007195 removed some extra files, undid changes to html module 2012-11-02 09:22:23 -04: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
Vik Paruchuri
ec0f8dacfe clean up display code 2012-11-01 17:45:58 -04: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
Vik Paruchuri
99b0795e59 replaced removed file from master 2012-11-01 15:10:05 -04: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
Vik Paruchuri
e434673773 moved ajax url to hidden input types 2012-11-01 14:57:53 -04:00
Vik Paruchuri
f8625660fe add previous answer display 2012-11-01 14:52:37 -04:00
Vik Paruchuri
e97af7cf59 edit javascript var name 2012-11-01 14:37:47 -04:00
Vik Paruchuri
addde6442e reverted capa module after accidental changes 2012-11-01 14:32:40 -04:00
Vik Paruchuri
7d4d5a0f3b reformat code with spaces 2012-11-01 14:24:06 -04:00
Vik Paruchuri
db7bdd84c8 add documentation and clean up code 2012-11-01 14:23:13 -04:00
Vik Paruchuri
ed3912528a fix ajax url issue 2012-11-01 14:07:50 -04:00
Vik Paruchuri
a9a73e9a76 capa module integration 2012-11-01 13:42:34 -04:00
Vik Paruchuri
a28b4ce18e added extensions to persist state 2012-11-01 13:32:05 -04:00
Carlos Andrés Rocha
32498f3468 Remove learning designer and producer openings from job page 2012-11-01 13:21:40 -04:00
Vik Paruchuri
7b81f25016 add state functions 2012-11-01 13:09:11 -04:00