Commit Graph

19226 Commits

Author SHA1 Message Date
Brian Talbot
f34fd5c426 studio html editor - sync'ed up previous style and behavior work to refactored xmodule sass/js 2013-01-16 16:55:11 -05:00
Brian Wilson
e68e612ee1 Return 404 in begin_exam_registration when course or exam are not valid 2013-01-16 16:40:28 -05:00
Diana Huang
9079c66a32 Some interface cleanup stuff for the combined open ended module. 2013-01-16 16:35:58 -05:00
Brian Wilson
1de67be788 clear upload_status if user makes changes to TestCenterUser or TestCenterRegistration (so the change is pending, rather than rejected) 2013-01-16 15:43:15 -05:00
cahrens
bc80779f6f Fix bug related to creation of thumbnails for non-image files.
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
2013-01-16 15:40:14 -05:00
Brian Talbot
e8ba078d4e studio HTML editor - codemirror/tinymce toggle work - wip 2013-01-16 14:54:28 -05:00
Diana Huang
db366d4ebb Update CSS to make rubric even narrower. 2013-01-16 14:36:08 -05:00
Brian Wilson
1d6b1be888 fix missing indirection in log message 2013-01-16 14:30:30 -05:00
cahrens
cc5a5e2996 Fix multiple choice checkbox.
#117
2013-01-16 12:52:05 -05:00
David Ormsbee
5d66490065 Add a try/catch so that Askbot removal doesn't die if there's no Askbot to remove from auth_user 2013-01-16 12:15:23 -05:00
cahrens
de2674e3df Minor cleanup. 2013-01-16 11:38:18 -05:00
Brian Wilson
bfb5f5e5bd Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg 2013-01-16 11:24:46 -05:00
Brian Wilson
cc1b50ee4a use new-style class for TestCenterExam 2013-01-16 11:24:20 -05:00
cahrens
07d6bee5a7 storing work 2013-01-16 09:53:28 -05:00
Victor Shnayder
9519087d84 Merge pull request #1271 from MITx/feature/victor/beta-testers
Feature/victor/beta testers
2013-01-16 06:50:57 -08:00
Diana Huang
d844730f71 Fix some sizing issues in the CSS. 2013-01-16 09:17:00 -05:00
Brian Wilson
cc31c79517 fixes for first round of code review 2013-01-15 18:15:54 -05:00
Brian Wilson
3b28e328c4 disable export of testcenter_exam from course module (and add test). 2013-01-15 17:54:10 -05:00
Vik Paruchuri
8ff77329b1 Fix rubric rendering in combined open ended peer grading 2013-01-15 16:22:27 -05:00
cahrens
9818664bb1 storing work 2013-01-15 16:04:34 -05:00
Brian Wilson
ef0f973ca4 display client_candidate_id when registration accepted; strip whitespace from accommodation_request; cosmetic cleanup on pearson management commands. 2013-01-15 16:00:10 -05:00
Brian Wilson
32b2d1b97f Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations 2013-01-15 15:42:09 -05:00
Diana Huang
4422bd996d Merge branch 'master' into feature/diana/rubric-input 2013-01-15 14:44:57 -05:00
Brian Talbot
ed6134ea11 abstracted out common editor styles shared by problem and html editors 2013-01-15 14:14:31 -05:00
cahrens
0461407857 Proposed changes to fix asset caching bug. 2013-01-15 11:45:08 -05:00
Victor Shnayder
2f7210ed0c address Ike's comments 2013-01-15 11:44:27 -05:00
Victor Shnayder
3e5a2f9bde Add beta test group support
* add a days_early_for_beta inherited policy option
* students in the beta_testers_{COURSE} group get to see content that many days early
* Clean up some docstrings related to time formats
* Add basic test
2013-01-15 11:36:25 -05:00
David Ormsbee
66ffef131d Merge branch 'master' into cale/circular-import-fix
Conflicts:
	common/djangoapps/student/models.py
2013-01-15 11:35:19 -05:00
David Ormsbee
36b024ab95 Merge pull request #1203 from MITx/feature/alex/gst-mitx
Feature/alex/gst mitx
2013-01-15 08:24:09 -08:00
David Ormsbee
ad261706c8 Merge pull request #1263 from MITx/feature/ichuang/instructor-dashboard-upgrade3
Upgrade to instructor dashboard: enrollment, offline grades, remote gradebook
2013-01-15 08:22:19 -08:00
Brian Talbot
623769e9d8 separated common editor UI from problem and HTML editor SCSS - wip 2013-01-15 09:57:48 -05:00
Alexander Kryklia
b53786b688 removed on event from slider and readonly from textbox 2013-01-15 13:34:16 +02:00
Valera Rozuvan
c9c328cf39 Bugfix. 2013-01-15 12:55:25 +02:00
Alexander Kryklia
d3045b36ab initial function call added, fix 2013-01-15 12:55:25 +02:00
Alexander Kryklia
fc09bbd0b4 added funciton call 2013-01-15 12:55:25 +02:00
Alexander Kryklia
a49f94fe49 added none to allowed parameters in functions 2013-01-15 12:55:25 +02:00
Valera Rozuvan
ec0bdfb445 New feature: can specify output of "none" for a dynamic element. 2013-01-15 12:55:24 +02:00
Valera Rozuvan
1770de73f1 Bugfixing. Refactoring. Removed readonly check for text edits. Styling of text edits with jQuery UI. 2013-01-15 12:55:24 +02:00
Valera Rozuvan
77962e3cdb Removed unnecessary comments. Added feature to update element either on "change" or on "slide" event. 2013-01-15 12:55:24 +02:00
Valera Rozuvan
052dc3fa22 New feature: For bar graphs, can specify bar width and bar alignment. 2013-01-15 12:55:24 +02:00
Valera Rozuvan
271c182f4e Fixed bug: jQuery slider default change event name is "slidechange", and it behaves a bit differently than "slide" event. 2013-01-15 12:55:24 +02:00
Alexander Kryklia
a75003ef2f added no_slide parameters 2013-01-15 12:55:23 +02:00
Valera Rozuvan
782fb3b465 New feature: Can specify "change" or "slide" event type of sliders. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
f17e2466b1 New feature: Now can specify x-axis and y-axisnames for ticks. Updated "Fick s Second Law" demo to demonstrate this. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
efa375114e Enabled automatic addition of "return" statement for asymptotes, xrange.min, and xrange.max. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
ad4f4144e8 New feature: Added ability to set "color" and "weight" property of moving label text. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
bd605150ad New feature: Dynamically moving labels added. "Sample size and power" demo updated. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
1753f983ae Added ability to insert automatic "return" for dynamic element functions, and graph label dynamic element functions. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
72d500c168 Feature "Dynamic Elements in Labels" has been refactored to provide the user an easier interface for access. Demo "Sample Size and Power" has been updated. 2013-01-15 12:55:22 +02:00
Valera Rozuvan
20227d219e Added new feature: ability to add a label for an asymptote. Added new demo to GST: "Power and Alpha Demo". 2013-01-15 12:55:22 +02:00