Commits · 6e47664cfdb53318f40001a7881b289e805dc5cd · edx / edx-platform · GitLab

22 Apr, 2015 9 commits
- Merge branch 'release' · 6e47664c
  cahrens committed Apr 22, 2015
  
  6e47664c Browse Files
- Merge pull request #7764 from edx/parse-time-as-standalone-function · 60795564
```
_parse_time_str can be a standalone function
```
  David Baumgold committed Apr 22, 2015
  60795564 Browse Files
- Merge pull request #7741 from edx/sarina/upgrade-django1.4.18-20 · 6050d07d
```
Upgrade Django 1.4 to latest point release
```
  Sarina Canelake committed Apr 22, 2015
  6050d07d Browse Files
- Merge pull request #7705 from edx/adjust-test_only_expected_fields_are_displayed · 220a86ef
```
Simplify test_only_expected_fields_are_displayed
```
  David Baumgold committed Apr 22, 2015
  220a86ef Browse Files
- Merge pull request #7770 from edx/talbs/rc/2015-04-22/fix-breakpoints · a0feb211
```
Fix: edx.org and Open edX breakpoint clash - ECOM-1457
```
  Brian Talbot committed Apr 22, 2015
  a0feb211 Browse Files
- Merge pull request #7766 from edx/clrux/UX-1634-sidebar-header-rtl · 4de7b8a4
```
RTL-ifying the sidebar title in Handouts
```
  Chris committed Apr 22, 2015
  4de7b8a4 Browse Files
- Merge pull request #7740 from edx/awais786/ECOM-1439-skip-icrv-model · 75d37591
```
ECOM-1439 adding new model and migration.
```
  Awais Qureshi committed Apr 22, 2015
  75d37591 Browse Files
- Merge pull request #7762 from edx/commerce-checkout-cancel · dc079435
```
Added Payment Cancellation Page
```
  Clinton Blackburn committed Apr 21, 2015
  dc079435 Browse Files
- Upgrade Django 1.4 to latest point release · b57bf4b2
  Sarina Canelake committed Apr 21, 2015
  
  b57bf4b2 Browse Files
21 Apr, 2015 15 commits
- Merge pull request #7769 from edx/christina/eventing_fix · 8a211b48
```
Don't event first_name and last_name.
```
  Christina Roberts committed Apr 21, 2015
  8a211b48 Browse Files
- fix: resolving edx.org and Open edX breakpoint clash · ded6c4db
```
* simplifying edx.org breakpoints to use min-width
* creating -bp-* centric Sass variables
* converting all existing edx.org centric media queries to use new Sass variables

ECOM-1457
```
  Brian Talbot committed Apr 21, 2015
  ded6c4db Browse Files
- Added Payment Cancellation Page · 0f84749d
```
This commit creates a new page intended only for use when the user cancels payment. The previous implementation relied on the CyberSource callback page, which is not useful for orders placed with the E-Commerce Service.
```
  Clinton Blackburn committed Apr 21, 2015
  0f84749d Browse Files
- Don't event first_name and last_name. · 4af79d6f
```
TNL-2044
```
  cahrens committed Apr 21, 2015
  4af79d6f Browse Files
- RTL-ifying the sidebar title in Handouts · f1d22311
  Chris Rodriguez committed Apr 21, 2015
  
  f1d22311 Browse Files
- _parse_time_str can be a standalone function · 764d5e6e
  David Baumgold committed Apr 21, 2015
  
  764d5e6e Browse Files
- Merge pull request #7754 from edx/usman/tnl1660-fixes · d50ed75f
```
Accessibility tweaks for account settings and profile pages.
```
  Muzaffar yousaf committed Apr 21, 2015
  d50ed75f Browse Files
- Merge pull request #7756 from edx/will/ecom-1408-take-two · 4df2bd33
```
Expose course start/end date in the enrollment API
```
  Will Daly committed Apr 21, 2015
  4df2bd33 Browse Files
