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
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
zubair-arbi
0b93054cbb
Allow user to submit initial verification through reverify flow
...
ECOM-2933
2015-11-20 14:34:38 +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
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
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
Usman Khalid
219a2083ad
Tag lettuce
2015-11-19 19:35:12 +05:00
Brian Beggs
705bdaaace
updated edx-proctoring tag
2015-11-19 09:31:59 -05:00
John Eskew
6eda0f3410
Change django-oauth2-provider to match version
2015-11-19 09:29:30 -05:00
Ben Patterson
943fbdd4ca
Merge pull request #10665 from edx/benp/shard-7-rebal
...
Rebalance shard 7.
2015-11-19 09:21:13 -05:00
Usman Khalid
bc22f592c6
Merge pull request #10664 from edx/usman/regenerate-db-cache
...
Recreate db caches for bokchoy and lettuce
2015-11-19 19:20:21 +05:00
Usman Khalid
2ab255a304
Tag event-tracking.
2015-11-19 18:07:06 +05:00
wajeeha-khalid
e662e869d6
MA-1190; patch 'read' attribute for thread
2015-11-19 15:33:35 +05:00
John Eskew
a160f10797
Add version back to django-oauth2-provider
2015-11-18 15:54:31 -05:00
Christine Lytwynec
01d8a9bcad
Fix paths for diff quality jshint comparison
2015-11-18 15:52:27 -05:00
John Eskew
2408c0f0c7
django-pyfs
2015-11-18 15:50:01 -05:00
Ben Patterson
0d68cd01bf
Rebalance shard 7.
2015-11-18 15:30:50 -05:00
John Eskew
73bf93eefd
django-openid-auth
2015-11-18 15:27:16 -05:00
Brian Beggs
2977419fa6
Updated edx-val tag
2015-11-18 14:57:35 -05:00
Peter Fogg
7c4ac3dab3
Merge pull request #10668 from edx/peter-fogg/correct-payment-message
...
Add correct payment processor messages.
2015-11-18 14:56:11 -05:00
Brian Beggs
ece43db411
Updated edx-oauth2-provider tag
2015-11-18 14:55:43 -05:00
Brian Beggs
ecd0b5f244
set tag for edx-search
2015-11-18 14:41:32 -05:00
Brian Beggs
647c1257dd
updated edx-milestones to tag release-2015-11-17
2015-11-18 14:34:10 -05:00
John Eskew
41e9fd187b
django-oauth-provider take 2
2015-11-18 14:17:09 -05:00
Brian Beggs
8594896621
updated edx-reverification tag
2015-11-18 14:12:31 -05:00
Peter Fogg
60f6bbe929
Add correct payment processor messages.
...
(facepalm)
2015-11-18 14:05:37 -05:00
Peter Fogg
9d1290a180
Merge pull request #10662 from edx/peter-fogg/payment-processor-switches
...
Display an error message if no payment processors are available.
2015-11-18 14:00:37 -05:00
John Eskew
e3bb5137ea
django-oauth2-provider
2015-11-18 13:57:29 -05:00
Brian Beggs
ceaff54fcb
updated edx-organizations with django 1.8 release tag
2015-11-18 13:54:37 -05:00
