chrisndodge
0ccb017408
Merge pull request #10713 from edx/cdodge/fix-zero-seat-invoices
...
Cdodge/fix zero seat invoices
2015-11-24 10:28:42 -05:00
Sarina Canelake
4f4a0895ea
Merge pull request #6279 from edx/ned/add-officemix-xblock
...
Add the Microsoft Office Mix XBlock
2015-11-24 10:01:28 -05:00
Chris Dodge
e534e5d588
fix broken report when there is a zero seat invoice
...
fix quality error
2015-11-24 09:42:54 -05:00
Ahsan Ulhaq
d729e97f50
Merge pull request #10658 from edx/ahsan/ECOM-2897-Update-help-text-for-Name-field-in-edx-registration
...
Update help text for Name field in edx registration
2015-11-24 19:41:00 +05:00
David Baumgold
e48e250b1b
Merge pull request #10712 from edx/github-capital-h
...
GitHub has a capital H
2015-11-24 09:26:55 -05:00
Ned Batchelder
e16fad3540
Add the Microsoft Office Mix XBlock
2015-11-24 09:04:12 -05:00
Sarina Canelake
bb625770b4
Merge pull request #10716 from edx/ned/update-i18n-tools
...
Use 0.1.4 of i18n-tools so Django 1.8 will work. PLAT-919
2015-11-24 08:40:02 -05:00
chrisndodge
236d251e6e
Merge pull request #10691 from edx/cdodge/add-attempt-code-to-report
...
Add in the attempt_code field to the proctoring report
2015-11-24 07:18:11 -05:00
Ahsan Ulhaq
73eb9bd9df
Update help text for Name field in edx registration
...
ECOM-2897
2015-11-24 12:47:42 +05:00
Ned Batchelder
3ae92b9f02
Use 0.1.4 of i18n-tools so Django 1.8 will work
2015-11-23 21:59:26 -05:00
Ned Batchelder
a7e21bf188
Merge pull request #10707 from edx/ned/fix-pylint-c7630-violations
...
Fix pylint C7630 (literal used as attribute) violations
2015-11-23 16:58:54 -05:00
Feanil Patel
995a214c95
Merge pull request #10710 from edx/feanil/upgrade_pymongo
...
Upgrade to latest 2.x version of pymongo.
2015-11-23 15:50:23 -05:00
Ned Batchelder
0872732cf0
Fix pylint C7630 (literal used as attribute) violations
...
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
2015-11-23 15:32:54 -05:00
David Baumgold
2e71a66daa
GitHub has a capital H
2015-11-23 15:06:33 -05:00
Christine Lytwynec
29b719f394
Merge pull request #10527 from edx/clytwynec/ac-230
...
Navigation dropdown link should be button
2015-11-23 15:06:02 -05:00
Christine Lytwynec
c6f4afc9c9
Header a.dropdown --> button.dropdown
2015-11-23 13:51:00 -05:00
Feanil Patel
6f0e7c5116
Upgrade to latest 2.x version of pymongo.
...
Release Notes: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=14795
Mostly backports to prep for moving to 3.0
2015-11-23 12:26:03 -05:00
Christine Lytwynec
6a92d4cb2b
Merge pull request #10639 from edx/clytwynec/remove-firefox-focus-outline-override
...
remove reset style for button outlines in firefox
2015-11-23 11:55:00 -05:00
Ned Batchelder
5634692f6c
Merge pull request #10708 from edx/ned/fix-wiki-0002-migration
...
Update the django-wiki reference
2015-11-23 10:46:06 -05:00
Ned Batchelder
68e30f5dee
Update the django-wiki reference
...
Django-wiki had an incorrect migration. This gets the right one.
2015-11-23 10:01:08 -05:00
Peter Pinch
d4d63ece1f
Merge pull request #10647 from mitocw/enhancement/aq/email_notification_setting_ccx_enrollment
...
Added auto-enroll and email student check boxes to enrollment tab ccx coach dashboard
2015-11-23 08:18:41 -05:00
Ned Batchelder
dcc86a3b1b
Merge pull request #10703 from edx/ned/remove-useless-pylint-suppression
...
Remove useless pylint suppressions. TOOLS-124
2015-11-23 07:00:26 -05:00
Ned Batchelder
f5d0f3ff55
Remove useless pylint suppressions
2015-11-22 07:41:19 -05:00
Akiva Leffert
7a858b6e09
Merge pull request #10405 from edx/aleffert/block-wrapping
...
Force wrapping for long content like hyperlinks.
2015-11-20 19:17:41 -05:00
Akiva Leffert
bb43407586
Force wrapping for long content like hyperlinks.
...
Content that doesn't fit on the screen was causing the viewport to be
the wrong size on mobile devices resulting. This forces wrapping for
long content instead of letting it force the viewport size.
JIRA: https://openedx.atlassian.net/browse/MA-1236
2015-11-20 17:47:58 -05:00
Kevin Falcone
dffcc25bcc
Merge pull request #10694 from edx/hotfix-2015-11-20-conflict
...
Hotfix 2015 11 20 conflict
2015-11-20 15:10:28 -05:00
Christine Lytwynec
b96cd65a14
remove reset style for button outlines in firefox
2015-11-20 14:26:16 -05:00
Kevin Falcone
80614a2798
Merge branch 'release' into hotfix-2015-11-20-conflict
2015-11-20 13:13:05 -05:00
Kevin Falcone
37dbbf4197
Merge pull request #10674 from edx/hotfix/2015-11-19
...
Fix login redirect when user is logged out while answering a question…
2015-11-20 12:28:15 -05:00
chrisndodge
7c7c0b6809
Merge pull request #10670 from edx/cdodge/fix-unenrollment-audit-data
...
Cdodge/fix unenrollment audit data
2015-11-20 12:07:14 -05:00
Chris Dodge
21c2d3f7bd
Add in the attempt_code field to the proctoring report
2015-11-20 12:05:49 -05:00
Kevin Falcone
24d72883b2
Merge pull request #10684 from edx/jibsheet/force_publish-arg-parsing
...
Jibsheet/force publish arg parsing
2015-11-20 11:00:31 -05:00
Usman Khalid
c22d0de9fb
Merge pull request #10690 from edx/usman/fix-settings
...
Cleanup some settings.
2015-11-20 20:41:59 +05:00
Kevin Falcone
d7953bfa85
Merge pull request #10682 from edx/jibsheet/delete_orphans-commit
...
Update --commit flag so you don't have to say --commit=commit
2015-11-20 10:28:57 -05:00
Zubair Afzal
8c1d748428
Merge pull request #10689 from edx/zub/story/ecom-2933-reverify-flow-for-initial-verification
...
Allow user to submit initial verification through reverify flow
2015-11-20 19:38:10 +05:00
Amir Qayyum Khan
7bb4980f05
Added auto-enrol and email student check boxes to enrolment tab ccx coach dashboard
2015-11-20 19:22:38 +05:00
Ben Patterson
72fbcdc606
Merge pull request #10687 from edx/benp/fix-edxtest-djan18
...
edxtest needs to be created on naked systems.
2015-11-20 08:31:36 -05:00
Usman Khalid
dc7b57f459
Cleanup some settings.
2015-11-20 18:18:32 +05:00
zubair-arbi
0b93054cbb
Allow user to submit initial verification through reverify flow
...
ECOM-2933
2015-11-20 14:34:38 +05:00
Kevin Falcone
149df9b22f
Django 1.8 disallows access to args[]
...
https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/
You need to declare and do proper argument parsing. --commit is also
more natural than a bare 'commit' on the end of a command.
Switch from calling handle() directly to call_command().
call_command() simulates using the management command so is a better
test of the command line interface.
2015-11-19 21:39:53 -05:00
Kevin Falcone
270ab7f98c
Merge pull request #10685 from edx/jibsheet/saml-pull
...
Management commands should no longer access args[]
2015-11-19 19:06:33 -05:00
Kevin Falcone
3c1109fb82
Merge pull request #10686 from edx/jibsheet/pin-edx-submissions-for-release
...
Pin to what we have in production
2015-11-19 19:06:13 -05:00
Ben Patterson
c475f2830e
edxtest needs to be created on naked systems.
...
This is a partial revert from d8fd8ed678
2015-11-19 17:39:41 -05:00
Sarina Canelake
6a76db085f
Merge pull request #10678 from edx/sarina/reword-aboutpage
...
Reword default about page questions
2015-11-19 17:34:47 -05:00
Kevin Falcone
84328c13f6
Pin to what we have in production
...
This was installing a newer version, with a migration, which we do not
want for a hotfix.
2015-11-19 17:00:18 -05:00
Kevin Falcone
57a4df73a5
Management commands should no longer access args[]
...
https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/
Django intercepts the 'pull' argument and says "unrecognized arguments pull"
There were no tests for this command, so it wasn't noticed during the
upgrade testing, only once our integration monitoring noticed.
2015-11-19 16:25:49 -05:00
Chris Dodge
f4c5541339
be sure to include the enrollment_id when unenrolling
2015-11-19 15:50:51 -05:00
clrux
7f4dd4dbf5
Merge pull request #10679 from edx/clrux/add-gettext-to-global-jshint-ignore
...
Adding gettext to JSHint ignore
2015-11-19 15:45:48 -05:00
Sarina Canelake
256dc5b6f8
Reword default about page questions
2015-11-19 15:44:54 -05:00
Nimisha Asthagiri
a2675fe0b4
Merge pull request #10649 from edx/jia/MA-1190
...
MA-1190; patch 'read' attribute for thread
2015-11-19 15:27:50 -05:00
