Commits · 41e84a58dd5ff62df22c779948f674201daa6dc2 · edx / edx-platform · GitLab

18 May, 2015 10 commits
- Skip flaky test. SOL-618. · 41e84a58
  Ben Patterson committed May 18, 2015
  
  41e84a58 Browse Files
- Merge pull request #8083 from… · fe3326d8
```
Merge pull request #8083 from edx/muhhshoaib/MAYN-68-total-in-instrucor-dashboard-doesnt-include-multi-seats-purchases

MAYN-68 fixed the bug, total credit card purchases amount does not include the bulk purchases.
```
  chrisndodge committed May 18, 2015
  fe3326d8 Browse Files
- Merge pull request #8071 from edx/db/remove-sample-feature-flag · ffd5c1fc
```
The SAMPLE feature flag is not used anywhere
```
  David Baumgold committed May 18, 2015
  ffd5c1fc Browse Files
- Merge pull request #8035 from edx/talbs/sass+css-file-names · 11ca11a4
```
LMS/Studio: Sync Up Sass/CSS/Pipeline Names
```
  Brian Talbot committed May 18, 2015
  11ca11a4 Browse Files
- Merge pull request #8043 from edx/dcikatic/SOL-487-filter-staff-view-rebase · 20a32a7e
```
Dcikatic/sol 487 filter staff view (rebase against master)
```
  Martyn James committed May 18, 2015
  20a32a7e Browse Files
- Merge pull request #7997 from openfun/rmoch/i18n_problem_explanation_title · 3f739b05
```
i18n lon-capa problem explanation title
```
  Sarina Canelake committed May 18, 2015
  3f739b05 Browse Files
- Add Richard Moch to AUTHORS · 8ce222ed
  Richard Moch committed May 18, 2015
  
  8ce222ed Browse Files
- i18n lon-capa problem explanation title · 3e0342cb
  Richard Moch committed May 18, 2015
  
  3e0342cb Browse Files
- MAYN-68 fixed the bug, total credit card purchases amount does not include the bulk purchases. · 392937d9
  Muhammad Shoaib committed May 18, 2015
  
  392937d9 Browse Files
- Merge pull request #8020 from edx/aamir-khan/ECOM-1471-hidden-text-behind-cam-issue · 41363ead
```
ECOM-1471 Hiding the text.
```
  Awais Qureshi committed May 18, 2015
  41363ead Browse Files
15 May, 2015 29 commits
- Merge pull request #7750 from edx/danielli/recommender_xml · 4f531f6f
```
fix recommender olx parsing
```
  swdanielli committed May 15, 2015
  4f531f6f Browse Files
- Merge pull request #7595 from jolyonb/jolyonb/printing_cleanup · b6164b57
```
Complete Printing Cleanup
```
  Marco Morales committed May 15, 2015
  b6164b57 Browse Files
- Merge pull request #8068 from edx/db/remove-mathplayer-message · 8a7c2d66
```
Remove MathPlayer message
```
  David Baumgold committed May 15, 2015
  8a7c2d66 Browse Files
- Merge pull request #8056 from edx/clytwynec/TE-868 · 8f22b511
```
use mock_open for paver quality tests
```
  Christine Lytwynec committed May 15, 2015
  8f22b511 Browse Files
- Merge pull request #8057 from edx/db/reorg-main-html-imports · 90daffe3
```
Reorganize imports in main HTML templates for Studio and LMS
```
  David Baumgold committed May 15, 2015
  90daffe3 Browse Files
- Merge pull request #8055 from edx/diana/team-advanced-setting · b147117d
```
New teams advanced setting
```
  Diana Huang committed May 15, 2015
  b147117d Browse Files
- Merge pull request #7996 from edx/shr/bug/TNL-2119-Unicode-error-in-templating-bulk-course · dd20badc
```
bulk_email fix course_image_unicode name
```
  Shrhawk committed May 15, 2015
  dd20badc Browse Files
- Add "Teams Configuration" advanced setting · 358aa775
  Andy Armstrong committed May 15, 2015
  
  358aa775 Browse Files
- update xml · 09b7fee3
```
the xml parsing was out-of-date and we fix it
```
  swdanielli committed May 15, 2015
  09b7fee3 Browse Files
