Douglas Hall
74c19c2854
Adding LTI consumer XBlock to requirements; Updating xblock-utils requirement
2015-11-30 11:58:51 -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
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
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
Kevin Falcone
daf4db8647
Update --commit flag so you don't have to say --commit=commit
...
With the 1.8 upgrade, we stopped using 'manage.py cms command commit'
and switched to --commit because we no longer directly access args[]
https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/
When this command was updated, it was switched to --commit=commit, but
using store_true allows a much more natural --commit syntax.
2015-11-19 15:26:28 -05:00
Chris Rodriguez
d1efc3fed1
Updating JSHint threshold
2015-11-19 14:58:05 -05:00
Alison Hodges
02b43c05fc
Merge pull request #10562 from edx/ahodges/DOC-2390
...
Updates the example locations to split format
2015-11-19 14:55:29 -05:00
John Eskew
b7830de618
Merge pull request #10659 from edx/dj18-release-merge
...
Django18 release merge
2015-11-19 14:42:07 -05:00
Chris Rodriguez
9d18bd6196
Adding gettext to ignore
2015-11-19 14:27:36 -05:00
Brian Beggs
141e0a93c7
Merge branch 'master' into dj18-release-merge
2015-11-19 13:36:13 -05:00
John Eskew
0e66fad1f2
Merge pull request #10667 from edx/dj18/update_all_repo_versions
...
Update the Django 1.8-upgraded repo versions.
2015-11-19 13:26:47 -05:00
Ned Batchelder
26a4670cea
Update version of django-splash
2015-11-19 12:34:42 -05:00
John Eskew
e4d8b58412
Bump tag & version of edx-organizations
2015-11-19 11:56:32 -05:00
Ned Batchelder
a65d599fae
Update XBlock version
2015-11-19 11:43:12 -05:00
John Eskew
698cea3f87
Remove errant 'and is'
2015-11-19 11:27:07 -05:00
John Eskew
6a58a9c120
edx-organizations
2015-11-19 11:18:40 -05:00
Ned Batchelder
66cbc6a6d1
Update django-wiki reference
2015-11-19 11:17:09 -05:00
Muhammad Ammar
11a183855c
update submissions and ora2 versions
2015-11-19 20:56:52 +05:00
Adam Palay
5b5cf7d3b0
Fix login redirect when user is logged out while answering a question (TNL-3789)
2015-11-19 10:28:58 -05:00
Brian Beggs
0eabdcbfde
reverting ora2 tag in github.txt
2015-11-19 10:24:55 -05:00
Christine Lytwynec
290de4550d
Merge pull request #10671 from edx/clytwynec/jshint-diff
...
Fix paths for diff quality jshint comparison
2015-11-19 09:59:26 -05:00
Matt Drayer
794e403bf5
Merge pull request #10635 from edx/asadiqbal08/SOL-1416
...
asadiqbal08/SOL-1416 Certs: Remove Restriction on Date Setting
2015-11-19 09:48:20 -05:00
Matt Drayer
42c2cc4dbe
Merge pull request #10618 from edx/ziafazal/SOL-1386
...
SOL-1386: refactored cert web view code
2015-11-19 09:46:57 -05:00
