Commits · 7e45858276a5c41a337b9d98e4bfe3f4ae31c1b4 · edx / edx-platform · GitLab

12 Jan, 2015 13 commits
- resolve merge conflicts between release and master · 7e458582
  Adam Palay committed Jan 12, 2015
  
  7e458582 Browse Files
- Merge pull request #6554 from edx/hotfix/2015-01-12 · 0435289a
```
Hotfix/2015 01 12
```
  Adam committed Jan 12, 2015
  0435289a Browse Files
- Merge pull request #6447 from edx/markhoeber-doc1437 · 75a26a7e
```
Enrollment API Doc
```
  Mark Hoeber committed Jan 12, 2015
  75a26a7e Browse Files
- Merge pull request #6553 from edx/sarina/20150112-translations-update · 484ce3ed
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Jan 12, 2015
  484ce3ed Browse Files
- Enrollment API Doc · a28fd30b
  Mark Hoeber committed Jan 12, 2015
  
  a28fd30b Browse Files
- Merge pull request #6501 from edx/adam/update-copy-date · 8dd7b780
```
update copyright dates
```
  Adam committed Jan 12, 2015
  8dd7b780 Browse Files
- Merge pull request #6530 from edx/zoldak/fix-annotation-test · a8adce13
```
Fix flakiness on annotation selenium test
```
  Jesse Zoldak committed Jan 12, 2015
  a8adce13 Browse Files
- Update translations (autogenerated message) · 55d85ad6
  Sarina Canelake committed Jan 12, 2015
  
  55d85ad6 Browse Files
- Merge pull request #6521 from edx/aamir-khan/ECOM-528-donation-verified-courses · ab06f37c
```
Aamir khan/ecom 528 donation verified courses
```
  Aamir committed Jan 12, 2015
  ab06f37c Browse Files
- fix es translation · cc617158
  Sarina Canelake committed Jan 12, 2015
  
  cc617158 Browse Files
- Add a fix_not_found command to get rid · 2bf39667
```
of dangling children references to blocks.
TNL-1141
```
  Don Mitchell committed Jan 12, 2015
  2bf39667 Browse Files
- ECOM-528 updated the test cases · 62ea4865
  arbisoft committed Jan 12, 2015
  
  62ea4865 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 5 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
- ECOM-528 code refactoring · 50961fe5
  arbisoft committed Jan 10, 2015
  
  50961fe5 Browse Files
09 Jan, 2015 20 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 flakiness on annotation selenium test · 586d7980
  Jesse Zoldak committed Jan 09, 2015
  
  586d7980 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