Commits · 55de42d19c0e18047240c369a7955e4aed275b0f · edx / edx-platform · GitLab

25 Nov, 2014 2 commits
- Fix PEP8: E122 continuation line missing · 55de42d1
```
indentation or outdented
```
  stv committed Nov 24, 2014
  55de42d1 Browse Files
- Fix PEP8: E121 continuation line indentation · dff5772c
```
is not a multiple of four
```
  stv committed Nov 24, 2014
  dff5772c Browse Files
15 Nov, 2014 1 commit
- Merge pull request #5956 from edx/mobile/analytics-shim-update · ec74398d
```
MA-90 Update Analytics Shim to match new mobile requirements.
```
  Nimisha Asthagiri committed Nov 14, 2014
  ec74398d Browse Files
14 Nov, 2014 11 commits
- Merge pull request #5960 from edx/jeskew/default_asset_collection_name · 126747fe
```
Always create an asset metadata collection in the Mongo modulestore.
```
  John Eskew committed Nov 14, 2014
  126747fe Browse Files
- Merge pull request #5885 from edx/sarina/name-branded-assets-in-lms · 810df8b7
```
Consistently name branded assets in lms
```
  Sarina Canelake committed Nov 14, 2014
  810df8b7 Browse Files
- Merge pull request #5957 from edx/adam/disable-purchase-button-on-click · 3f5c824b
```
disable "go to payment button" on click (ECOM-643)
```
  Adam committed Nov 14, 2014
  3f5c824b Browse Files
- disable "go to payment button" on click (ECOM-643) · bc8d0a99
  Adam Palay committed Nov 14, 2014
  
  bc8d0a99 Browse Files
- Merge pull request #5941 from edx/studio-images · 559f1e19
```
Moved Studio images from img/ directory to images/ directory
```
  David Baumgold committed Nov 14, 2014
  559f1e19 Browse Files
- Translate "Powered by Open edX" string · ab54f9cf
  Sarina Canelake committed Nov 14, 2014
  
  ab54f9cf Browse Files
- Consistently name edX branded elements within the LMS [OPEN-300] · ab5da97c
  Sarina Canelake committed Nov 14, 2014
  
  ab5da97c Browse Files
- Merge pull request #5955 from edx/sanchez/fix-djfs-dependency · a84e4598
```
Fix the DJFS dependency.
```
  Stephen Sanchez committed Nov 14, 2014
  a84e4598 Browse Files
- Always create an asset metadata collection in the Mongo modulestore. · 546d81a8
```
If no collection name is specified, use a default name.
https://openedx.atlassian.net/browse/PLAT-294
```
  John Eskew committed Nov 14, 2014
  546d81a8 Browse Files
- Merge pull request #5953 from edx/jeskew/created_by_on_addition · 600e7bf3
```
Add created_on and created_by to asset metadata storage.
```
  John Eskew committed Nov 14, 2014
  600e7bf3 Browse Files
- Merge pull request #5954 from edx/benp/mysql56-test-updates · 3ae312ca
```
Don't use 'test' db for mysql since it's reserved.
```
  Ben Patterson committed Nov 13, 2014
  3ae312ca Browse Files
13 Nov, 2014 12 commits
- MA-90 Update Analytics Shim to match new mobile requirements. · 07d50ba7
  Nimisha Asthagiri committed Nov 13, 2014
  
  07d50ba7 Browse Files
- Fix the DJFS dependency. · 3396b2bb
  stephensanchez committed Nov 13, 2014
  
  3396b2bb Browse Files
- Merge pull request #5946 from edx/sanchez/ecommerce_info_to_ga · 66ff4e67
```
Adding new Google Analytics eCommerce event to shoppingcart.
```
  Stephen Sanchez committed Nov 13, 2014
  66ff4e67 Browse Files
- Add created_on and created_by to asset metadata storage. · 872faddb
```
https://openedx.atlassian.net/browse/PLAT-278
```
  John Eskew committed Nov 13, 2014
  872faddb Browse Files
- Don't use 'test' db for mysql since it's reserved. · a19b97c6
```
This db name is reserved and used by mysql installations. This can cause
conflicts when trying to populate our own 'test' database on mysql.
```
  Ben Patterson committed Nov 13, 2014
  a19b97c6 Browse Files
