Commits · 586d798069b3f309461e9a772aa7eeccb86509e6 · edx / edx-platform · GitLab

09 Jan, 2015 21 commits
- Fix flakiness on annotation selenium test · 586d7980
  Jesse Zoldak committed Jan 09, 2015
  
  586d7980 Browse Files
- Merge pull request #6515 from edx/talbs/fix-update-font-awesome · c9381796
```
FIX: Upgrade Font Awesome - Part III: Revenge of the Glyph
```
  Brian Talbot committed Jan 09, 2015
  c9381796 Browse Files
- Merge pull request #6528 from edx/ormsbee/coursemodes_admin · 5abf2e78
```
Add search, sort, and slug dropdown to Course Modes admin.
```
  David Ormsbee committed Jan 09, 2015
  5abf2e78 Browse Files
- fixing styling and class syntax (to new FA-based classes) for missing UI elements · f128629f
  Brian Talbot committed Jan 09, 2015
  
  f128629f Browse Files
- Merge pull request #6484 from edx/sarina/move-branded-lms-assets · 76660e3a
```
Remove edX branding from default Open edX LMS [OPEN-307]
```
  Sarina Canelake committed Jan 09, 2015
  76660e3a Browse Files
- Add search, sort, and slug dropdown to Course Modes admin. · 18495e97
  David Ormsbee committed Jan 09, 2015
  
  18495e97 Browse Files
- Merge pull request #6523 from edx/static-templates-i18n · 72133b77
```
Improve i18n for static_templates
```
  David Baumgold committed Jan 09, 2015
  72133b77 Browse Files
- Remove i18n · d25a2837
```
Since this is a test file
```
  David Baumgold committed Jan 09, 2015
  d25a2837 Browse Files
- Move default Open edX branding into default-theme directory · cae70d99
```
OPEN-307
```
  Sarina Canelake committed Jan 09, 2015
  cae70d99 Browse Files
- Move edx branding into edx-theme directory · 6f5134f7
```
OPEN-307
```
  Sarina Canelake committed Jan 09, 2015
  6f5134f7 Browse Files
- Remove edX branding from default Open edX LMS · 314c9353
```
OPEN-307
```
  Sarina Canelake committed Jan 09, 2015
  314c9353 Browse Files
- Merge pull request #6495 from edx/mobile/MA-212 · fe40fa6d
```
MA-212 Mobile API support for backward compatibility of course updates.
```
  Nimisha Asthagiri committed Jan 09, 2015
  fe40fa6d Browse Files
- Improve i18n for static_templates · b297b839
  David Baumgold committed Jan 09, 2015
  
  b297b839 Browse Files
- Merge pull request #4274 from edx/db/update-pylint · 582d1e12
```
Update pylint to 1.4.0
```
  David Baumgold committed Jan 09, 2015
  582d1e12 Browse Files
- Merge pull request #6071 from edx/muhhshoaib/WL-135-add-expiration-dates-to-Coupon-codes · c5746e6d
```
Add expiration dates to Coupon Codes
```
  chrisndodge committed Jan 09, 2015
  c5746e6d Browse Files
- Merge pull request #6513 from edx/release · 17c2af23
```
Merge release back into master
```
  Dennis Jen committed Jan 09, 2015
  17c2af23 Browse Files
- Merge pull request #6509 from edx/zoldak/fix-textbook-test · d2912705
```
Fix flaky textbook upload lettuce tests
```
  Jesse Zoldak committed Jan 09, 2015
  d2912705 Browse Files
- Merge pull request #6475 from edx/waheed/tnl1070-Ordering-is-not-enforced · 72a2998e
```
Enforced '000' prefix for xmodule.js and added unit test.
```
  Waheed Ahmed committed Jan 09, 2015
  72a2998e Browse Files
- Enforced '000' prefix for xmodule.js and added unit test. · 18f3221d
```
TNL-1070
```
  Waheed Ahmed committed Jan 09, 2015
  18f3221d Browse Files
- WL-135 added the migration for the expiration_date field in the coupons model · 10f8d8c0
```
added the functionality of adding the expiration date, and also handled in the shopping cart when the user try to add the expired coupon code in the shopping cart

added expiration date in the coupons list in the ecommerce page

added the unit tests and jasmine tests

fix the quality issues and rebased with master

regenerated the migration file with a different number

i18n and verified te course mode

changes suggested by  stephan
```
  Muhammad Shoaib committed Jan 09, 2015
  10f8d8c0 Browse Files