- Accessibility tweaks for account settings and profile pages. · a14e6f0a
```
TNL-1660
```
  Usman Khalid committed Apr 21, 2015
  a14e6f0a Browse Files
- Merge pull request #7758 from edx/sarina/20150421-translations-update · 72dc5470
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Apr 21, 2015
  72dc5470 Browse Files
- Update translations (autogenerated message) · 9bdb820f
  Sarina Canelake committed Apr 21, 2015
  
  9bdb820f Browse Files
- Merge pull request #7710 from cpennington/relax-context-contract · 97d9a190
```
Fix contract on context argument
```
  Calen Pennington committed Apr 21, 2015
  97d9a190 Browse Files
- Mark test_split_test_LMS_staff_view as flaky · e065a9c9
  Will Daly committed Apr 21, 2015
  
  e065a9c9 Browse Files
- Merge pull request #7696 from… · 7babb3ef
```
Merge pull request #7696 from edx/ammar/tnl1740-add-simplified-and-traditional-chinese-transcript-language-options

Add Simplified and Traditional Chinese as Transcript language options
```
  Muhammad Ammar committed Apr 21, 2015
  7babb3ef Browse Files
- Expose course start/end date in the enrollment API · fc918fb3
  Will Daly committed Apr 21, 2015
  
  fc918fb3 Browse Files
18 Apr, 2015 5 commits
- Merge pull request #7676 from edx/mobile/notifications-backend · 9dfb68c2
```
Mobile/notifications
```
  Nimisha Asthagiri committed Apr 18, 2015
  9dfb68c2 Browse Files
- MA-614 Mobile Push Notification Studio UI · 11044ebd
  Nimisha Asthagiri committed Apr 18, 2015
  
  11044ebd Browse Files
- MA-611, MA-613 Mobile Push Notification Studio Backend; Integration with Parse · b124485e
  Nimisha Asthagiri committed Apr 18, 2015
  
  b124485e Browse Files
- Clean ID of course_module for push notification channel name. · c2a1870f
```
Update Mobile API to include channel_id for course.
```
  Nimisha Asthagiri committed Apr 18, 2015
  c2a1870f Browse Files
- MA-612 Mobile Push Notification Studio Django admin setting · a87c8810
  Nimisha Asthagiri committed Apr 18, 2015
  
  a87c8810 Browse Files
17 Apr, 2015 11 commits
- Merge pull request #7350 from edx/learner-profiles · 2fed57a0
```
Feature branch for learner profiles
```
  Andy Armstrong committed Apr 17, 2015
  2fed57a0 Browse Files
- Update user message strings · cfcb38c4
  muhammad-ammar committed Apr 17, 2015
  
  cfcb38c4 Browse Files
- Code review feedback and test cleanup. · 17392ef3
  Andy Armstrong committed Apr 17, 2015
  
  17392ef3 Browse Files
- Event on user preference updates · 7742735f
```
TNL-1851
```
  Andy Armstrong committed Apr 17, 2015
  7742735f Browse Files
- Isolate Bok Choy tests to unique test users · 1f3d2c24
  Andy Armstrong committed Apr 17, 2015
  
  1f3d2c24 Browse Files
- Tests for profile image eventing. · 9907cb52
  cahrens committed Apr 17, 2015
  
  9907cb52 Browse Files
- Emit events for language proficiencies from the update_account_settings method. · 4797a74e
  cahrens committed Apr 17, 2015
  
  4797a74e Browse Files
- Track user settings changed events on User save · 97c43ada
  Daniel Friedman committed Apr 17, 2015
  
  97c43ada Browse Files
- Add model change event tracking to UserProfile. · 3f20a6f3
  Diana Huang committed Apr 17, 2015
  
  3f20a6f3 Browse Files
- Obey learner profile default visibility · 8ff9fd84
  Andy Armstrong committed Apr 17, 2015
  
  8ff9fd84 Browse Files
- Fixed gettext references. · 6b91ab4e
```
TNL-1862
```
  muhammad-ammar committed Apr 17, 2015
  6b91ab4e Browse Files