- Merge pull request #5940 from edx/jeskew/mixed_copy_assets_between_modulestores · a4fea913
```
One bok_choy video test is failing - but it passes locally and should be fine.
```
  John Eskew committed Nov 13, 2014
  a4fea913 Browse Files
- Adding new Google Analytics eCommerce event to shoppingcart. · 822f1554
```
Adding new event and test

pylint and comments
```
  stephensanchez committed Nov 13, 2014
  822f1554 Browse Files
- Enable cross-modulestore copying of course asset metadata. · a2cc8d99
```
https://openedx.atlassian.net/browse/PLAT-38
```
  John Eskew committed Nov 13, 2014
  a2cc8d99 Browse Files
- Merge pull request #5943 from edx/benp/db-cache-mysql56 · 3f7d0f24
```
Improve compatibility with additional mysql installations.
```
  Ben Patterson committed Nov 13, 2014
  3f7d0f24 Browse Files
- Merge pull request #5939 from edx/split/course_asset · 51927808
```
Paging and sorting for assets
```
  Don Mitchell committed Nov 13, 2014
  51927808 Browse Files
- Merge branch 'release' · 43d8c7a7
```
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
```
  David Ormsbee committed Nov 13, 2014
  43d8c7a7 Browse Files
- Improve compatibility with additional mysql installations. · 8e2d7942
```
Some mysql debian packages do not grant mysql user as many permissions, and
we need to add them.
```
  Ben Patterson committed Nov 12, 2014
  8e2d7942 Browse Files
12 Nov, 2014 14 commits
- Moved Studio images from img/ directory to images/ directory · e00424a0
```
OPEN-304
```
  David Baumgold committed Nov 12, 2014
  e00424a0 Browse Files
- Paging and sorting for assets · 48211388
```
PLAT-75
```
  Don Mitchell committed Nov 12, 2014
  48211388 Browse Files
- Merge pull request #5935 from edx/db/upgrade-diff-cover · a0a5746e
```
Upgrade diff-cover
```
  David Baumgold committed Nov 12, 2014
  a0a5746e Browse Files
- Merge pull request #5933 from edx/dhm/bug_tnl-764 · 978c2b24
```
Remove over optimization which didn't work correctly
```
  Don Mitchell committed Nov 12, 2014
  978c2b24 Browse Files
- Merge pull request #5853 from edx/gprice/fix-complementary · dec9e41d
```
Fix spelling of complementary role
```
  Greg Price committed Nov 12, 2014
  dec9e41d Browse Files
- Upgrade diff-cover · 3676b4f7
  David Baumgold committed Nov 12, 2014
  
  3676b4f7 Browse Files
- Remove over optimization which didn't work correctly · 326a1221
```
Added story PLAT-293 to do it correctly.
This fixes TNL-764
```
  Don Mitchell committed Nov 12, 2014
  326a1221 Browse Files
- Merge pull request #5720 from edx/sanchez/avoid_event_suppression · fc8b2a5f
```
Changing event suppression to signal suppression.
```
  Stephen Sanchez committed Nov 12, 2014
  fc8b2a5f Browse Files
- Changing event suppression to signal suppression. · 6e85ec07
```
Code review changes.

Fix test and pylint.

pylint error.

Updating the test to verify the signal is fired.

Test for all analytics events

Import pylint error.

Pylint error
```
  stephensanchez committed Nov 12, 2014
  6e85ec07 Browse Files
- Merge pull request #5814 from edx/disable-pylint-todo-comments · d981f98b
```
Pylint: ignore TODO comments
```
  David Baumgold committed Nov 12, 2014
  d981f98b Browse Files
- Merge pull request #5838 from edx/dsjen/feature-flag-analytics-enrollments · dd38f523
```
Feature flagged enrollment counts on instructor dashboard.
```
  Dennis Jen committed Nov 12, 2014
  dd38f523 Browse Files
- Merge pull request #5928 from edx/diana/fix-pylint-complaint · 1a4ad061
```
Fix pylint violation.
```
  David Ormsbee committed Nov 12, 2014
  1a4ad061 Browse Files
- Merge pull request #5921 from edx/gprice/fix-oauth-token-login · 3651f2c0
```
Fix OAuth token login endpoint to set session user
```
  Nimisha Asthagiri committed Nov 12, 2014
  3651f2c0 Browse Files
- Fix pylint violation. · da5bfd45
  Diana Huang committed Nov 12, 2014
  
  da5bfd45 Browse Files