Commits · 51fcb5247df818173e3baa09a83f354cfa709d29 · edx / edx-platform

03 Sep, 2013 16 commits
- Merge pull request #855 from edx/sarina/bulkemail-violations · 51fcb524
```
Cleanup bulk email app
```
  Sarina Canelake committed Sep 03, 2013
  51fcb524 Browse Files
- Merge pull request #853 from edx/fix/adam/pylint-pep8 · ef042c39
```
fix pep8 and pylint errors
```
  Adam committed Sep 03, 2013
  ef042c39 Browse Files
- Merge pull request #856 from edx/adam/merge-conflicts · 3cc793b0
```
Adam/merge conflicts
```
  Adam committed Sep 03, 2013
  3cc793b0 Browse Files
- Cleanup bulk email app · bfebe684
  Sarina Canelake committed Sep 03, 2013
  
  bfebe684 Browse Files
- resolve merge conflict with hotfix branch · 67890b3c
  Adam Palay committed Sep 03, 2013
  
  67890b3c Browse Files
- Merge pull request #851 from edx/hotfix/release-multiple-video-bug · 6787fbbf
```
Hotfix/release multiple video bug
```
  Adam committed Sep 03, 2013
  6787fbbf Browse Files
- Merge pull request #837 from edx/will/faster-acceptance-test-startup · e284ac68
```
Skip migrations if running acceptance in fasttest mode
```
  Will Daly committed Sep 03, 2013
  e284ac68 Browse Files
- fix pep8 and pylint errors · 300f7f13
```
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	lms/envs/common.py
```
  Adam Palay committed Sep 03, 2013
  300f7f13 Browse Files
- Merge pull request #848 from edx/fix/adam/add-edge-reqs · c7a537e4
```
Fix/adam/add edge reqs
```
  Adam committed Sep 03, 2013
  c7a537e4 Browse Files
- Merge pull request #849 from edx/will/acceptance-test-static-files · a0817466
```
Fix for acceptance test static file issue
```
  Will Daly committed Sep 03, 2013
  a0817466 Browse Files
- Fix multiple video bug · a09e6104
  Anton Stupak committed Sep 03, 2013
  
  a09e6104 Browse Files
- Fix for acceptance test static file issue · e94515df
  Will Daly committed Sep 03, 2013
  
  e94515df Browse Files
- add pyparsing to edx requirements · a7159d8a
  Adam Palay committed Sep 03, 2013
  
  a7159d8a Browse Files
- add pyparsing explicitly to sandbox requirements · 1ab59a2c
  Adam Palay committed Sep 03, 2013
  
  1ab59a2c Browse Files
- Merge pull request #847 from edx/will/fix-diff-cover · 39bd9870
```
Incremented diff cover version to fix 100% coverage bug.
```
  Will Daly committed Sep 03, 2013
  39bd9870 Browse Files
- Incremented diff cover version to fix 100% coverage bug. · 93656a25
  Will Daly committed Sep 03, 2013
  
  93656a25 Browse Files
02 Sep, 2013 2 commits
- Merge pull request #836 from edx/will/fix-video-caption-tests · 24d3d949
```
Updated acceptance tests to match new behavior in video captions.
```
  Will Daly committed Sep 02, 2013
  24d3d949 Browse Files
- Skip acceptance test DB migrations if the DB already exists and running fasttest_acceptance · 1f2f0bf3
  Will Daly committed Sep 02, 2013
  
  1f2f0bf3 Browse Files
30 Aug, 2013 20 commits
- Merge pull request #790 from edx/unanswered-on-input · 6defd7ba
```
Unanswered on input
```
  Sarina Canelake committed Aug 30, 2013
  6defd7ba Browse Files
- Acceptance tests for visual correctness reset feature · fe47dcb1
  Peter Baratta committed Aug 30, 2013
  
  fe47dcb1 Browse Files
- Merge pull request #841 from edx/jbau/bulk-email-faster-tests · b7e8af65
```
Jbau/bulk email faster tests
```
  Jason Bau committed Aug 30, 2013
  b7e8af65 Browse Files
- Merge pull request #843 from edx/adam/calc-refactor · 8d7d8194
```
Adam/calc refactor
```
  Adam committed Aug 30, 2013
  8d7d8194 Browse Files
- bump version number on calc · 5b0194d9
  Adam Palay committed Aug 30, 2013
  
  5b0194d9 Browse Files
- change calcfunctions -> functions · 589dcfcc
  Adam Palay committed Aug 30, 2013
  
  589dcfcc Browse Files
- specify preview import statements to reflect new package structure · 2284f56e
  Adam Palay committed Aug 30, 2013
  
  2284f56e Browse Files
- restructure calc · ac906795
  Adam Palay committed Aug 30, 2013
  
  ac906795 Browse Files
- remove vestigal references to fake_smtp_server · 4f9e5109
  Jason Bau committed Aug 30, 2013
  
  4f9e5109 Browse Files
- using mocks to make test_err_handling.py faster · ca33a1dc
  Jason Bau committed Aug 30, 2013
  
  ca33a1dc Browse Files
- Updated acceptance tests to match new behavior in video captions. · 2ed66ce7
  Will Daly committed Aug 30, 2013
  
  2ed66ce7 Browse Files
- Merge pull request #811 from cpennington/initialize-mitxmako-at-startup · ea36b834
```
Move mitxmako initialization to a startup module
```
  Calen Pennington committed Aug 30, 2013
  ea36b834 Browse Files
- Merge pull request #794 from cpennington/upgrade-newrelic · b0cdbbc1
```
Upgrade newrelic agent to the latest version
```
  Calen Pennington committed Aug 30, 2013
  b0cdbbc1 Browse Files
- Merge pull request #838 from edx/fix/kill-rake-processes · f9ccc818
```
Kill processes after running rake
```
  Renzo Lucioni committed Aug 30, 2013
  f9ccc818 Browse Files
- Merge pull request #831 from edx/will/statsd-bulk-email · f15f4fde
```
Instrument course email for DataDog
```
  Will Daly committed Aug 30, 2013
  f15f4fde Browse Files
- Kill processes after running rake · ba2cc4ca
  Renzo Lucioni committed Aug 30, 2013
  
  ba2cc4ca Browse Files
- Merge pull request #834 from edx/dcadams/fix_email_registration_template · 1d1fc0df
```
Small change to email registration template
```
  dcadams committed Aug 30, 2013
  1d1fc0df Browse Files
- Reset 'correctness' visual indicator of a problem on new input · 48cb05c0
```
Affects:
Choicegroups, option inputs, textline, and formula equation inputs
```
  Peter Baratta committed Aug 30, 2013
  48cb05c0 Browse Files
- Instrumented course email for DataDog · 1400271b
  Will Daly committed Aug 30, 2013
  
  1400271b Browse Files
- Merge pull request #827 from edx/christina/course-info-links3 · d893e6d4
```
Rewriting of links for Course Updates and Course Handouts.
```
  Christina Roberts committed Aug 30, 2013
  d893e6d4 Browse Files
29 Aug, 2013 2 commits

Slightly change email registration template · c8b2863a

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.

committed Aug 29, 2013

c8b2863a Browse Files

Merge pull request #824 from edx/fix/vik/oe-progress · df03b091
```
Properly display student progress
```
Vik Paruchuri committed Aug 29, 2013
df03b091 Browse Files