Commits · 3e0f08ebc2efe05ec581b5e0f3899bf5e4e58f98 · edx / edx-platform

12 Jan, 2015 2 commits
- Studio support for creating and editing libraries (PR 6046) · 3e0f08eb
```
SOL-1, SOL-2, SOL-3
```
  Braden MacDonald committed Jan 12, 2015
  3e0f08eb Browse Files
- Merge pull request #6368 from sjackso/login_error_fix · 80e0d56a
```
Login error fix TNL-140
```
  Waqas Khalid committed Jan 12, 2015
  80e0d56a Browse Files
11 Jan, 2015 2 commits
- Merge pull request #6546 from edx/renzo/fix-jasmine-tests · 7a9ec6bd
```
Prevent Jasmine tests from redirecting in dev mode
```
  Renzo Lucioni committed Jan 11, 2015
  7a9ec6bd Browse Files
- Prevent Jasmine tests from redirecting in dev mode · 8ef0e77e
```
Also prevent Jasmine from attempting to load deleted templates
```
  Renzo Lucioni committed Jan 11, 2015
  8ef0e77e Browse Files
10 Jan, 2015 4 commits
- Merge pull request #6352 from edx/gprice/video-upload-csv · 66e6d1cf
```
Add CSV download button to Studio video upload page
```
  Nimisha Asthagiri committed Jan 09, 2015
  66e6d1cf Browse Files
- Studio video upload CSV download changes. · 4b53f4df
  Nimisha Asthagiri committed Jan 09, 2015
  
  4b53f4df Browse Files
- Add download button to Studio video upload page · 8d8ca83d
```
The button downloads the CSV data containing all video URLs.
```
  Greg Price committed Jan 09, 2015
  8d8ca83d Browse Files
- Add URL download endpoint for Studio video uploads · 4e192512
```
The endpoint returns an Excel-dialect CSV file for download.
```
  Greg Price committed Jan 09, 2015
  4e192512 Browse Files
09 Jan, 2015 32 commits
- Merge pull request #6508 from edx/renzo/split-payment-verification-fixes · cc306843
```
Fix cosmetic issues with the split payment and verification flow
```
  Renzo Lucioni committed Jan 09, 2015
  cc306843 Browse Files
- Merge pull request #6529 from edx/release · 47f32522
```
Merge release back into master
```
  Dennis Jen committed Jan 09, 2015
  47f32522 Browse Files
- Merge pull request #6522 from edx/zoldak/video-troubleshooting · ff4f0787
```
Add debug logging to video tests
```
  Jesse Zoldak committed Jan 09, 2015
  ff4f0787 Browse Files
- Merge pull request #6524 from edx/hotfix/2014-01-09 · 0e03834d
```
Handle children pointers to non-existent children in has_changes
```
  Dennis Jen committed Jan 09, 2015
  0e03834d Browse Files
- Merge pull request #6537 from edx/translate-brands · 03d20e09
```
Translate link titles
```
  David Baumgold committed Jan 09, 2015
  03d20e09 Browse Files
- Translate link titles · a6f3edca
  David Baumgold committed Jan 09, 2015
  
  a6f3edca Browse Files
- Merge pull request #6533 from edx/social-icon-classes · 3b9001fc
```
Make all the social links show icons
```
  David Baumgold committed Jan 09, 2015
  3b9001fc Browse Files
- Make all the social links show icons · 7fe267b2
  David Baumgold committed Jan 09, 2015
  
  7fe267b2 Browse Files
- Fix cosmetic issues with the split payment and verification flow · 10cb7f10
```
Use honor code ribbon if verification status is not missing, submitted, or approved; title column on payment confirmation page holding dollar amounts more appropriately
```
  Renzo Lucioni committed Jan 09, 2015
  10cb7f10 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
- Handle children pointers to non-existent children in has_changes · a9697556
```
TNL-1141
```
  Don Mitchell committed Jan 09, 2015
  a9697556 Browse Files
- Merge pull request #6512 from edx/hotfix/2015-01-09b · 592665cc
```
fix studio templating errors
```
  Dennis Jen committed Jan 09, 2015
  592665cc 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
- Add debug logging to video tests · e77acdf4
  Jesse Zoldak committed Jan 09, 2015
  
  e77acdf4 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
- fix studio templating errors · 63431d1f
  Adam Palay committed Jan 08, 2015
  
  63431d1f Browse Files