Commit Graph

871 Commits

Author SHA1 Message Date
kimth
d2cb645834 Multiple file submissions 2012-08-19 09:26:03 -04:00
kimth
d920e718d0 AJAX permits multiple file upload 2012-08-19 08:26:12 -04:00
kimth
588444c46b Filesubmission template allows multiple file selection 2012-08-19 07:54:10 -04:00
kimth
78b3ca050e More info in comment 2012-08-18 10:08:49 -04:00
kimth
25d3890595 Remove outdated hardcoded url from circuit simulator 2012-08-18 09:51:27 -04:00
kimth
40b49224a2 Merge pull request #451 from MITx/feature/kfiedler/courseware-style
Added new styles for sequence nav and reset some of the styles for inputs
2012-08-17 17:54:03 -07:00
Kyle Fiedler
8473188fea Added new styles for sequence nav and reset some of the styles for inputs 2012-08-17 17:41:45 -04:00
ichuang
4dbcfe927e hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver
This needs a more permanent solution.
2012-08-17 09:36:43 -04:00
Calen Pennington
427c400f9e Merge pull request #444 from MITx/feature/fix_user_repl_to_3_plus
Fix user replication to Courses you're already enrolled in
2012-08-17 05:55:31 -07:00
kimth
0a9065f2be Fix CustomResponse for 6.002x 2012-08-16 22:00:10 -04:00
David Ormsbee
61108c27cb When replicating CourseEnrollment, make sure Users were created in all DBs before replicating other models 2012-08-16 19:12:57 -04:00
kimth
bea9aec6ea Merge pull request #443 from MITx/feature/victor/fix-html-rendering
fix another backcompat html bug
2012-08-16 15:00:37 -07:00
Victor Shnayder
7e69c35735 fix another backcompat html bug 2012-08-16 17:58:10 -04:00
kimth
9686868a32 Merge pull request #442 from MITx/feature/kfiedler/courseware-style
Added fix for answer status and show answer to stay in the same place
2012-08-16 14:51:43 -07:00
Kyle Fiedler
f343bc28f3 Added fix for answer status and show answer to stay in the same place 2012-08-16 17:49:50 -04:00
kimth
c56fb6f326 Merge pull request #440 from MITx/feature/kfiedler/courseware-style
BUG SMASH
2012-08-16 14:12:45 -07:00
David Ormsbee
b5c6053000 Merge pull request #438 from MITx/feature/ichuang/minor-py26-compat-fix-part2
{} -> {0} etc in .format statements
2012-08-16 14:11:25 -07:00
Kyle Fiedler
09973bd815 Added fix for circut simulator 2012-08-16 17:08:12 -04:00
kimth
fa3e46880d Merge pull request #439 from MITx/feature/victor/fix-html-rendering
fix html rendering bug
2012-08-16 14:02:10 -07:00
Victor Shnayder
1ae71313bc fix html rendering bug 2012-08-16 16:53:29 -04:00
ichuang
6e3eff304e {} -> {0} etc in .format statements 2012-08-16 16:22:26 -04:00
Kyle Fiedler
b17cbcdccd Added fixes for speed dropdown 2012-08-16 15:27:23 -04:00
ichuang
73d9d10aa8 html needs < in backcompat_module 2012-08-16 15:17:55 -04:00
ichuang
0cac6c9512 minor change to backcompat_module for py26 compat 2012-08-16 15:16:42 -04:00
Sarina Canelake
725e9a2a7b Add facility for fixed number of problem attempts 2012-08-16 14:27:28 -04:00
Calen Pennington
56fc4e2fe8 Merge pull request #433 from MITx/feature/kfiedler/courseware-style
Made video go to the center of the screen in full screen
2012-08-16 10:52:27 -07:00
Calen Pennington
4e9e65e0e1 Merge pull request #432 from MITx/feature/cale/fix-tests
Move mitxmako out of common lib, and pass template rendering function in...
2012-08-16 10:52:12 -07:00
Kyle Fiedler
c2ee844704 Made video go to the center of the screen in full screen 2012-08-16 13:47:15 -04:00
Calen Pennington
4798a46948 Add docstring for load_function 2012-08-16 13:08:10 -04:00
Calen Pennington
3b36fbf914 Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore 2012-08-16 12:49:42 -04:00
Calen Pennington
9118e585cc Merge pull request #426 from MITx/feature/halogenandtoast/multiple_textbooks
Feature/halogenandtoast/multiple textbooks
2012-08-16 09:47:53 -07:00
Matthew Mongeau
ae3cb4ec7b Nest textbooks under data 2012-08-16 12:06:37 -04:00
Calen Pennington
6bca6cdc28 Merge pull request #430 from MITx/feature/ichuang/fix-modulestore-etree-parser
Fix bug preventing comments from being in course.xml
2012-08-16 09:06:14 -07:00
Calen Pennington
919b3e2137 Merge pull request #429 from MITx/feature/victor/strip-metadata
Feature/victor/strip metadata
2012-08-16 08:52:23 -07:00
Matthew Mongeau
4ff80287f7 Remove TextbookDescriptor from setup. 2012-08-16 11:52:10 -04:00
ichuang
7553dac2f3 etree parser needs to be set on each call in modulestore load_course 2012-08-16 11:50:04 -04:00
Matthew Mongeau
945632362b Get rid of TextbookModule and TextbookDescriptor. 2012-08-16 11:49:03 -04:00
Victor Shnayder
61478f4ba0 fix string format bug 2012-08-16 11:46:56 -04:00
Victor Shnayder
c02313a099 hackish cleanup script 2012-08-16 11:43:40 -04:00
Victor Shnayder
00d9ecd600 New policy organization:
* course roots live in roots/{url_name}.xml
   - one is linked from course.xml

* policies live in policies/url_name.json
  - loaded based on course url_name

* Updated to pass policy through into xml parsing, so it takes effect
  before descriptor constructors are called.

* Update toy test course to new structure, fix up tests
2012-08-16 11:41:19 -04:00
Victor Shnayder
691744e359 Use .display_name instead of metadata['display_name']
* the former does a fallback if metadata['display_name'] isn't set.
2012-08-16 11:37:54 -04:00
Victor Shnayder
5e2f676153 backcompat warnings 2012-08-16 11:36:05 -04:00
Kyle Fiedler
ad7061e41f Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav 2012-08-16 11:33:05 -04:00
Calen Pennington
3efea9cbb0 Merge pull request #425 from MITx/feature/bridger/new_wiki
Feature/bridger/new wiki
2012-08-16 07:31:56 -07:00
Matthew Mongeau
4a7b163ce3 Keep textbooks out of displayable items. 2012-08-16 10:31:18 -04:00
Matthew Mongeau
34010a38a8 Fix textbook module. 2012-08-16 10:31:17 -04:00
Matthew Mongeau
ae09598d9a Display textbooks in course navigation, handle in urls and views. 2012-08-16 10:31:17 -04:00
ichuang
f39e589625 do replace_urls within capa_module get_answer (eg for img in <solution>s) 2012-08-15 21:57:33 -04:00
Victor Shnayder
f717b0421f fix bug in backcompat section replacement
(s/sequence/sequential/)
2012-08-15 21:39:10 -04:00
Victor Shnayder
ce29b5aec2 Special case handling of course url_names in policy.json 2012-08-15 16:06:42 -04:00