Commits · d8fd8ed6784e5ab8aa250e4b02a59c2361c9bbe7 · edx / edx-platform · GitLab

18 Nov, 2015 1 commit
- Recreate db caches for bokchoy and lettuce · d8fd8ed6
  Usman Khalid committed Nov 18, 2015
  
  d8fd8ed6 Browse Files
17 Nov, 2015 1 commit
- Merge branch 'django-upgrade/1.8' into release · 69dc5185
  Brian Beggs committed Nov 17, 2015
  
  69dc5185 Browse Files
13 Nov, 2015 8 commits
- Merge pull request #10629 from edx/bbeggs/dj18-linkedin · 2c1f7fd3
```
Disable posting to LinkedIn feature for microsites until we can suppo…
```
  Brian Beggs committed Nov 13, 2015
  2c1f7fd3 Browse Files
- Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts · 02550cb3
  Chris Dodge committed Nov 13, 2015
  
  02550cb3 Browse Files
- Merge pull request #10626 from edx/ned/dj18-cms-secret-key · 2f0b8497
```
Make sure Studio has a secret key
```
  Ned Batchelder committed Nov 13, 2015
  2f0b8497 Browse Files
- Make sure Studio has a secret key · ccc6e507
  Ned Batchelder committed Nov 13, 2015
  
  ccc6e507 Browse Files
- Merge pull request #10625 from edx/ned/dj18-use-correct-ora2 · 415d31e9
```
Use correct version of ora2
```
  Ned Batchelder committed Nov 13, 2015
  415d31e9 Browse Files
- Use correct version of ora2 · 707675d7
  Ned Batchelder committed Nov 13, 2015
  
  707675d7 Browse Files
- Merge pull request #10620 from edx/ammar/fix-drf-format-parm-issue · 1e6c5b7d
```
Fix DRF format query param issue
```
  Ned Batchelder committed Nov 13, 2015
  1e6c5b7d Browse Files
- fix DRF format query param issue · bfb69e56
```
TNL-3787
```
  Muhammad Ammar committed Nov 13, 2015
  bfb69e56 Browse Files
12 Nov, 2015 4 commits
- Merge pull request #10607 from edx/ned/dj18-disable-wiki-notifications · a09012c2
```
Disable wiki notifications
```
  Ned Batchelder committed Nov 12, 2015
  a09012c2 Browse Files
- Merge pull request #10608 from edx/ned/dj18-fix-django-storages-uninstall · ca94745c
```
Fix the uninstall of django-storages
```
  Ned Batchelder committed Nov 12, 2015
  ca94745c Browse Files
- Fix the uninstall of django-storages · d3f9e1a7
  Ned Batchelder committed Nov 12, 2015
  
  d3f9e1a7 Browse Files
- Disable wiki notifications · 0eea9ad4
```
This is an expedient fix to a problem with migrations during the Django
1.8 upgrade.
```
  Ned Batchelder committed Nov 12, 2015
  0eea9ad4 Browse Files
11 Nov, 2015 10 commits
- Merge pull request #10590 from edx/ned/dj18-fixed-data-migrations · bcf789bd
```
More-correct data migrations
```
  Ned Batchelder committed Nov 11, 2015
  bcf789bd Browse Files
- More-correct data migrations · e7fcc743
```
We need to be sure the migrations will work even in the presence of data
from the future.  get_or_create is a problem, because if the data
already exists, there could be more than one record, even if this
migration only creates one.
```
  Ned Batchelder committed Nov 11, 2015
  e7fcc743 Browse Files
- Merge pull request #10588 from edx/update-expected-version · 8bac42a1
```
Update expected_version.
```
  Usman Khalid committed Nov 11, 2015
  8bac42a1 Browse Files
- Update expected_version. · fb9526b9
  Usman Khalid committed Nov 11, 2015
  
  fb9526b9 Browse Files
- Merge pull request #10583 from edx/ammar/fix-another-RemovedInDjango19Warning · d8403c1d
```
Fix RemovedInDjango19Warning
```
  Muhammad Ammar committed Nov 11, 2015
  d8403c1d Browse Files
