Commits · aaa0ab22a3aaa608af9e5aa7387dfbcf7785ef5f · edx / edx-platform

31 Aug, 2016 1 commit
- Fix bookmarks key error for direct access to xblock. · aaa0ab22
```
TNL-5003
```
  muhammad-ammar committed Aug 31, 2016
  aaa0ab22 Browse Files
30 Aug, 2016 2 commits
- Merge pull request #13351 from edx/diana/discussion-permission-fix · 2c9e4884
```
[Eucalyptus Fix] Fix spelling of permission.
```
  Diana Huang committed Aug 30, 2016
  2c9e4884 Browse Files
- Fix spelling of permission. · 6d686944
  Diana Huang committed Aug 30, 2016
  
  6d686944 Browse Files
26 Aug, 2016 2 commits
- Merge pull request #13305 from edx/ahodges/update_help_path · 585cf93b
```
Updates help links to point to Open edX Euc versions
```
  Alison Hodges committed Aug 26, 2016
  585cf93b Browse Files
- Updates help links to point to Open edX Euc versions · f75d370a
  Alison Hodges committed Aug 26, 2016
  
  f75d370a Browse Files
24 Aug, 2016 1 commit
- Transifex configuration for Eucalyptus resources · cc70cdbe
  Ned Batchelder committed Aug 24, 2016
  
  cc70cdbe Browse Files
13 Aug, 2016 1 commit
- moment-with-locales.min.js must be used for locales other than en · 39f3e103
```
(cherry picked from commit d2042f72)
```
  Pierre Mailhot committed Aug 13, 2016
  39f3e103 Browse Files
10 Aug, 2016 3 commits
- Merge pull request #13208 from edx/saleem-latif/eucalyptus/WL-343 · 397e18b6
```
Theming and Configuration changes
```
  Ned Batchelder committed Aug 10, 2016
  397e18b6 Browse Files
- Update configuration helpers to take into account microsite configurations · 38bc43a6
  Saleem Latif committed Aug 10, 2016
  
  38bc43a6 Browse Files
- 1. Merge microsites into Comprehensive Theming · a63be5c5
```
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
```
  Saleem Latif committed Aug 10, 2016
  a63be5c5 Browse Files
09 Aug, 2016 1 commit
- FEDX-152. Pipe collectstatic results to a file for bok-choy tests. · 26e7a928
```
(cherry picked from commit 066450d2)
```
  Ben Patterson committed Aug 09, 2016
  26e7a928 Browse Files
05 Aug, 2016 1 commit
- Pin versions of numpy and scipy · 948bb818
  Ned Batchelder committed Aug 05, 2016
  
  948bb818 Browse Files
03 Aug, 2016 1 commit
- Merge pull request #13154 from open-craft/discussion-import-fix-eucalyptus · 74837f15
```
Eucalyptus backport: TNL-5001 Discussion import/export fix
```
  Ned Batchelder committed Aug 03, 2016
  74837f15 Browse Files
02 Aug, 2016 1 commit

[TNL-5001] Import-export issues when importing legacy discussion OLX format · f592d9b5

Observed Problems:
1. Discussion categories and targets were missing
2. When imported over existing course Discussion IDs have changed unexpectedly - all posts were missing

Solutions:
* Parsing legacy discussion OLX
* Do not force exporting discussion ID

committed Aug 02, 2016

f592d9b5 Browse Files

21 Jul, 2016 4 commits
- Merge pull request #13065 from edx/bjacobel/TNL-5011 · bc9773f2
```
TNL-5011
```
  Ned Batchelder committed Jul 21, 2016
  bc9773f2 Browse Files
- Merge pull request #13066 from edx/adam/add-commit-to-eucalyptus · 6c1f8148
```
authenticate user after their reset confirmation goes through
```
  Ned Batchelder committed Jul 21, 2016
  6c1f8148 Browse Files
- authenticate user after their reset confirmation goes through · bcca293b
```
make password validation code more DRY

grammar nit: "less" -> "fewer"
```
  Adam Palay committed Jul 21, 2016
  bcca293b Browse Files
- Vote button is now disabled for yourself, but count is still visible · c791ce62
  Brian Jacobel committed Jul 21, 2016
  
  c791ce62 Browse Files
