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

4376 Commits

Author SHA1 Message Date
Will Daly
50e9b43512 Merge pull request #7826 from edx/will/update-reverification-flow-copy 
Update copy on reverification flow.
 2015-04-29 10:38:54 -04:00
Sarina Canelake
aed9ba8a38 Merge pull request #7818 from mcgachey/mcgachey-lti-render 
[LTI Provider] Wiring up LTI views to the courseware template
 2015-04-29 10:34:09 -04:00
Sarina Canelake
cd9ce147d0 Merge pull request #7831 from amir-qayyum-arbisoft/icon_in_set_date 
Fixed cross icon issue on set date dialog inside schedule tab
 2015-04-29 09:47:33 -04:00
amir-qayyum-arbisoft
3e5e6065e4 fixed cross icon issue on set date dialog inside schedule tab 2015-04-29 15:28:21 +05:00
Chris
d9e13d22b8 Merge pull request #7763 from edx/clrux/sequence-nav-button-icons 
Changing sequence nav buttons from images to icon fonts
 2015-04-28 14:05:38 -04:00
Chris Rodriguez
74ce5cbb87 Changing sequence nav buttons from images to icon fonts 2015-04-28 11:04:16 -04:00
Phil McGachey
854c9637f1 [LTI Provider] Addressing review comments 2015-04-28 10:35:44 -04:00
Will Daly
d9ed2c024b Update copy on reverifcation flow. 
* Remove course ID and checkpoint name debugging information.
* Update page title.
 2015-04-28 08:10:24 -04:00
Jim Abramson
70d837ab62 Merge pull request #7777 from edx/jsa/baskets 
use commerce api v2.
 2015-04-27 22:30:37 -04:00
jsa
efde11d552 Use ecommerce api v2. 
XCOM-213 XCOM-214
 2015-04-27 16:57:17 -04:00
Martyn James
1eeca4d81f Merge pull request #7522 from edx/feature/dashboard-search 
Feature/dashboard search
 2015-04-27 09:46:35 -04:00
David Ormsbee
e0122c0537 Merge pull request #7624 from mcgachey/mcgachey-courseware-flags 
[LTI Provider] Adding options to suppress chrome for embedding courseware
 2015-04-24 12:48:20 -04:00
Davorin Sego
71feb068e3 Dashboard search feature 2015-04-24 09:45:12 -04:00
cewing
b34255fcdb MIT CCX: Fix display of CCXs on dashboard 
repairs https://openedx.atlassian.net/browse/TNL-2007 and https://openedx.atlassian.net/browse/TNL-2009

Original Commit Messages:

Update ccx dashboard display to match new course display

Fix display of CCX dates on dashboard to use dates from the CCX instead of the related course.

The fix is implemented by providing date- and course-related APIs on the CCX object itself.  These APIs are mimicked from the same APIs available on a course descriptor.

bring the methods for printing start and end datetimes into line with course by adding UTC under the proper circumstances

add test coverage for new APIs defined on the CCX model

fix quality violation
 2015-04-23 15:59:58 -07:00
Aamir
a900e1f7ec Merge pull request #7660 from edx/aamir-khan/ECOM-1396/checkoint-name-field 
Aamir khan/ecom 1396/checkoint name field
 2015-04-23 12:06:09 +05:00
Diana Huang
2f3ff43e3f Merge pull request #7786 from edx/release 
Merge release back into master
 2015-04-22 17:51:34 -04:00
Usman Khalid
e82735f79d Change image upload input name and not make duplicate of file in data. 
TNL-2052
 2015-04-22 14:33:30 -04:00
aamir-khan
d606ae97fb ECOM-1396: added the function to check is the xblock published 2015-04-22 19:23:33 +05:00
Clinton Blackburn
dc07943534 Merge pull request #7762 from edx/commerce-checkout-cancel 
Added Payment Cancellation Page
 2015-04-21 23:46:05 -04:00
Clinton Blackburn
0f84749d4f Added Payment Cancellation Page 
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.
 2015-04-21 16:43:15 -04:00
Usman Khalid
a14e6f0a7e Accessibility tweaks for account settings and profile pages. 
TNL-1660
 2015-04-21 19:42:50 +05: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
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
Andy Armstrong
f03841a6bb Add client-side events for viewing pages 
TNL-1504
 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
2667f705ad Enable third party auth from account settings page. 
TNL-1535
 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
74bf7f239e Account settings page. 
TNL-1499
 2015-04-17 17:23:14 -04:00
Andy Armstrong
20410a9c6c Implement profile image moderation 
TNL-1548
 2015-04-17 17:23:12 -04:00
Ali Mohammad
e81a883e8f Merge pull request #7744 from edx/multibeacon 
Added salt to "load" beacon.
 2015-04-17 17:06:53 -04:00
alawibaba
8a3e302f7e Added salt to "load" beacon. 2015-04-17 15:48:46 -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
Chris Rodriguez
2637ac897d Changing id to class 2015-04-17 08:55:30 -04:00
Marco Morales
c67e8b9ef4 moved the dropdown actions outside of the if show_courseware_link in attempt to still show the dropdown actions 2015-04-16 16:40:46 -04: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
Ahsan Ulhaq
eba02da233 Merge pull request #7544 from edx/ahsan/tnl-1675-iframe-elements-require-meaningful-title 
iframe elements require a meaningful title attribute
 2015-04-16 13:54:15 +05:00
Marko Jevtić
a3aecb2014 Merge pull request #7548 from edx/mjevtic/SOL-531 
(SOL-531)(SOL-532) Course Cards update on the homepage;
 2015-04-14 16:17:34 +02:00
marjev
939a3672d4 (SOL-531)(SOL-532)Course Cards update; A link to course discovery page has been added to the OpenEdX homepage 2015-04-14 14:58:06 +02:00
Matt Drayer
ffe30da7a5 Add course-specific URL overrides for social sharing icons on student dashboard 
- sharing enabled for custom URLs only if URL actually specified
 2015-04-13 13:14:43 -04:00
Ali Mohammad
6b11ff6f22 Merge pull request #7650 from edx/multibeacon 
Added more precise alerting to video beacon experiment.
 2015-04-13 12:11:21 -04:00
Sarina Canelake
13fe58e195 Merge pull request #7637 from louyihua/misc_i18n_1 
Better i18n for LMS
 2015-04-13 11:14:36 -04:00
chrisndodge
f38b90fd3c Merge pull request #7659 from edx/cdodge/fix-translation-help 
fix I18N errors in business order confirmation email
 2015-04-13 10:46:50 -04:00
Chris Dodge
768dd92256 fix I18N errors in business order confirmation email 2015-04-13 09:39:07 -04:00