- Merge pull request #6507 from edx/hotfix/2015-01-09 · 240c2953
```
set studio_name in aws.py (TNL-1138)
```
  Adam committed Jan 08, 2015
  240c2953 Browse Files
08 Jan, 2015 19 commits
- Fix flaky textbook upload lettuce tests · 3efb377d
  Jesse Zoldak committed Jan 08, 2015
  
  3efb377d Browse Files
- Merge pull request #6489 from edx/replace-edx-platform-name · 30b572b1
```
Replace "edX" with {platform_name}
```
  David Baumgold committed Jan 08, 2015
  30b572b1 Browse Files
- set studio_name in aws.py (TNL-1138) · 62157f37
  Adam Palay committed Jan 08, 2015
  
  62157f37 Browse Files
- Update pylint to 1.4.0 · d6b187d1
  David Baumgold committed Jan 08, 2015
  
  d6b187d1 Browse Files
- Merge pull request #6504 from edx/release-merge-test · 4a37648f
```
Merge release (2015-01-08) into master
```
  Dennis Jen committed Jan 08, 2015
  4a37648f Browse Files
- Merge branch 'release' · d2660e53
```
Conflicts:
	lms/templates/verify_student/make_payment_step.underscore
```
  Dennis Jen committed Jan 08, 2015
  d2660e53 Browse Files
- Merge pull request #6403 from edx/clytwynec/remove_lynx_from_bulk_email · 66228224
```
Mock html_to_text.py for unit tests
```
  Christine Lytwynec committed Jan 08, 2015
  66228224 Browse Files
- Merge pull request #6252 from edx/studio-move-branded · 1b02ed5d
```
Placeholder image for Open edX Studio logo, when not running on edx.org
```
  David Baumgold committed Jan 08, 2015
  1b02ed5d Browse Files
- Placeholder image for Open edX Studio logo, when not running on edx.org · 96d86e4e
  David Baumgold committed Jan 08, 2015
  
  96d86e4e Browse Files
- Replace "edX" with {platform_name} · 44b792ab
  David Baumgold committed Jan 08, 2015
  
  44b792ab Browse Files
- Merge pull request #6491 from edx/benp/add-cleanup-paver-tests · f7e1bfe7
```
Stop mocks after test.
```
  Ben Patterson committed Jan 08, 2015
  f7e1bfe7 Browse Files
- Merge pull request #6487 from edx/remove-linkedin-integration · a54bff29
```
Remove LinkedIn integration
```
  David Baumgold committed Jan 08, 2015
  a54bff29 Browse Files
- MA-212 Mobile API support for backward compatibility of course updates. · 3498eeb1
  Nimisha Asthagiri committed Jan 08, 2015
  
  3498eeb1 Browse Files
- Merge pull request #6486 from edx/emails-remove-edx · ed2afa8a
```
clean up reject_name_change email template a bit
```
  David Baumgold committed Jan 08, 2015
  ed2afa8a Browse Files
- Merge pull request #6485 from edx/discussion-platform-name · 6efe0ac3
```
Use {platform_name} in discussions header
```
  David Baumgold committed Jan 08, 2015
  6efe0ac3 Browse Files
- Merge pull request #6214 from edx/ammar/tnl498 · a7339ce7
```
Get students experiments, groups, and cohorts
```
  Muhammad Ammar committed Jan 08, 2015
  a7339ce7 Browse Files
- Get students experiments, groups, and cohorts · 5ba492ec
```
TNL-498
```
  muhammad-ammar committed Jan 08, 2015
  5ba492ec Browse Files
- Merge pull request #6193 from Shrhawk/shr/bug/TNL-952-customresponse-sorting_issue · 58fd7a92
```
Fix sorting issue
```
  Shrhawk committed Jan 08, 2015
  58fd7a92 Browse Files
- Merge pull request #6398 from edx/mobile/MA-199 · 3c274e28
```
MA-199 Course Authorization framework in mobile API
```
  Nimisha Asthagiri committed Jan 07, 2015
  3c274e28 Browse Files