- Merge pull request #10584 from edx/ammar/uninstall-django-storages · 2bd58aa5
```
add django-storages into uninstall list
```
  Muhammad Ammar committed Nov 11, 2015
  2bd58aa5 Browse Files
- add django-storages into uninstall list · a6ec8cd2
  muhammad-ammar committed Nov 11, 2015
  
  a6ec8cd2 Browse Files
- Fix RemovedInDjango19Warning · f55f9af8
  muhammad-ammar committed Nov 11, 2015
  
  f55f9af8 Browse Files
- Use corrected migrations from edx-submissions · 835eccaf
  Ned Batchelder committed Nov 10, 2015
  
  835eccaf Browse Files
- Correct the darklang migration, since many darklang configs can exist. · 680271d4
  Ned Batchelder committed Nov 10, 2015
  
  680271d4 Browse Files
10 Nov, 2015 4 commits
- Use a branch instead of an unpushed tag for django-splash · 607f3bf4
  Ned Batchelder committed Nov 10, 2015
  
  607f3bf4 Browse Files
- Rebase upgrade Django to v1.8.5 · 6cb62f26
```
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
```
  Usman Khalid committed Nov 10, 2015
  6cb62f26 Browse Files
- Merge pull request #10557 from edx/hotfix/2015-11-10 · 3bd9f95a
```
Disable posting to LinkedIn feature for microsites until we can suppo…
```
  chrisndodge committed Nov 10, 2015
  3bd9f95a Browse Files
- Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts · eeb8c489
  Chris Dodge committed Nov 10, 2015
  
  eeb8c489 Browse Files
09 Nov, 2015 1 commit
- Remove check for course home page improvements. · 7b801c66
  Peter Fogg committed Nov 09, 2015
  
  7b801c66 Browse Files
06 Nov, 2015 11 commits
- Merge pull request #10546 from edx/revert-disable-check-button-on-save · e042ee23
```
Revert disable check button on save
```
  Adam committed Nov 06, 2015
  e042ee23 Browse Files
- Merge pull request #10534 from edx/andya/fix-studio-videos · a3ff4d50
```
Fix optimizing of draggabilly and json2
```
  Andy Armstrong committed Nov 06, 2015
  a3ff4d50 Browse Files
- Revert "Disable submit button on save click" · 33d9185d
```
This reverts commit 99cca057.
```
  Adam Palay committed Nov 06, 2015
  33d9185d Browse Files
- Revert "add test for disabling check button while clicking save" · bc87ec15
```
This reverts commit bc6caea6.
```
  Adam Palay committed Nov 06, 2015
  bc87ec15 Browse Files
- Merge pull request #10535 from edx/clintonb/enrollment-admin-fix · 7de9252e
```
Fixed admin issues
```
  Clinton Blackburn committed Nov 06, 2015
  7de9252e Browse Files
- Merge pull request #10533 from edx/cdodge/adjust-report-task-routing · ee29e11e
```
change 'routing' for some reports which go to potentially backlogged …
```
  chrisndodge committed Nov 06, 2015
  ee29e11e Browse Files
- Fix optimizing of draggabilly and json2 · 7a146963
  Andy Armstrong committed Nov 06, 2015
  
  7a146963 Browse Files
- Merge pull request #10543 from edx/asadiqbal08/SOL-1379_point_to_release · 10ed76a8
```
asadiqbal08/SOL-1379 - Removed the limit on the number of lines in a title.
```
  Matt Drayer committed Nov 06, 2015
  10ed76a8 Browse Files
- SOL-1379 · 13508c76
  asadiqbal committed Nov 06, 2015
  
  13508c76 Browse Files
- change 'routing' for some reports which go to potentially backlogged queues · 4216eaf5
  Chris Dodge committed Nov 06, 2015
  
  4216eaf5 Browse Files
- Fixed admin issues · afd682e2
```
- Using raw ID field for user fields for enrollment and user profile admin
- Including user data in enrollment admin queryset
```
  Clinton Blackburn committed Nov 06, 2015
  afd682e2 Browse Files