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

26 Feb, 2015 2 commits
- 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
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 21 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
- Merge pull request #7089 from edx/clintonb/cs-api-fix · 6f7a0665
```
Fixed Course List Endpoint
```
  Clinton Blackburn committed Feb 24, 2015
  6f7a0665 Browse Files
- Merge pull request #7066 from edx/dcikatic/SOL-259 · 8acdf532
```
SOL-259 Change HTML content listed type in index from HTML Content to Te...
```
  Martyn James committed Feb 24, 2015
  8acdf532 Browse Files
- Merge pull request #6914 from edx/dcikatic/courseware_search_index_DRF · d8799057
```
Changing search_reindex call to be more inline with DRF convention
```
  Martyn James committed Feb 24, 2015
  d8799057 Browse Files
- Make UI styling consistent between libraries and courses tabs when empty. · f952a33e
  Jonathan Piacenti committed Feb 24, 2015
  
  f952a33e Browse Files
- Merge pull request #7093 from edx/pylint-6k · 3a9a7961
```
Pylint violations are below 6000
```
  David Baumgold committed Feb 24, 2015
  3a9a7961 Browse Files
- Fixed Course List Endpoint · 0385a8b5
```
Updated filter to ensure only course descriptors are returned.
```
  Clinton Blackburn committed Feb 24, 2015
  0385a8b5 Browse Files
- Pylint violations are below 6000 · a1fc25b8
  David Baumgold committed Feb 24, 2015
  
  a1fc25b8 Browse Files
- Expose CORS_ORIGIN_ALLOW_ALL setting · e9bb6889
  Will Daly committed Feb 24, 2015
  
  e9bb6889 Browse Files
- Merge pull request #7088 from edx/ned/move-docs-to-docs · d8a45294
```
Move internal documentation to the internal documentation directory
```
  Ned Batchelder committed Feb 24, 2015
  d8a45294 Browse Files
- Enforce content_type of 'application/merge-patch+json' for merge patch. · 450c0e34
  cahrens committed Feb 24, 2015
  
  450c0e34 Browse Files
- Merge pull request #7078 from edx/db/upgrade-pip · 3b06d711
```
Use pip 6.0.8
```
  David Baumgold committed Feb 24, 2015
  3b06d711 Browse Files
- Changing search_reindex call to be more inline with DRF convention · b597df2e
  Dino Cikatic committed Feb 24, 2015
  
  b597df2e Browse Files
- Move internal documentation to the internal documentation directory · 1b7e8b78
  Ned Batchelder committed Feb 24, 2015
  
  1b7e8b78 Browse Files
- Merge pull request #7083 from edx/ned/readme-rst · a76e5c68
```
Convert README.md to README.rst
```
  Ned Batchelder committed Feb 24, 2015
  a76e5c68 Browse Files
- Merge pull request #7070 from edx/benp/fix-tnl1479 · 954d8ed9
```
Wait for DOM to reflect the selected option.
```
  Ben Patterson committed Feb 24, 2015
  954d8ed9 Browse Files
- Merge pull request #7080 from edx/adam/merge-release-into-master · 0b9e5719
```
Adam/merge release into master
```
  Adam committed Feb 24, 2015
  0b9e5719 Browse Files