Commits · 7dc0598b2527d338ca74358048f40f52bd265c14 · edx / edx-platform · GitLab

26 Feb, 2015 18 commits
- Delete ENABLE_NEW_DASHBOARD code. · 7dc0598b
  cahrens committed Feb 26, 2015
  
  7dc0598b Browse Files
- Merge pull request #7130 from edx/django-upgrade/upgrade-south · 78079213
```
Django upgrade/upgrade south
```
  Nimisha Asthagiri committed Feb 26, 2015
  78079213 Browse Files
- Upgrade South to 1.0.1 · d757029f
  Nimisha Asthagiri committed Feb 26, 2015
  
  d757029f Browse Files
- Merge pull request #7124 from edx/django-upgrade/unicode-export-errors · 80eed36c
```
Force GitExportError messages to be unicode objects
```
  Calen Pennington committed Feb 26, 2015
  80eed36c Browse Files
- Merge pull request #7127 from edx/django-upgrade/reload-user-session-in-test · bbab3a39
```
Reload the user to get the cached profile attribute
```
  Calen Pennington committed Feb 26, 2015
  bbab3a39 Browse Files
- Merge pull request #7129 from edx/django-upgrade/spelling-errors · bee58106
```
minor fixes found from the django-upgrade work.
```
  Nimisha Asthagiri committed Feb 26, 2015
  bee58106 Browse Files
- Merge pull request #7126 from edx/django-upgrade/simplejson-to-json · 6a54b1d6
```
Replaced simplejson with json
```
  Clinton Blackburn committed Feb 26, 2015
  6a54b1d6 Browse Files
- Merge pull request #7125 from edx/django-upgrade/backport-changes/SECRET_KEY · 3538074c
```
Backport dummy SECRET_KEYs from django 1.5 upgrade
```
  Daniel Friedman committed Feb 26, 2015
  3538074c Browse Files
- Merge pull request #7068 from edx/ahsan/tnl-1511-courseware-section-nav-accessibility-issue · f9080590
```
<nav> for the courseware section does not include aria label
```
  ahsan-ul-haq committed Feb 26, 2015
  f9080590 Browse Files
- Force GitExportError messages to be unicode objects · 6c0982b2
  Calen Pennington committed Feb 26, 2015
  
  6c0982b2 Browse Files
- minor fixes found from the django-upgrade work. · 052dd52a
  Nimisha Asthagiri committed Feb 26, 2015
  
  052dd52a Browse Files
- Reload the user to get the cached profile attribute · 3d8e1d09
  Calen Pennington committed Feb 26, 2015
  
  3d8e1d09 Browse Files
- Replaced simplejson with json · 2fca3f03
```
simplejson has been removed from future versions of Django (which we will eventually use).
```
  Clinton Blackburn committed Feb 26, 2015
  2fca3f03 Browse Files
- Backport dummy SECRET_KEYs from django 1.5 upgrade · fa968c62
  Daniel Friedman committed Feb 26, 2015
  
  fa968c62 Browse Files
- Merge pull request #7115 from openfun/fun/authors-add-sylvain · 81ee3001
```
Added Sylvain to authors.
```
  Sarina Canelake committed Feb 26, 2015
  81ee3001 Browse Files
- Merge pull request #7059 from open-craft/library-comments · 7ac58129
```
Make UI styling consistent between libraries and courses tabs when empty (SOL-232)
```
  Xavier Antoviaque committed Feb 26, 2015
  7ac58129 Browse Files
- Merge pull request #5460 from Kelketek/forum-tracking · 353b8ea4
```
Do event tracking for major forum events.
```
  Jim Abramson committed Feb 26, 2015
  353b8ea4 Browse Files
- Added Sylvain to authors. · 8df6500a
  Lazybird committed Feb 26, 2015
  
  8df6500a Browse Files
25 Feb, 2015 17 commits
- Do event tracking for major forum events. · be02613a
  Jonathan Piacenti committed Feb 25, 2015
  
  be02613a Browse Files