- Merge pull request #8062 from edx/ahsan/AC-108-no-role-inside-courseware-lms · e7a348d6
```
No role inside of courseware
```
  Ahsan Ulhaq committed May 15, 2015
  e7a348d6 Browse Files
- Merge pull request #8072 from edx/sarina/20150515-translations-update · a01e92c2
```
Update translations (autogenerated message)
```
  Sarina Canelake committed May 15, 2015
  a01e92c2 Browse Files
- Update translations (autogenerated message) · 87954cd1
  Sarina Canelake committed May 15, 2015
  
  87954cd1 Browse Files
- The SAMPLE feature flag is not used anywhere · 2e1534d7
  David Baumgold committed May 15, 2015
  
  2e1534d7 Browse Files
- Merge pull request #8067 from edx/talbs/lms-update-browser-links · 99a30539
```
LMS: Keeping Browser Linkage Fresh to Death
```
  Brian Talbot committed May 15, 2015
  99a30539 Browse Files
- Reorganize imports in main HTML templates for Studio and LMS · 85839b58
  David Baumgold committed May 15, 2015
  
  85839b58 Browse Files
- Merge pull request #8060 from edx/ned/add-supers · e97b94bd
```
Add super() calls to setUp/tearDown that are missing them
```
  Ned Batchelder committed May 15, 2015
  e97b94bd Browse Files
- Remove MathPlayer message · c3095235
  David Baumgold committed May 15, 2015
  
  c3095235 Browse Files
- LMS: updating recommended/modern browser links · 76fa4852
  Brian Talbot committed May 15, 2015
  
  76fa4852 Browse Files
- Merge pull request #7794 from edx/clee/gated_content_mobile_api · a57f0d74
```
MA-635 Block Mobile Content for unfulfilled milestones
```
  Christopher Lee committed May 15, 2015
  a57f0d74 Browse Files
- Merge pull request #8061 from edx/talbs/update-ie-conditionals · 3e247cd6
```
LMS/Studio: Update Use of IE Conditional Comments
```
  Brian Talbot committed May 15, 2015
  3e247cd6 Browse Files
- Merge pull request #7956 from edx/muzaffar/tnl2047-profile-tweaks · ab912fa8
```
Learner Profile page tweaks.
```
  Muzaffar yousaf committed May 15, 2015
  ab912fa8 Browse Files
- start paver quality tests with clean paver task environment · 71bc1476
  Christine Lytwynec committed May 15, 2015
  
  71bc1476 Browse Files
- MA-635 Block Mobile Content for unfulfilled milestones · 5cef287c
```
Previously, the mobile api did not check for pre-requisite courses
or entrance exams. This change checks for these milestones and then
returns course content accordingly.
```
  christopher lee committed May 15, 2015
  5cef287c Browse Files
- Updating the django-countries version to support sorting. · cae5623f
```
Adding the pyuca to support sorting in differnet languages.

TNL-2047
```
  muzaffaryousaf committed May 15, 2015
  cae5623f Browse Files
- Sending preferences and accounts data to template. · 378cf9bb
```
Fixing the pencil icon issue.

TNL-2047
```
  muzaffaryousaf committed May 15, 2015
  378cf9bb Browse Files
- Learner Profile page tweaks. · 2d08d669
```
TNL-2047
```
  muzaffaryousaf committed May 15, 2015
  2d08d669 Browse Files
- No role inside of courseware · 79228585
```
AC-108
```
  Ahsan Ulhaq committed May 15, 2015
  79228585 Browse Files
- Studio: updating use of IE-conditional comments · bac56af7
```
* to reflect support for IE10 and above
* to only flag IE9 (for emergency's sake) with specific html class attrs
```
  Brian Talbot committed May 14, 2015
  bac56af7 Browse Files
- LMS: updating use of IE-conditional comments · aad7c52f
```
* to reflect support for IE10 and above
* to only flag IE9 (for emergency's sake) with specific html class attrs
* to remove HTML5 shiv that's not needed for IE10 and above
```
  Brian Talbot committed May 14, 2015
  aad7c52f Browse Files
14 May, 2015 1 commit
- Add super() calls to setUp/tearDown that are missing them · 78e9445a
```
Also, I replaced a number of tearDown methods with addCleanup instead.
And also remove some unneeded patch.stopall() calls.
```
  Ned Batchelder committed May 14, 2015
  78e9445a Browse Files