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

10914 Commits

Author SHA1 Message Date
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
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
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
jsa
bb2599cecd Include profile image version in URLs. 
TNL-1860
 2015-04-17 17:23:13 -04:00
jsa
1d11345e90 make auto_auth users satisfy PARENTAL_CONSENT_AGE_LIMIT 2015-04-17 17:23:13 -04:00
jsa
46b63164a0 Implement profile_image upload and remove endpoints 
TNL-1537

Co-Authored-By: Andy Armstrong <andya@edx.org>
Co-Authored-By: cahrens <christina@edx.org>
 2015-04-17 17:23:12 -04:00
Daniel Friedman
97e44ed20f Implement language proficiencies. 
TNL-1488
 2015-04-17 17:23:12 -04:00
Andy Armstrong
650a9a9b85 Implement parental controls for user profiles 
TNL-1606
 2015-04-17 17:23:11 -04:00
Daniel Friedman
6f6fdbfb5f Integrate profile images into Accounts API 
TNL-1545
 2015-04-17 17:23:11 -04:00
cahrens
fad63938e5 New bio field in UserProfile. 2015-04-17 17:23:11 -04:00
cahrens
0a962bf991 Add field that was missing from re-ordered migration 2015-04-17 17:23:11 -04:00
Clinton Blackburn
5b644298fb Merge pull request #7737 from edx/enrollment-api-full-urls 
Returning complete URL for Enrollment API user messaging
 2015-04-17 17:17:02 -04:00
Jesse Zoldak
b5305147b3 Revert "Expose course start/end date in the enrollment API" 2015-04-17 15:46:55 -04:00
Will Daly
53f4a13f3b Merge pull request #7708 from edx/will/ecom-1411 
Expose course start/end date in the enrollment API
 2015-04-17 14:23:00 -04:00
Calen Pennington
f67cb76fb4 Merge pull request #7686 from cpennington/xmodule-metrics-sample-rate 
Sample xblock metrics at 10%
 2015-04-17 13:52:05 -04:00
Chris
4a27e8b6cc Merge pull request #7711 from edx/clrux/UX-1946-div-focus-fix 
Adding outline styles (none) to the sr focus div
 2015-04-17 12:44:27 -04:00
Will Daly
e777260712 Merge pull request #7687 from edx/will/ecom-1408-take-two 
Credit message on track selection page.
 2015-04-17 11:53:36 -04:00
Eugeny Kolpakov
b1765d0a69 Merge pull request #7641 from open-craft/eugeny/problem-type-search 
Capa problem type filtering using edx-search
 2015-04-17 18:43:04 +03:00
Will Daly
3b160eefcb Credit message on track selection page. 
* Adds a credit course mode to indicate that a course
has a credit option.

* Hides the credit option from the track selection and
pay-and-verify pages.

* Shows different messaging for the verified track if
it's possible to upgrade from verified to credit at the end
of the course.
 2015-04-17 10:59:37 -04:00
Chris Rodriguez
2637ac897d Changing id to class 2015-04-17 08:55:30 -04:00
Awais Qureshi
0b5d0b2949 Merge pull request #7698 from edx/awais786/ECOM-1421-modify-course-access-api 
ECOM-1421 implementing the functionality
 2015-04-17 12:07:07 +05:00
Sarina Canelake
cb333c414a Merge pull request #7670 from louyihua/lms_i18n_1 
Better i18n (cont.)
 2015-04-16 14:05:53 -04:00
louyihua
b7c6b4ad55 Better i18n (cont.) 
1. Fix sentence breaks inside `photo_reverification.html` and `midcourse_photo_reverification.html`.
2. Combine three setences inside `choose.html`.
3. Adding some punctuation marks to reduce duplicated strings with only different Punctuation marks in translation.
4. Move the colons inside the strings to be translated. This may be not necessary for now, but I think this may help translation by removing potential word meaning conflict.
5. Sorry for
 2015-04-17 01:05:46 +08:00
Awais
2cd265292f ECOM-1421 implementing the functionality 2015-04-16 21:46:47 +05:00
Awais Jibran
efc1d5d3ef Merge pull request #7649 from edx/aj/tnl1902-fix-long-latex-post-discussion 
Fixed Long discussion post not rendering Latex expressions
 2015-04-16 10:49:58 +05:00
Marco Morales
031edf6abf Merge pull request #7221 from edx/marco/discussions-related-to 
Updated Styling for course references in discussion forum posts
 2015-04-15 19:47:54 -04:00
David Baumgold
1c910023aa Merge pull request #7111 from ataki/ataki/upstream-pr-video-start-stop 
hard start/stop times to video player
 2015-04-15 16:42:24 -04:00
Will Daly
da8103d2ea Expose course start/end date in the enrollment API 2015-04-15 16:14:30 -04:00
Will Daly
a91d90cbd8 Merge branch 'release' 2015-04-15 16:12:00 -04:00
ataki
2c6226362e Warning that hard start/stop times don't work for mobile 2015-04-15 14:47:42 -04:00
Jesse Zoldak
708203b3ef Increase timeout for library page to load after refresh in acceptance tests. TE-745 2015-04-15 11:58:32 -04:00
Awais Jibran
65c5ec8073 Fixed Long discussion post not rendering Latex expressions 
TNL-1902
 2015-04-15 20:43:39 +05:00
Clinton Blackburn
cd5039383e Returning complete URL for Enrollment API user messaging 
The Enrollment API now returns the complete URL in the user_message_url field. Returning just the path can result in 404s if the consuming code simply redirects to the value of this field without first checking to see if the hostname is included. Using the full URL solves this problem for all clients.
 2015-04-15 11:29:54 -04:00
Awais Qureshi
04ca163f82 Merge pull request #7690 from edx/awais786/ECOM-1420-new-field 
ECOM-1420 adding new field and migration file.
 2015-04-15 17:55:44 +05:00
Awais
18282919b5 ECOM-1420 adding new field and migration file. 2015-04-15 12:38:43 +05:00
Clinton Blackburn
e18d69a9e9 Fixed Embargo Bug in Enrollment API 
This issue was not found sooner because the test helper used only tested for GeoIP embargoes, and neglected the user profile. An additional test has been added to test for embargoes against the country assigned to the user's profile. Additionally, variable names have been cleaned up--user replaced with username--to avoid confusion in the future.
 2015-04-14 22:07:25 -04:00
Sarina Canelake
07b7c5c83a Merge pull request #7663 from applecool/edxsprint 
Fix for TNL-1639
 2015-04-14 19:40:52 -04:00
ataki
5f5a77acb1 Add comment, refactor, handle edge cases 2015-04-14 15:56:56 -04:00
ataki
27d3d0344d Update variable names for video module 2015-04-14 15:56:56 -04:00
ataki
5917ed063d hard start/stop times to video player 
This pull request makes the video player module respect
the video start/stop times specified by the instructor
as a hard start/stops, i.e. the video treats the start
time as the beginning of the video and the stop time as
the end.

Previously, the video module displayed the full
video and displayed a jquery ui slider range representing
the start and end times.

This new functionality invalidates two previous acceptance
tests for the video module:

    - slider visible test
    - finish time video acceptance test.

These tests are removed from the common acceptance tests.
 2015-04-14 15:56:56 -04:00
Syed Hassan Raza
6b50ffd038 Revert hotfix for PLAT-452 2015-04-14 23:13:55 +05:00