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
Brian Talbot
1f60d018a6
Verified: resolves requirements page layout regression
2013-08-30 16:16:27 -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
Brian Talbot
822caca3f7
Verified: revises styling/presentation of alerts/errors for intro state
2013-08-30 16:03:49 -04: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
Diana Huang
c9593f2094
Allow for the creation of a specialized receipt when
...
there is only one item in the order
2013-08-30 15:35:05 -04:00
Brian Talbot
248b5a9411
Verified: visually cleans up - UI spacing, error styling, registering for badge
2013-08-30 14:27:44 -04:00
Brian Talbot
e9a0755e5d
revises and transfers verification-only typography Sass extends
2013-08-30 14:27:44 -04:00
Diana Huang
cd479caa78
Make sure users are logged in on the verified cert path
2013-08-30 13:58:36 -04:00
Diana Huang
b5feb0748f
Add in a hook to indicate whether or not the logged in user is active
2013-08-30 13:44:49 -04: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
Diana Huang
c96a29d77a
Move course_id into the urls.
2013-08-30 12:56:47 -04: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
David Ormsbee
94def0aab5
Base assets for flash camera capture
2013-08-30 11:27:51 -04:00
Diana Huang
c21cde37a0
Fix some urls on the choose mode page
2013-08-30 10:38:48 -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
Julian Arni
b797118811
review fixes
2013-08-29 17:22:07 -04:00
Diana Huang
fc52fab231
Go skip verification step if student is already verified.
2013-08-29 17:07:53 -04:00
Brian Talbot
992b36e771
Verified: adds initial registration choice error styling
2013-08-29 16:57:54 -04:00
Brian Talbot
db8a810009
Verified: cleans up extraneous reg selection markup and expandable UI
2013-08-29 16:45:23 -04:00
Vik Paruchuri
a06226aad6
Address review comments
2013-08-29 16:34:17 -04:00
David Ormsbee
8c107569e9
Fix cart submission
2013-08-29 16:30:53 -04:00
David Ormsbee
70a594597c
re-enable link to audit
2013-08-29 15:32:53 -04:00
David Ormsbee
d2292738d6
Update contribution partial template with new style changes.
2013-08-29 14:47:03 -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
David Ormsbee
5202bdf85a
Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3
...
Conflicts:
common/templates/course_modes/choose.html
lms/templates/verify_student/photo_verification.html
2013-08-29 14:34:52 -04:00
Brian Talbot
81a56a35ab
Verified: revising template UI, styling, and infrastructure
2013-08-29 14:07:51 -04:00
Brian Talbot
638fb79a16
Verification: adding in more Sass variable/mixin/extend scaffolding
2013-08-29 13:44:48 -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
Jason Bau
c160a189ad
Bulk email - final tweaks and cleanup
2013-08-29 12:40:34 -04:00
Brian Wilson
8f93051d30
Add editable templates for bulk email
...
Adds the edX Marketing-approved template as html default.
2013-08-29 12:40:34 -04:00
Jason Bau
d341d6d26d
Change optout to use user.id instead of email.
...
Includes Data + Schema migrations for optout email -> user.id change.
Note that migrations should be reversible.
2013-08-29 12:40:33 -04:00
Sarina Canelake
52d9320e62
Hide "Email Settings" from student dash if bulk email not enabled
...
Some minor pep8 cleanup
2013-08-29 12:40:33 -04:00
Sarina Canelake
e6bde93837
Change bulk email model field names and add migrations
2013-08-29 12:40:33 -04:00
Sarina Canelake
b3bc4023b0
Refactor html->plaintext conversion (for bulk email) into separate library
2013-08-29 12:40:33 -04:00
Sarina Canelake
f98d6764b2
Disable bulk email for XML-backed courses
2013-08-29 12:40:32 -04:00
Sarina Canelake
65f7b098dd
Bulk Email: Add design styling
...
Switch to using decorators; refactor and cleanup tests.
2013-08-29 12:40:32 -04:00