- Merge pull request #7053 from edx/christina/account-api · 9d956e03
```
User account API
```
  Christina Roberts committed Feb 25, 2015
  9d956e03 Browse Files
- Merge pull request #7037 from edx/clytwynec/flaky_test_decorator · 8bdd90a5
```
Clytwynec/flaky test decorator
```
  Christine Lytwynec committed Feb 25, 2015
  8bdd90a5 Browse Files
- Convert empty string to None for "select" fields, other cleanup. · ae0333cb
  cahrens committed Feb 25, 2015
  
  ae0333cb Browse Files
- Merge pull request #7099 from edx/benp/disable-sol-430 · c877c604
```
Disable flaky test.
```
  Ben Patterson committed Feb 25, 2015
  c877c604 Browse Files
- Merge pull request #7109 from edx/ned/add-spaces · bcec6643
```
Fix sentences jammed together.
```
  Ned Batchelder committed Feb 25, 2015
  bcec6643 Browse Files
- Merge pull request #6771 from edx/dan-f/forums-filter-discussion-modules · 086a2ba7
```
Check access for discussion modules in forums tab
```
  Daniel Friedman committed Feb 25, 2015
  086a2ba7 Browse Files
- Fix sentences jammed together. · dd436ed8
  Ned Batchelder committed Feb 25, 2015
  
  dd436ed8 Browse Files
- Merge pull request #6903 from edx/mjames/SOL-200 · a44132ec
```
Adds google drive components to whitelist
```
  Martyn James committed Feb 25, 2015
  a44132ec Browse Files
- Check access for discussion modules in forums · c8434ef9
```
TNL-650
```
  Daniel Friedman committed Feb 25, 2015
  c8434ef9 Browse Files
- Merge pull request #7090 from edx/will/cors-debugging · 70455d3e
```
Expose CORS_ORIGIN_ALLOW_ALL setting
```
  Will Daly committed Feb 25, 2015
  70455d3e Browse Files
- Adds google drive components to whitelist, and imports xblock-google-drive and xblock-utils · b2b56d06
  Martyn James committed Feb 25, 2015
  
  b2b56d06 Browse Files
- Merge pull request #7069 from edx/awais786/ECOM-1086-analytics-certs · d9d78994
```
ECOM-1086 adding tracking event for cert generation.
```
  Awais Qureshi committed Feb 25, 2015
  d9d78994 Browse Files
- Merge pull request #7084 from edx/awais786/ECOM-985-enforce-single-login · a36c615c
```
ECOM-985 fixing the 'NoneType' object has no attribute 'profile'.
```
  Awais Qureshi committed Feb 25, 2015
  a36c615c Browse Files
- Disable flaky test. · c7042bcc
  Ben Patterson committed Feb 25, 2015
  
  c7042bcc Browse Files
- ECOM-1086 adding tracking event for cert generation. · 28b633f9
  Awais committed Feb 25, 2015
  
  28b633f9 Browse Files
- ECOM-985 fixing the 'NoneType' object has no attribute 'profile'. · 1e53a797
  Awais committed Feb 25, 2015
  
  1e53a797 Browse Files
24 Feb, 2015 5 commits
- Use flaky from clytwynec fork · d14c7cf1
  Christine Lytwynec committed Feb 24, 2015
  
  d14c7cf1 Browse Files
- fix extra_args for lib tests · 371f7ca4
  Christine Lytwynec committed Feb 24, 2015
  
  371f7ca4 Browse Files
- add --with-flaky in jenkins script · 35b6e15d
  Christine Lytwynec committed Feb 24, 2015
  
  35b6e15d Browse Files
- add flaky decorator to StudioLibraryContainerTest.test_out_of_date_message · ac03f874
```
Relates to: TE-745
```
  Christine Lytwynec committed Feb 24, 2015
  ac03f874 Browse Files
- add flaky to requirements file · c229fcad
  Christine Lytwynec committed Feb 24, 2015
  
  c229fcad Browse Files