Will Daly
3b37e0c19f
Fixed incorrect videoalpha template name
2013-06-20 07:40:12 -04:00
Will Daly
e76ef3aa31
Combined video and videoalpha acceptance tests.
...
Resolved conflict between two steps with the same name.
2013-06-20 07:40:12 -04:00
Alexander Kryklia
6f95d21ef8
Merge pull request #163 from edx/alex/fix_rake_doc
...
Alex/fix rake doc
2013-06-20 04:21:51 -07:00
Alexander Kryklia
d57fb77765
removes reference to removed module in docs
2013-06-20 13:18:04 +03:00
Alexander Kryklia
0af88b70a3
makes tests for sphynx doc generation not to run browser
2013-06-20 13:09:29 +03:00
Alexander Kryklia
26565f565e
adds changes to changelog
2013-06-20 13:07:41 +03:00
Alexander Kryklia
0eaa7cccb5
adds test for doc generation
2013-06-20 12:58:34 +03:00
Alexander Kryklia
1da7bcf8b7
Fixes bugs in documentation (rst format)
2013-06-20 12:58:33 +03:00
Alexander Kryklia
a3a2412c88
fixes pep8 and pylint errors
2013-06-20 12:58:33 +03:00
Alexander Kryklia
f152668e12
Fixes bugs in documentation and improves it.
2013-06-20 12:58:33 +03:00
Alexander Kryklia
37cad5dc0c
fixes launcy not working with Dir.chdir
2013-06-20 12:58:33 +03:00
Alexander Kryklia
e7f1baad62
Fixes broken imports in checker.py
2013-06-20 12:58:33 +03:00
Alexander Kryklia
5d0f905961
fixes pep8 and pylint errors and rename mitx->edx
2013-06-20 12:58:33 +03:00
Renzo Lucioni
dc5362e6c0
Merge pull request #215 from edx/renzo/segment-io-acceptance-fix
...
Fix for the failing acceptance tests
2013-06-19 14:02:09 -07:00
Renzo Lucioni
acd6620078
Re-enable the Jasmine test
2013-06-19 17:00:10 -04:00
Renzo Lucioni
0bf02cabff
Fix for the failing acceptance tests
2013-06-19 16:48:25 -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
David Ormsbee
dda21b3b17
Merge pull request #213 from edx/dave/fix_inflated_cert_grades
...
Initialize MakoMiddleware manually during certificate grading runs.
2013-06-19 12:13:16 -07:00
David Ormsbee
e1b071be30
Initialize MakoMiddleware manually during certificate grading runs.
...
Without this, problems fail to load because they can't find how to
render themselves, and the certificate generation grading run will
get an inaccurately low count of the possible points a user could
get (anything they didn't see will be omitted), inflating their
grade during certificate calculation and making it inconsistent
with their Progress page.
2013-06-19 14:39:02 -04:00
David Baumgold
b1daf0b3a6
Merge pull request #211 from edx/db/fix-assets-page-notifications
...
Clean up assets page notifications
2013-06-19 09:04:34 -07:00
David Baumgold
687779ba34
Clean up assets page notifications
...
Remove hack to work around multiple notification click issues -- and actually resolve
the issue so that the hack isn't necessary
2013-06-19 12:01:44 -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
Don Mitchell
86344417ff
Merge pull request #207 from edx/dhm/pep8
...
pep8 changes made during long refactoring
2013-06-19 08:00:04 -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
Will Daly
b82eedbefd
Merge pull request #184 from edx/will/fix-diff-cover-bug
...
Fix a bug in diff-cover
2013-06-18 14:32:46 -07: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
Brian Wilson
fd206a4128
Make sure InstructorTask is committed.
2013-06-18 15:07:15 -04:00
Brian Wilson
5389bba490
Add changelog entry.
2013-06-18 14:28:00 -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
Brian Wilson
2d1ebb7329
Test when querying for a non-existent task
2013-06-18 13:51:05 -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
Calen Pennington
c5dc404b01
Merge pull request #150 from edx/fix/cale/update-django-wiki
...
Cherry pick change to url matching regular expression. Fixes LMS-37
2013-06-18 10:29:33 -07:00
chrisndodge
c74220779e
Merge pull request #201 from edx/fix/cdodge/fix-busted-JS-pipeline
...
remove assets.js from the PIPELINE_JS since it seems to cause that file ...
2013-06-18 10:21:51 -07: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
Chris Dodge
54cb64a2c6
actually, seems like if we remove it from PIPELINE_JS then it doesn't work in production
2013-06-18 11:37:50 -04:00
lapentab
b93f00e02f
Rename system_test to get_test_system
2013-06-18 11:37:24 -04:00
David Baumgold
02626ffda7
Removed unused test code
2013-06-18 11:27:13 -04:00
Brian Wilson
77032067ac
Refactor test_views from test_api. Pull out pending_tasks.js.
2013-06-18 11:19:25 -04:00
Chris Dodge
c129fa4a77
remove assets.js from the PIPELINE_JS since it seems to cause that file to be loaded twice
2013-06-18 11:17:29 -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
eb1fe899e8
Fix progress reporting.
2013-06-18 11:17:17 -04:00
