Commits · a2cc8d994aee36ea6bbfaf90f548f504a776007b · edx / edx-platform · GitLab

13 Nov, 2014 3 commits
- 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 #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
12 Nov, 2014 18 commits
- 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
- Merge pull request #5881 from edx/christina/notification-requirejs · 24039fb8
```
Use factory file so JS used by studio_xblock_wrapper.html goes through RequireJS Optimizer
```
  Christina Roberts committed Nov 12, 2014
  24039fb8 Browse Files
- Merge pull request #5913 from edx/adam/prevent-accidental-course-mode-downgrade · 4486ce35
```
Prevent instructors from accidentally downgrading enrollment modes throu...
```
  Adam committed Nov 12, 2014
  4486ce35 Browse Files
- Merge pull request #5922 from edx/cdodge/fix-import-error · 257b22e2
```
try importing the exact references we need rather than deferencing it fr...
```
  chrisndodge committed Nov 12, 2014
  257b22e2 Browse Files
- Merge pull request #5923 from edx/zub/bugfix/wl-150-survey-form-error-on-info-page · 6dae34a3
```
avoid annonymous user from redirecting to survey form
```
  zubair-arbi committed Nov 12, 2014
  6dae34a3 Browse Files
- try importing the exact references we need rather than deferencing it from the djangoapp module · a93faad7
  Chris Dodge committed Nov 11, 2014
  
  a93faad7 Browse Files
11 Nov, 2014 16 commits
- Merge pull request #5918 from stvstnfrd/pep8/whitespace · 7ada9569
```
Fix whitespace-related PEP8 issues
```
  Sarina Canelake committed Nov 11, 2014
  7ada9569 Browse Files
- avoid annonymous user from redirecting to survey form · b7d526b9
```
WL-150
```
  zubair-arbi committed Nov 11, 2014
  b7d526b9 Browse Files
- Lower PEP8 threshold to 150 violations · bd4658e6
  stv committed Nov 10, 2014
  
  bd4658e6 Browse Files
- Fix PEP8: W291 trailing whitespace · 1164624f
  stv committed Nov 10, 2014
  
  1164624f Browse Files
- Fix PEP8: E261 at least two spaces before inline comment · cb894cf3
  stv committed Nov 10, 2014
  
  cb894cf3 Browse Files
- Fix PEP8: E251 unexpected spaces around keyword / parameter equals · 180adfed
  stv committed Nov 10, 2014
  
  180adfed Browse Files
- Fix PEP8: E241 multiple spaces after ',' · 16afc89b
  stv committed Nov 10, 2014
  
  16afc89b Browse Files
- Fix PEP8: E231 missing whitespace after '[:,]' · 500499b6
  stv committed Nov 10, 2014
  
  500499b6 Browse Files
- Fix PEP8: E226 missing whitespace around arithmetic operator · b388ab9d
  stv committed Nov 10, 2014
  
  b388ab9d Browse Files
- Fix PEP8: E225 missing whitespace around operator · 00ae4889
  stv committed Nov 10, 2014
  
  00ae4889 Browse Files
- Fix PEP8: E222 multiple spaces after operator · 41390f02
  stv committed Nov 10, 2014
  
  41390f02 Browse Files
- Fix PEP8: E221 multiple spaces before operator · 1a9f8b61
  stv committed Nov 10, 2014
  
  1a9f8b61 Browse Files
- Fix PEP8: E211 whitespace before '(' · 96ce219d
  stv committed Nov 10, 2014
  
  96ce219d Browse Files
- Fix PEP8: E203 whitespace before ':' · 02e224df
  stv committed Nov 10, 2014
  
  02e224df Browse Files
- Fix PEP8: E202 whitespace before '}' · 01960483
  stv committed Nov 10, 2014
  
  01960483 Browse Files
- Fix PEP8: E201 whitespace after '{' · 0fdf8fb2
  stv committed Nov 10, 2014
  
  0fdf8fb2 Browse Files
10 Nov, 2014 3 commits
- Fix OAuth token login endpoint to set session user · db8dd8de
  Greg Price committed Nov 10, 2014
  
  db8dd8de Browse Files
- Prevent instructors from accidentally downgrading enrollment modes through instructor dash TNL-804 · 1d85659b
  Adam Palay committed Nov 10, 2014
  
  1d85659b Browse Files
- Merge pull request #5915 from edx/alasdair/rwd-trackselection · 790ac3f3
```
ECOM-574 Updated track selection page to be responsive
```
  AlasdairSwan committed Nov 10, 2014
  790ac3f3 Browse Files