Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,694 Commits 1 Branch 0 Tags
f11900a85cacd2d181698cb16ec526528af9942e
Commit Graph

14694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
f11900a85c Merge branch 'cale/singleton-watchers' into cale/stabilize-dev-env 
Conflicts:
	CHANGELOG.rst
 2013-06-20 09:23:18 -04:00
Calen Pennington
64912a7741 Make assets watchers run as singletons 
Previously, multiple copies of the watchers started from the different
shells would run simultaneously, which left the possiblity of zombie
watchers, increased resource consumption, and incorrect results. This
fixes that problem by only starting a watcher if that same command isn't
already in the process list.

Fixes LMS-499
 2013-06-20 09:21:49 -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
Calen Pennington
f4200127bc Make coffee watch message more informative 
When running under watchmedo, coffee doesn't display any useful
information when it recompiles a changed file, so we make watchmedo echo
that information instead.
 2013-06-20 09:18:58 -04:00
Calen Pennington
d99ad53ae9 Add system and env arguments to asset tasks 
The preprocess task requires system and env arguments in order to
correctly load up the django environment to preprocess sass files to
inject themes.

In order for that task to recieve the arguments, all tasks that depend
on it also have to accept that same set of arguments.

This will all go away once the next evolution of themes arrives, which
will remove the preprocessing needed to inject theme names.
 2013-06-20 09:17:51 -04:00
Calen Pennington
d9268acd6b Provide instructions of ruby imports fail in rake 
`rake install_prereqs` requires a minimal level of ruby and rake already
installed. If it doesn't exist, then print out a helpful message
indicating next steps.
 2013-06-20 09:17:36 -04:00
Calen Pennington
83af3e594f Use built-in rakelibdir feature 
Rake by default imports all .rake files in the rakelib dir, so we can
use that rather than doing our own import loop.
 2013-06-20 09:11:45 -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
a76b91b55c Merge pull request #42 from edx/alex/fix_is_completed 
Alex/fix is completed
 2013-06-20 05:37:44 -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
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
cahrens
6643994348 Add an optional success lambda to css_click. 2013-06-19 13:51:40 -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
cahrens
9878c75b7a Sometimes the first click doesn't actually work, so call click up to 5 times. 
This seems to fix the sporadic failure (at least on my machine).
 2013-06-18 15:22:25 -04: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