Ned Batchelder
3eec09b87a
Merge pull request #216 from edx/ned/remove-unused-imports
...
Ned/remove unused imports
2013-06-20 14:15:31 -07:00
Jonah Stanley
b7f745c737
Merge pull request #228 from edx/jonahstanley/fix-flakey-tests
...
Jonahstanley/fix flakey tests
2013-06-20 13:14:21 -07:00
Peter Fogg
0ef4390aff
Merge pull request #132 from edx/peter-fogg/remove-video-xml
...
Peter fogg/remove video xml
2013-06-20 12:40:13 -07:00
JonahStanley
eec095a195
Changed naming of attempts to max_attempts and changed css_selector
2013-06-20 15:38:56 -04:00
Brian Talbot
b7b2f91e79
studio - revising the visual design of UI well pattern
2013-06-20 12:30:25 -04:00
Peter Fogg
1d8d507f49
Merge in master (again).
2013-06-20 12:21:16 -04:00
Christina Roberts
1a5b58acd6
Merge pull request #210 from edx/christina/course-settings-drupal
...
On marketing site, disable course settings options that do not work.
2013-06-20 09:15:18 -07:00
Peter Fogg
ea56a0cd4a
Make sure we can handle empty youtube attributes.
2013-06-20 11:58:01 -04:00
JonahStanley
e1d4c69365
Merge branch 'master' into jonahstanley/fix-flakey-tests
...
Conflicts:
common/djangoapps/terrain/ui_helpers.py
2013-06-20 11:17:15 -04:00
JonahStanley
a8789dced9
Fixed flakey check box by making a css_check function that behaves like css_click
...
As a result, changed inputfield to return the css, and all of the element.fill() to css_fill
2013-06-20 11:14:17 -04:00
cahrens
d601cee8e5
Merge branch 'master' into christina/course-settings-drupal
2013-06-20 11:00:12 -04:00
cahrens
9e69586bb3
pep8 fixes.
2013-06-20 10:31:44 -04:00
Peter Fogg
9c7be8b1dc
Fix merge conflict in CHANGELOG.rst.
2013-06-20 09:58:22 -04:00
Calen Pennington
cd57e281f5
Only write to xmodule asset files that have changed
...
Use md5 checksumming to verify that we only write out xmodule asset
files whose contents differ from what we are about to write. This
minimizes thrashing of the other watchers.
Fixes LMS-452
2013-06-20 09:20:21 -04:00
Calen Pennington
eb3e94660b
Don't delete generated files from xmodule-assets
...
xmodule-assets creates coffeescript files in the output directories. On
its next run, it used to delete the javascript files compiled from those
coffee files. Now it doesn't which should make coffee have to do less
work.
Fixes LMS-451
2013-06-20 09:18:58 -04:00
Christina Roberts
6fe56ac9f7
Merge pull request #205 from edx/christina/advanced-settings-test
...
Sometimes the first click doesn't actually work, so call click up to 5 t...
2013-06-20 05:48:13 -07:00
Alexander Kryklia
23d4a2b3db
renames is_completed to is_submitted, fixes docstrings and rst docs
2013-06-20 15:09:05 +03:00
Alexander Kryklia
a7cf9d186d
adds doc about correct
2013-06-20 14:56:32 +03:00
Alexander Kryklia
6f964acec5
added docs and added is_correct to conditional
2013-06-20 14:56:32 +03:00
Alexander Kryklia
e7f1baad62
Fixes broken imports in checker.py
2013-06-20 12:58:33 +03:00
Brian Talbot
d2f0d85085
studio - adds in basic rules for notices UI
2013-06-19 18:09:09 -04:00
Ned Batchelder
df6d3f9b2f
Fix strings that should be raw.
2013-06-19 16:56:34 -04:00
Ned Batchelder
181b1e979b
Remove unused imports from common, as reported by pylint.
2013-06-19 16:56:34 -04:00
Calen Pennington
b021d9cc12
Merge pull request #209 from edx/cale/pep8-fixes
...
Cleanup pep8 violations in test_correctmap.py
2013-06-19 13:36:18 -07:00
cahrens
6643994348
Add an optional success lambda to css_click.
2013-06-19 13:51:40 -04:00
lapentab
24bee17da5
Merge pull request #156 from edx/blapenta/fix-test-coverage
...
Fix test_system looking like a test to nosetest. Fix class inheritance causing double counting of coverage.
2013-06-19 08:50:54 -07:00
Renzo Lucioni
7c048fb243
Merge pull request #181 from edx/renzo/segment-io-sequentials
...
Instrument sequentials with segment-io
2013-06-19 08:07:37 -07:00
David Baumgold
cb3d46d815
Merge pull request #199 from edx/db/notifications-refactor
...
Refactor Backbone notifications
2013-06-19 08:04:18 -07:00
Calen Pennington
4cc30aab00
Cleanup pep8 violations in test_correctmap.py
2013-06-19 10:04:32 -04:00
lapentab
dece800888
Renames self.get_test_system to test_system, removes duplicate function.
2013-06-19 09:57:16 -04:00
Renzo Lucioni
841ff4765f
Abridge tests in light of learning how Segment.io works
2013-06-18 17:58:10 -04:00
Don Mitchell
1ff022e181
Incidental pep8 changes
2013-06-18 17:25:06 -04:00
brianhw
54a3bc620b
Merge pull request #40 from edx/feature/brian/regrade-celery-2
...
Feature/brian/regrade celery 2
2013-06-18 12:36:36 -07:00
Peter Fogg
7633968701
Merge branch 'master' into peter-fogg/remove-video-xml
2013-06-18 15:07:58 -04:00
Brian Wilson
fd206a4128
Make sure InstructorTask is committed.
2013-06-18 15:07:15 -04:00
Renzo Lucioni
305e9315ef
Write Jasmine tests to prove Segment.io works in Logger
2013-06-18 14:27:43 -04:00
lapentab
f0fb620be6
Fixes missing refactoring
2013-06-18 14:12:23 -04:00
lapentab
b9ca9a84d7
Merge branch 'master' into blapenta/fix-test-coverage
...
Conflicts:
AUTHORS
common/lib/xmodule/xmodule/tests/test_annotatable_module.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_conditional.py
common/lib/xmodule/xmodule/tests/test_html_module.py
common/lib/xmodule/xmodule/tests/test_progress.py
common/lib/xmodule/xmodule/tests/test_xml_module.py
lms/djangoapps/courseware/tests/__init__.py
2013-06-18 13:41:53 -04:00
Don Mitchell
cf2675d701
Update fields.py
...
When changing variable names for code review critique, accidental cut/paste prevented intended behavior.
2013-06-18 12:32:26 -04:00
Don Mitchell
b151d6c155
Merge pull request #183 from edx/dhm/timeconv/bug0
...
Fix a few remaining tz naive dates
2013-06-18 09:09:24 -07:00
Don Mitchell
a1f181e7bb
Make the variable and method names clearer
2013-06-18 11:45:16 -04:00
lapentab
b93f00e02f
Rename system_test to get_test_system
2013-06-18 11:37:24 -04:00
Brian Wilson
c2aadbfb18
Fix issue with unicode in errors.
2013-06-18 11:17:17 -04:00
Brian Wilson
a8c3e91051
Handle failure task_output that won't fit in the model column.
2013-06-18 11:17:17 -04:00
Brian Wilson
d2b3977f57
Add dogstat logging to background tasks.
2013-06-18 11:13:55 -04:00
Brian Wilson
c676cfd64a
Rename fields in CourseTaskLog, including a task_key column for indexing. Use 'rescore' instead of 'regrade'. Clean up task submission.
2013-06-18 11:13:19 -04:00
Brian Wilson
c1fff1568e
reenable psychometrics for regrading
2013-06-18 11:13:18 -04:00
Brian Wilson
79a0f6a16b
remove call to psychometrics when regrading
2013-06-18 11:13:18 -04:00
Brian Wilson
8660c9a7af
Check descriptor to identify problems that don't support regrading.
2013-06-18 11:09:32 -04:00
Brian Wilson
73b25e1f32
Add check for problems that (do not) support regrading.
2013-06-18 11:09:32 -04:00