13 Jul, 2016 1 commit
- Merge pull request #12963 from edx/rc/2016-07-12 · e6c88a24
```
Release Candidate: 2016-07-12
```
  Cliff Dyer committed Jul 13, 2016
  e6c88a24 Browse Files
12 Jul, 2016 5 commits
- Merge pull request #12981 from edx/adam/small-fix-to-rc · e410cd97
```
small fix to typo in activation email
```
  Cliff Dyer committed Jul 12, 2016
  e410cd97 Browse Files
- Mark test for skipping SOL-1811 · 5e6f89b0
  Jesse Zoldak committed Jul 12, 2016
  
  5e6f89b0 Browse Files
- small fix to typo in activation email · 58073d2f
  Adam Palay committed Jul 12, 2016
  
  58073d2f Browse Files
- Merge pull request #12979 from edx/clrux/rc-footer-badge-fix · d728746d
```
Fixes mobile app footer link styles
```
  Chris committed Jul 12, 2016
  d728746d Browse Files
- Fixes mobile app footer link styles · 30ed53d4
  Chris Rodriguez committed Jul 12, 2016
  
  30ed53d4 Browse Files
11 Jul, 2016 2 commits
- Merge pull request #12969 from edx/kkim/learner_profile_fix · a8afe918
```
Fix the About Me section on the learner profile page.
```
  Kevin Kim committed Jul 11, 2016
  a8afe918 Browse Files
- Fix the About Me section on the learner profile page. · dfc1cf15
  Kevin Kim committed Jul 11, 2016
  
  dfc1cf15 Browse Files
08 Jul, 2016 7 commits
- Merge pull request #12964 from edx/adam/merge-release-to-rc · cb4c7125
```
Adam/merge release to rc
```
  Cliff Dyer committed Jul 08, 2016
  cb4c7125 Browse Files
- mark StudioHelpTest.test_studio_help_links as flaky · 2e095e15
  Adam Palay committed Jul 08, 2016
  
  2e095e15 Browse Files
- Merge pull request #12961 from cpennington/fix-xunit-commands · 0aceb231
```
[TE-1511] Make --with-xunit(mp)? and --xunit(mp)?-file match in all test suites
```
  Calen Pennington committed Jul 08, 2016
  0aceb231 Browse Files
- [TE-1511] Make --with-xunit(mp)? and --xunit(mp)?-file match in all test suites · 2e5936f0
  Calen Pennington committed Jul 08, 2016
  
  2e5936f0 Browse Files
- Merge pull request #12956 from edx/ned/update-translations · bb9a6283
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Jul 07, 2016
  bb9a6283 Browse Files
- Update translations (autogenerated message) · 9132b7d5
  Ned Batchelder committed Jul 07, 2016
  
  9132b7d5 Browse Files
- Merge pull request #12889 from mitocw/fix/aq/caoch_dashboard_navigation_issues · cf572af1
```
Fixed CCX coach dashboard access issues
```
  Peter Pinch committed Jul 07, 2016
  cf572af1 Browse Files
07 Jul, 2016 7 commits
- Fixed CCX coach dashboard access issues. · 0d3f96d4
  Amir Qayyum Khan committed Jul 08, 2016
  
  0d3f96d4 Browse Files
- Merge pull request #11286 from open-craft/omar/remove-s3 · 7c3d902f
```
Add OpenStack Swift support
```
  Braden MacDonald committed Jul 07, 2016
  7c3d902f Browse Files
- Merge pull request #12944 from edx/jeskew/fix_for_wiki_deprecation_msg · 5d196afc
```
Update the django-wiki version number.
```
  John Eskew committed Jul 07, 2016
  5d196afc Browse Files
- Merge pull request #12958 from edx/JoyceZhu/revert_erroneous_commit · 470cfc11
```
Revert "Remove receipt page links' bottom borders"
```
  Joyce Zhu committed Jul 07, 2016
  470cfc11 Browse Files
- Revert "Remove receipt page links' bottom borders" · afa9a2cd
```
This reverts commit 01e21049.
```
  Joyce Zhu committed Jul 07, 2016
  afa9a2cd Browse Files
- Merge pull request #12952 from edx/adam/quiet-logs · f7c45cf4
```
quiet some noisy logs
```
  Adam committed Jul 07, 2016
  f7c45cf4 Browse Files
- Remove receipt page links' bottom borders · 01e21049
  Joyce Zhu committed Jul 07, 2016
  
  01e21049 Browse Files