Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,801 Commits 1 Branch 0 Tags
a0feb2118b754e05850fe67ae0a88554ea90efe9
Commit Graph

29801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
a0feb2118b Merge pull request #7770 from edx/talbs/rc/2015-04-22/fix-breakpoints 
Fix: edx.org and Open edX breakpoint clash - ECOM-1457
 2015-04-22 08:42:57 -04:00
Brian Talbot
ded6c4dbb0 fix: resolving edx.org and Open edX breakpoint clash 
* 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
 2015-04-21 16:44:32 -04:00
Muzaffar yousaf
d50ed75f36 Merge pull request #7754 from edx/usman/tnl1660-fixes 
Accessibility tweaks for account settings and profile pages.
 2015-04-21 20:39:26 +05:00
Will Daly
4df2bd3329 Merge pull request #7756 from edx/will/ecom-1408-take-two 
Expose course start/end date in the enrollment API
 2015-04-21 10:50:33 -04:00
Usman Khalid
a14e6f0a7e Accessibility tweaks for account settings and profile pages. 
TNL-1660
 2015-04-21 19:42:50 +05:00
Sarina Canelake
72dc54708e Merge pull request #7758 from edx/sarina/20150421-translations-update 
Update translations (autogenerated message)
 2015-04-21 10:08:49 -04:00
Sarina Canelake
9bdb820fa7 Update translations (autogenerated message) 2015-04-21 10:07:28 -04:00
Calen Pennington
97d9a19052 Merge pull request #7710 from cpennington/relax-context-contract 
Fix contract on context argument
 2015-04-21 10:01:24 -04:00
Will Daly
e065a9c947 Mark test_split_test_LMS_staff_view as flaky 2015-04-21 09:38:53 -04:00
Muhammad Ammar
7babb3efed 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
 2015-04-21 18:28:17 +05:00
Will Daly
fc918fb3d1 Expose course start/end date in the enrollment API 2015-04-21 08:41:42 -04:00
Nimisha Asthagiri
9dfb68c2f1 Merge pull request #7676 from edx/mobile/notifications-backend 
Mobile/notifications
 2015-04-18 17:46:40 -04:00
Nimisha Asthagiri
11044ebdf2 MA-614 Mobile Push Notification Studio UI 2015-04-18 15:30:25 -04:00
Nimisha Asthagiri
b124485ed6 MA-611, MA-613 Mobile Push Notification Studio Backend; Integration with Parse 2015-04-18 15:30:19 -04:00
Nimisha Asthagiri
c2a1870fb5 Clean ID of course_module for push notification channel name. 
Update Mobile API to include channel_id for course.
 2015-04-18 15:30:19 -04:00
Nimisha Asthagiri
a87c881024 MA-612 Mobile Push Notification Studio Django admin setting 2015-04-18 15:30:14 -04:00
Andy Armstrong
2fed57a04b Merge pull request #7350 from edx/learner-profiles 
Feature branch for learner profiles
 2015-04-17 18:17:50 -04:00
muhammad-ammar
cfcb38c498 Update user message strings 2015-04-17 17:23:19 -04:00
Andy Armstrong
17392ef3bf Code review feedback and test cleanup. 2015-04-17 17:23:19 -04:00
Andy Armstrong
7742735fb0 Event on user preference updates 
TNL-1851
 2015-04-17 17:23:19 -04:00
Andy Armstrong
1f3d2c24cc Isolate Bok Choy tests to unique test users 2015-04-17 17:23:19 -04:00
cahrens
9907cb5251 Tests for profile image eventing. 2015-04-17 17:23:18 -04:00
cahrens
4797a74e5c Emit events for language proficiencies from the update_account_settings method. 2015-04-17 17:23:18 -04:00
Daniel Friedman
97c43adaa4 Track user settings changed events on User save 2015-04-17 17:23:18 -04:00
Diana Huang
3f20a6f304 Add model change event tracking to UserProfile. 2015-04-17 17:23:18 -04:00
Andy Armstrong
8ff9fd84e4 Obey learner profile default visibility 2015-04-17 17:23:18 -04:00
muhammad-ammar
6b91ab4e2b Fixed gettext references. 
TNL-1862
 2015-04-17 17:23:18 -04:00
Usman Khalid
da57b13b6d Removed all references to AUTH_ENTRY_DASHBOARD. 
TNL-2024
 2015-04-17 17:23:17 -04:00
muzaffaryousaf
6502eaf755 DropDownFieldView should show empty option if model value is unset. 
TNL-2022
 2015-04-17 17:23:17 -04:00
muhammad-ammar
e50a641673 Accessibility changes for Account Settings and Learner Profile pages 2015-04-17 17:23:17 -04:00
muzaffaryousaf
f1657d1d4a Fixing the SaSS for RTL. 
TNL-1759
 2015-04-17 17:23:17 -04:00
muzaffaryousaf
c2d83bd4a6 Bok_choy tests for upload/remove profile image. 
TNL-1538
 2015-04-17 17:23:17 -04:00
muhammad-ammar
ca1f2f7768 Jasmine tests for upload/remove profile image on learner profile page. 
TNL-1538
 2015-04-17 17:23:17 -04:00
Usman Khalid
adf111e4d5 Adding functionlity to upload/remove profile image. 
TNL-1538
 2015-04-17 17:23:16 -04:00
cahrens
938dcce061 Event change_initiated for password and email change requests. 2015-04-17 17:23:16 -04:00
muzaffaryousaf
9ac08ac59d Moving the country field to the required section of account setting page. 
TNL-1856
 2015-04-17 17:23:16 -04:00
Usman Khalid
bc05cd0ccd Resolving JS lint errors for account settings & learner profile page. 
TNL-1855
 2015-04-17 17:23:16 -04:00
Andy Armstrong
f03841a6bb Add client-side events for viewing pages 
TNL-1504
 2015-04-17 17:23:16 -04:00
Andy Armstrong
c3a39934a0 Limit the size of the user profile's "bio" field 
TNL-1990
 2015-04-17 17:23:16 -04:00
Usman Khalid
e6c3644bd7 Quality fixes. 2015-04-17 17:23:15 -04:00
muzaffaryousaf
3110cf6bb6 Remove account settings display and editing from dashboard sidebar. 
TNL-1516
 2015-04-17 17:23:15 -04:00
Usman Khalid
429984efcc Third party auth tests should check account_settings_context(). 
TNL-1535
 2015-04-17 17:23:15 -04:00
Usman Khalid
2667f705ad Enable third party auth from account settings page. 
TNL-1535
 2015-04-17 17:23:15 -04:00
muzaffaryousaf
a378995f85 If user is not above age limit, show restricted learner profile. 
TNL-1658
 2015-04-17 17:23:15 -04:00
muzaffaryousaf
67848ff67b Link to learner profile page from username in discussions. 
TNL-1503
 2015-04-17 17:23:15 -04:00
muzaffaryousaf
4f97cd7a04 Learner profile page. 
TNL-1502
 2015-04-17 17:23:14 -04:00
Usman Khalid
229a37b983 Bokchoy tests for account settings page. 
TNL-1499
 2015-04-17 17:23:14 -04:00
muhammad-ammar
9c2d18710c Jasmine tests for account settings page. 
TNL-1499
 2015-04-17 17:23:14 -04:00
Usman Khalid
74bf7f239e Account settings page. 
TNL-1499
 2015-04-17 17:23:14 -04:00
Usman Khalid
3a2c527cd6 Added javascript library backbone-super. 
TNL-1499
 2015-04-17 17:23:14 -04:00