Don Mitchell
b985a7f128
Remove unused template
2013-06-26 14:19:34 -04:00
Don Mitchell
1344b1e521
Make SessionKeyValueStore variable names clearer
2013-06-26 14:19:33 -04:00
Don Mitchell
65b3bcdba6
Clean up variable naming
2013-06-26 14:19:33 -04:00
Don Mitchell
ff6ba014ce
Remove noop if statement
2013-06-26 14:19:33 -04:00
Don Mitchell
391ed8c964
Add docstring to CourseDescriptor.__init__
2013-06-26 14:19:33 -04:00
Don Mitchell
d9575a0874
Remove traling commas to make json valid
2013-06-25 22:34:36 -04:00
Don Mitchell
b42fe277d4
Add serial commas to modulestore definitions
2013-06-25 22:34:36 -04:00
Don Mitchell
8b23eeca7e
Minor pylint/whitespace changes
2013-06-25 22:34:29 -04:00
Jay Zoldak
fe82e865aa
Merge pull request #267 from edx/zoldak/fix-acceptance-xcontent
...
Specify a different xcontent mongo db for the acceptance tests
2013-06-25 14:04:30 -07:00
Jay Zoldak
6c66736e3c
Specify a different xcontent mongo db for the acceptance tests
2013-06-25 16:56:36 -04:00
Christina Roberts
9dad14c48e
Merge pull request #265 from edx/christina/activation-email
...
Don't mention edge in the subject line; use same message for edx and edg...
2013-06-25 13:21:51 -07:00
Carlos Andrés Rocha
94e1746500
Merge pull request #258 from edx/rocha/pre-external-grader-cleanup
...
Cleanup before adding external grader
2013-06-25 13:17:11 -07:00
Will Daly
68c0f04462
Merge pull request #264 from edx/will/update-diff-cover-v0.1.3
...
Updated diff-cover to version 0.1.3 to fix a bug
2013-06-25 12:45:16 -07:00
cahrens
401dc82c46
Don't mention edge in the subject line; use same message for edx and edge.
2013-06-25 15:35:47 -04:00
Jonah Stanley
b14553d867
Merge pull request #220 from edx/jonahstanley/make-units-parallel
...
Jonahstanley/make units parallel
2013-06-25 11:44:01 -07:00
Carlos Andrés Rocha
e4ee1c6c9b
Rename arguments of modx_dispatch and handle_ajax related functions
...
Refactor a bit modx_dispatch
2013-06-25 13:38:57 -04:00
Carlos Andrés Rocha
2f02496c8f
Reorder imports on module_render
2013-06-25 13:31:53 -04:00
brianhw
397583e1ab
Merge pull request #262 from edx/fix/brian/changelog
...
Update CHANGELOG for per-student problem rescoring.
2013-06-25 10:24:42 -07:00
Will Daly
c0805c334d
Updated diff-cover to version 0.1.3 to fix a bug
2013-06-25 13:23:13 -04:00
JonahStanley
8a9125f121
Test Mongo database is now unique and destroyed in teardown
2013-06-25 11:33:46 -04:00
Brian Wilson
a9a7f97d9b
Update CHANGELOG for per-student problem rescoring.
2013-06-25 11:32:45 -04:00
David Baumgold
dddfdc735d
Merge pull request #261 from edx/db/notification-event-prevent-default
...
Call event.preventDefault() on notification action buttons
2013-06-25 08:32:21 -07:00
David Baumgold
ddc986f775
Call event.preventDefault() on notification action buttons
...
But allow you to specify that the event should not be prevented
2013-06-25 11:29:42 -04:00
Peter Baratta
4c269c1079
Merge pull request #203 from edx/pbaratta/fix/capa-unicode
...
Fix unicode for errors on capa problems
2013-06-25 06:46:30 -07:00
Valera Rozuvan
08b994b87e
Merge pull request #247 from edx/alex/fix_choiceresponse
...
removes choiceresponse wiping after clicking Show Answer
2013-06-25 05:55:27 -07:00
brianhw
3f2d33c580
Merge pull request #254 from edx/fix/brian/rescore-cleanup
...
Enable per-student background tasks.
2013-06-24 15:49:37 -07:00
Brian Wilson
332a440539
Enable per-student background tasks.
2013-06-24 18:47:50 -04:00
Peter Fogg
a28451ab53
Merge pull request #255 from edx/peter-fogg/fix-advanced-settings-lettuce-test
...
Fix acceptance tests expecting outdated CSS.
2013-06-24 14:17:37 -07:00
Peter Fogg
d5d495c24d
Fix acceptance tests expecting outdated CSS.
2013-06-24 16:57:14 -04:00
Peter Baratta
3a8f591fe5
Add tests for the diff coverage; fix one hidden unicode bug
2013-06-24 16:49:33 -04:00
Peter Fogg
ad09236c82
Merge pull request #242 from edx/peter-fogg/advanced-backbone-notifications
...
Refactor Advanced Settings page to use Backbone notifications.
2013-06-24 12:37:26 -07:00
David Baumgold
4d2183d764
Merge pull request #253 from edx/db/notifications-secondary-single
...
Backbone notifications secondary actions
2013-06-24 11:48:55 -07:00
Jason Bau
f1825eff81
Update CHANGELOG.rst
2013-06-24 12:19:34 -06:00
Peter Fogg
fb573a1db6
Hide "success" alert as soon as we start editing another field.
2013-06-24 13:59:14 -04:00
Jason Bau
ab7b991e78
Update CHANGELOG.rst
2013-06-24 11:53:59 -06:00
Jason Bau
fde8e5b0a4
Merge pull request #246 from edx/fix/jbau/multiple-choice-label-width
...
Change width of labels for multiple-choice capa problems to width of text, not 100%
2013-06-24 10:52:06 -07:00
David Baumgold
72ffe2d8f2
Backbone notifications secondary actions
...
Handle secondary actions on notifications either specified as a single object,
or as a list of objects. Under the hood, the initialize method converts a single
object to a list containing a single object.
2013-06-24 13:44:50 -04:00
Ned Batchelder
bec6330c34
Merge pull request #251 from edx/ned/pylint-fixes
...
Ned/pylint fixes
2013-06-24 10:44:35 -07:00
Peter Fogg
3e376bd780
Prevent "saved" and "error" views from showing at the same time.
...
Previously the "saved" view was never hidden, even after more data was
edited. So if one field was saved successfully and then another was
not, we would find ourselves in the unfortunate situation of seeing
both views at once, leading to much confusion.
2013-06-24 11:06:53 -04:00
Peter Fogg
72e08456a8
Refactor Advanced Settings page to use Backbone notifications.
2013-06-24 09:48:37 -04:00
Jay Zoldak
2fadd655f4
Merge pull request #240 from edx/zoldak/update-discussion-md
...
Update discussion documentation
2013-06-24 06:18:45 -07:00
Jay Zoldak
f61c529cbb
Merge pull request #231 from edx/zoldak/fix-rakefile-typo
...
Fix typo in output message of rakefile
2013-06-24 06:18:08 -07:00
Christina Roberts
503186196a
Merge pull request #248 from edx/christina/remove-w
...
Forgot to remove registration of onKeyUp function.
2013-06-24 06:12:24 -07:00
cahrens
ad6e745762
Forgot to remove registration of onKeyUp function.
2013-06-24 09:09:05 -04:00
Christina Roberts
08aaa7850a
Merge pull request #243 from edx/christina/remove-w
...
Remove keybinding for work in progress (WIP).
2013-06-24 05:55:44 -07:00
Alexander Kryklia
85b4a4ccab
removes choiceresponse wiping after clicking Show Answer
2013-06-22 16:13:40 +03:00
Jason Bau
2eefa494b1
Width of labels for multiple-choice capa problems = width of text
...
Stanford got some feedback from our students/faculty that students
were making accidental clicks on radio-button capa questions.
They would click way to the right of the label text, but it would
still select the corresponding input, which caused some students
to make unintentional changes to their answers. This was because
labels for these inputs were display:block and width:100%
Changing these labels to float:left clear:both should fix it.
2013-06-21 23:46:56 -07:00
mlsteele
88060c0590
Merge pull request #144 from edx/fix/msteele/instructor_tests
...
fix gradebook tests
2013-06-21 19:16:09 -07:00
Juho Kim
ae960ccf5a
analytics service update
2013-06-21 17:40:54 -04:00
Juho Kim
513c01b166
bringing up to master
2013-06-21 17:39:38 -04:00
