ichuang
00710f75d2
add CAS authentication via django_cas and mods to external_auth
2013-09-04 10:56:45 -04:00
Adam
0916957812
Merge pull request #861 from edx/fix/adam/add-edge-reqs
...
add requests and nltk to sandbox reqs
2013-09-04 07:14:59 -07:00
Adam Palay
6078f4c67e
add nltk to sandbox reqs
2013-09-04 10:12:44 -04:00
Will Daly
75b588e018
Merge pull request #858 from edx/will/harvest-args-fix
...
Pass in harvest args to fasttest_acceptance, not the args array
2013-09-04 05:29:46 -07:00
Will Daly
9b1a5b49a7
Pass in harvest args to fasttest_acceptance, not the args array
2013-09-03 21:17:15 -04:00
Sarina Canelake
51fcb5247d
Merge pull request #855 from edx/sarina/bulkemail-violations
...
Cleanup bulk email app
2013-09-03 14:25:36 -07:00
Adam
ef042c39aa
Merge pull request #853 from edx/fix/adam/pylint-pep8
...
fix pep8 and pylint errors
2013-09-03 14:22:11 -07:00
Adam
3cc793b01b
Merge pull request #856 from edx/adam/merge-conflicts
...
Adam/merge conflicts
2013-09-03 14:20:15 -07:00
Sarina Canelake
bfebe684b3
Cleanup bulk email app
2013-09-03 16:11:34 -04:00
Adam Palay
67890b3c66
resolve merge conflict with hotfix branch
2013-09-03 16:00:24 -04:00
Adam
6787fbbf04
Merge pull request #851 from edx/hotfix/release-multiple-video-bug
...
Hotfix/release multiple video bug
2013-09-03 12:23:00 -07:00
Will Daly
e284ac682a
Merge pull request #837 from edx/will/faster-acceptance-test-startup
...
Skip migrations if running acceptance in fasttest mode
2013-09-03 11:58:43 -07:00
Adam Palay
300f7f13a6
fix pep8 and pylint errors
...
Conflicts:
cms/djangoapps/contentstore/views/course.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
lms/envs/common.py
2013-09-03 14:55:11 -04:00
Adam
c7a537e412
Merge pull request #848 from edx/fix/adam/add-edge-reqs
...
Fix/adam/add edge reqs
2013-09-03 09:53:21 -07:00
Will Daly
a081746661
Merge pull request #849 from edx/will/acceptance-test-static-files
...
Fix for acceptance test static file issue
2013-09-03 09:50:59 -07:00
Anton Stupak
a09e610403
Fix multiple video bug
2013-09-03 18:49:46 +03:00
Will Daly
e94515df80
Fix for acceptance test static file issue
2013-09-03 11:36:23 -04:00
Adam Palay
a7159d8afd
add pyparsing to edx requirements
2013-09-03 10:49:04 -04:00
Adam Palay
1ab59a2c3d
add pyparsing explicitly to sandbox requirements
2013-09-03 10:00:46 -04:00
Will Daly
39bd98703c
Merge pull request #847 from edx/will/fix-diff-cover
...
Incremented diff cover version to fix 100% coverage bug.
2013-09-03 06:06:11 -07:00
Will Daly
93656a253d
Incremented diff cover version to fix 100% coverage bug.
2013-09-03 07:51:49 -04:00
Will Daly
24d3d9492a
Merge pull request #836 from edx/will/fix-video-caption-tests
...
Updated acceptance tests to match new behavior in video captions.
2013-09-02 10:31:45 -07:00
Will Daly
1f2f0bf348
Skip acceptance test DB migrations if the DB already exists and running fasttest_acceptance
2013-09-02 09:58:08 -04:00
Sarina Canelake
6defd7baf1
Merge pull request #790 from edx/unanswered-on-input
...
Unanswered on input
2013-08-30 14:25:21 -07:00
Peter Baratta
fe47dcb122
Acceptance tests for visual correctness reset feature
2013-08-30 17:24:33 -04:00
Jason Bau
b7e8af65be
Merge pull request #841 from edx/jbau/bulk-email-faster-tests
...
Jbau/bulk email faster tests
2013-08-30 14:12:12 -07:00
Adam
8d7d819414
Merge pull request #843 from edx/adam/calc-refactor
...
Adam/calc refactor
2013-08-30 14:04:22 -07:00
Adam Palay
5b0194d9b4
bump version number on calc
2013-08-30 16:59:46 -04:00
Adam Palay
589dcfcc35
change calcfunctions -> functions
2013-08-30 16:57:44 -04:00
Adam Palay
2284f56e20
specify preview import statements to reflect new package structure
2013-08-30 16:57:27 -04:00
Adam Palay
ac90679544
restructure calc
2013-08-30 16:57:10 -04:00
Jason Bau
4f9e5109f0
remove vestigal references to fake_smtp_server
2013-08-30 13:46:04 -07:00
Jason Bau
ca33a1dcf5
using mocks to make test_err_handling.py faster
2013-08-30 13:43:42 -07:00
Will Daly
2ed66ce7a5
Updated acceptance tests to match new behavior in video captions.
2013-08-30 16:17:01 -04:00
Calen Pennington
ea36b834c7
Merge pull request #811 from cpennington/initialize-mitxmako-at-startup
...
Move mitxmako initialization to a startup module
2013-08-30 13:10:09 -07:00
Calen Pennington
b0cdbbc1fe
Merge pull request #794 from cpennington/upgrade-newrelic
...
Upgrade newrelic agent to the latest version
2013-08-30 12:56:11 -07:00
Renzo Lucioni
f9ccc81818
Merge pull request #838 from edx/fix/kill-rake-processes
...
Kill processes after running rake
2013-08-30 10:17:48 -07:00
Will Daly
f15f4fde27
Merge pull request #831 from edx/will/statsd-bulk-email
...
Instrument course email for DataDog
2013-08-30 10:15:21 -07:00
Renzo Lucioni
ba2cc4ca2f
Kill processes after running rake
2013-08-30 12:42:02 -04:00
dcadams
1d1fc0df98
Merge pull request #834 from edx/dcadams/fix_email_registration_template
...
Small change to email registration template
2013-08-30 09:30:39 -07:00
Peter Baratta
48cb05c037
Reset 'correctness' visual indicator of a problem on new input
...
Affects:
Choicegroups, option inputs, textline, and formula equation inputs
2013-08-30 12:03:41 -04:00
Will Daly
1400271b0b
Instrumented course email for DataDog
2013-08-30 11:56:15 -04:00
Christina Roberts
d893e6d440
Merge pull request #827 from edx/christina/course-info-links3
...
Rewriting of links for Course Updates and Course Handouts.
2013-08-30 07:32:01 -07:00
David Adams
c8b2863a46
Slightly change email registration template
...
Added some text to guide the student to register with a particular email address.
This is the one that was entered into the enrollment/invitation form by the instructor.
Modified the template and associated test.
2013-08-29 15:27:30 -07:00
Vik Paruchuri
df03b09136
Merge pull request #824 from edx/fix/vik/oe-progress
...
Properly display student progress
2013-08-29 14:39:11 -07:00
Vik Paruchuri
9b57ef0b54
Pep8 fixes
2013-08-29 17:28:14 -04:00
Vik Paruchuri
a06226aad6
Address review comments
2013-08-29 16:34:17 -04:00
Will Daly
fc5a24dfc0
Merge pull request #801 from edx/will/remove-test-network-calls
...
Remove network calls in test suite
2013-08-29 11:42:19 -07:00
cahrens
a061c7ece7
Rewriting of links for Course Updates and Course Handouts.
...
STUD-669.
2013-08-29 14:35:16 -04:00
Sarina Canelake
0142fafe7e
Merge pull request #555 from edx/feature/kluo/bulk-email-squashed
...
Course email for instructors
2013-08-29 10:44:09 -07:00
