Commits · 789a9dc978ba5f0b0c759d71b217cf2fbf9090ce · edx / edx-platform · GitLab

10 Dec, 2014 17 commits
- Change the default dir for loading xml files. · 789a9dc9
```
This should always be overridden by the testcases if needed.
```
  Jesse Zoldak committed Dec 10, 2014
  789a9dc9 Browse Files
- Merge pull request #6173 from edx/clytwynec/add_find_fixme_method · 5007e980
```
add find_fixme task
```
  Christine Lytwynec committed Dec 10, 2014
  5007e980 Browse Files
- Merge pull request #5961 from edx/dan-f/cohort-csv-upload · 77f5d90d
```
Upload CSV file for cohorting students
```
  Christina Roberts committed Dec 10, 2014
  77f5d90d Browse Files
- Updating testing.md for find_fixme · 7cb26650
  Christine Lytwynec committed Dec 10, 2014
  
  7cb26650 Browse Files
- add find_fixme task · 7f23c88d
  Christine Lytwynec committed Dec 10, 2014
  
  7f23c88d Browse Files
- Support cohorting students via a CSV File. · 3d91f430
```
TNL-735
```
  Daniel Friedman committed Dec 10, 2014
  3d91f430 Browse Files
- Merge pull request #6135 from edx/sarina/categorize-common-images · dfc4da15
```
Clean up common/ images - moving, deleting, renaming as necessary
```
  Sarina Canelake committed Dec 09, 2014
  dfc4da15 Browse Files
- Replace 'mit_dome.jpg' and 'simple_graph.png' with a default placeholder image · db09c552
  Sarina Canelake committed Dec 09, 2014
  
  db09c552 Browse Files
- Rename pl-faculty.png to placeholder-faculty.png · 7779f742
```
OPEN-328
```
  Sarina Canelake committed Dec 09, 2014
  7779f742 Browse Files
- Move wiki icons to the LMS, where they are used · 5106710d
```
OPEN-328
```
  Sarina Canelake committed Dec 09, 2014
  5106710d Browse Files
- Remove duplicate image files · 0c535e44
```
spinner.gif and spinner-on-grey.gif are the same file.
Explicitly give the LMS a spinner.gif file.

OPEN-328
```
  Sarina Canelake committed Dec 09, 2014
  0c535e44 Browse Files
- Remove image that is duplicated in LMS and CMS · f5588ed4
```
OPEN-328
```
  Sarina Canelake committed Dec 09, 2014
  f5588ed4 Browse Files
- Move images from common to LMS that are only used in LMS · a790d9f8
```
OPEN-328
```
  Sarina Canelake committed Dec 09, 2014
  a790d9f8 Browse Files
- Merge pull request #6208 from edx/clintonb/release-fix · cdca3fcb
```
Corrected Import Statement
```
  Ben Patterson committed Dec 09, 2014
  cdca3fcb Browse Files
- Fix import statement. · 6e1471ed
  Ben Patterson committed Dec 09, 2014
  
  6e1471ed Browse Files
- Merge pull request #6172 from edx/mobile/update-analytics · c6f991fc
```
MA-157 Move context back into properties.
```
  Nimisha Asthagiri committed Dec 09, 2014
  c6f991fc Browse Files
- Corrected Import Statement · 947064f6
  Clinton Blackburn committed Dec 09, 2014
  
  947064f6 Browse Files
09 Dec, 2014 23 commits
- MA-157 Mobile analytics end-to-end. · a6003991
```
Move app-generated context back into properties.
Ignore BI events through segment's webhook.
Ignore events without Data in Properties.
```
  Nimisha Asthagiri committed Dec 09, 2014
  a6003991 Browse Files
- Merge branch 'release' · fc242ea2
```
Release 2014-12-10
```
  Clinton Blackburn committed Dec 09, 2014
  fc242ea2 Browse Files
- Merge pull request #6203 from edx/jeskew/fix_pylint_error · ea18e5c3
```
Fix assert.
```
  Clinton Blackburn committed Dec 09, 2014
  ea18e5c3 Browse Files
- Fix assert. · 2c09c567
```
Assert mistakenly had comma instead of double-equal - now correct.
```
  John Eskew committed Dec 09, 2014
  2c09c567 Browse Files
- Merge pull request #6014 from edx/sarina/legacy-dash-cleanup · 69fd063d
```
Legacy dash cleanup
```
  Sarina Canelake committed Dec 09, 2014
  69fd063d Browse Files
- Merge pull request #6151 from edx/adam/add-defunct-states-for-cart · 46545935
```
Adam/add defunct states for cart
```
  Adam committed Dec 09, 2014
  46545935 Browse Files
- Style cleanups: legacy instructor dashboard · a1c8f8c4
  Sarina Canelake committed Dec 09, 2014
  
  a1c8f8c4 Browse Files
- LMS: adding in basic is-deprecated visual styling · a5913a48
  Brian Talbot committed Dec 09, 2014
  
  a5913a48 Browse Files
- Only show "Course Statistics at a Glance" in the Admin tab · 919e411f
  Sarina Canelake committed Dec 09, 2014
  
  919e411f Browse Files
- Clean up Datadump section on legacy dashboard · bfa8349e
  Sarina Canelake committed Dec 09, 2014
  
  bfa8349e Browse Files
- Remove deprecated cohorts management on legacy dashboard · 5aeb412b
  Sarina Canelake committed Dec 09, 2014
  
  5aeb412b Browse Files
- Clean up Manage Groups section on legacy dashboard · 762b0d9b
  Sarina Canelake committed Dec 09, 2014
  
  762b0d9b Browse Files
- Add CSS rules for legacy dash deprecation warnings · 34746013
  Sarina Canelake committed Dec 09, 2014
  
  34746013 Browse Files
- Clean up Email section of legacy dashboard · e3179c37
  Sarina Canelake committed Dec 09, 2014
  
  e3179c37 Browse Files
- Clean up Forum Admin section of legacy dashboard · d4a06794
  Sarina Canelake committed Dec 09, 2014
  
  d4a06794 Browse Files
- Clean up Admin section of legacy dashboard · 5d7f820d
  Sarina Canelake committed Dec 09, 2014
  
  5d7f820d Browse Files
- Clean up Grade Downloads section of legacy dash · d8904d90
  Sarina Canelake committed Dec 09, 2014
  
  d8904d90 Browse Files
- Remove Grade Adjustment code from legacy dash · a15110f0
  Sarina Canelake committed Dec 09, 2014
  
  a15110f0 Browse Files
- Rename legacy dash template · 0a5af2a3
  Sarina Canelake committed Dec 09, 2014
  
  0a5af2a3 Browse Files
- add 'defunct' states for shoppingcart (ECOM-737) · abdae826
```
add retire method to order class
```
  Adam Palay committed Dec 09, 2014
  abdae826 Browse Files
- Merge pull request #6200 from edx/jeskew/fix_500_error_mongo_fmt_change · 9a309448
```
Upon fail-over check, change asset metadata document to new format.
```
  Clinton Blackburn committed Dec 09, 2014
  9a309448 Browse Files
- Upon fail-over check, change asset metadata document to new format. · 755241f5
  John Eskew committed Dec 09, 2014
  
  755241f5 Browse Files
- Merge pull request #5829 from edx/jmclaus/load_ova_js_from_templates_with_requirejs · 910466e0
```
In LMS, load OVA JS only in four OVA templates with requireJS. [TNL-693-outdated]
```
  jmclaus committed Dec 09, 2014
  910466e0 Browse Files