Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
Matt Drayer
1d121b81c6 Merge pull request #10012 from edx/ziafazal/MAYN-129 
MAYN-129: additional payment details were not shown
 2015-10-05 07:56:57 -04:00
Matt Drayer
890a675054 Merge pull request #10005 from edx/saleem-latif/MAYN-131-complete-fix 
MAYN-131: Update Unsupported Browser message
 2015-10-05 07:50:38 -04:00
Usman Khalid
0ce679fc06 Merge pull request #9934 from edx/usman/use-included-staticfiles-app 
Upgrade django-pipeline and staticfiles.
 2015-10-02 22:37:24 +05:00
David Baumgold
0219e18fa8 Merge pull request #10023 from edx/release 
Release into master
 2015-10-02 12:58:50 -04:00
Usman Khalid
98df2336f3 Upgrade to django-pipeline v.1.5.3. 
TNL-3137
 2015-10-02 18:26:25 +05:00
Zia Fazal
460b19fa1b fixed form submit selector 
reduced left margin
 2015-10-02 16:57:23 +05:00
Bill DeRusha
bcb71a3255 Rename SEGMENT_KEY to have a unique key name for both CMS and LMS 2015-10-01 19:40:27 -04:00
Sarina Canelake
cdd59b5a10 Merge pull request #9950 from lduarte1991/lti-allow-fullscreen 
Allow fullscreen within lti
 2015-10-01 15:42:15 -04:00
Ahsan Ulhaq
65b8bf8c40 Messaging and text improvements 
ECOM-2338
 2015-10-01 12:41:56 +05:00
Saleem Latif
5523e7336d message updated for unsupported browsers 2015-10-01 11:21:15 +05:00
asadiqbal
df83c87e60 MAYN-116 Including GTM code from microsite 2015-09-30 14:36:34 -04:00
Matt Drayer
65831c887d Merge pull request #9806 from edx/ziafazal/SOL-1185 
ziafazal/SOL-1185: move SOCIAL_SHARING_SETTINGS out of FEATURES
 2015-09-30 14:12:33 -04:00
chrisndodge
d9a21d72fc Merge pull request #9945 from edx/cdodge/credit-status-messaging 
Make the message to the end user consistent across as requirement typ…
 2015-09-30 12:40:59 -04:00
David Baumgold
aa8ecca536 Remove the edx.org comprehensive theme 
There's a lot of useful things in PR #8271 that provide a framework
for the comprehensive theming system. If we need to remove the edx.org
theme from the codebase, we can leave most of PR #8271 in, to make it
easier to build on top of and get this feature back in.
 2015-09-30 12:18:01 -04:00
David Baumgold
3f6e39054e Merge pull request #9955 from edx/partially-revert-comprehensive-theming 
Remove the edx.org comprehensive theme
 2015-09-30 12:17:22 -04:00
David Baumgold
116ca29189 Remove the edx.org comprehensive theme 
There's a lot of useful things in PR #8271 that provide a framework
for the comprehensive theming system. If we need to remove the edx.org
theme from the codebase, we can leave most of PR #8271 in, to make it
easier to build on top of and get this feature back in.
 2015-09-30 11:04:28 -04:00
David Baumgold
1fe37195b3 Merge pull request #9900 from edx/i18n-course-browse-copy 
i18n course browse copy
 2015-09-30 09:48:21 -04:00
Chris Dodge
799571b213 Make the message to the end user consistent across as requirement types, except for grade requirements 2015-09-29 22:24:59 -04:00
Clinton Blackburn
84e56ed8cb Merge pull request #9956 from edx/clintonb/receipt-fix 
Fixed receipt page bug
 2015-09-29 17:20:12 -04:00
Clinton Blackburn
6f22fc07f6 Fixed receipt page bug 
Variable name was broken by a commit in #9868.

ECOM-2431
 2015-09-29 17:19:26 -04:00
lduarte1991
196f6ef64b Allow fullscreen within lti 2015-09-29 13:02:10 -04:00
frances botsford
be0b70bd06 Merge pull request #9910 from edx/frances/invalid-cert-styles 
Styles and content adjustments for invalid cert view
 2015-09-29 12:23:25 -04:00
Frances Botsford
28d09a7233 styles and content adjustments for invalid cert view 2015-09-29 11:30:48 -04:00
Matt Drayer
e0c430ffe3 Merge pull request #9941 from edx/ziafazal/MAYN-138 
MAYN-138: Rebranding Help tab didn't work
 2015-09-29 10:35:40 -04:00
Bill DeRusha
a6873cb883 Merge pull request #9875 from edx/bderusha/segment-cleanup 
Segment Clean Up
 2015-09-29 10:33:03 -04:00
Matt Drayer
d3c50ee3a2 Merge pull request #9884 from edx/saleem-latif/SOL-1190 
SOL-1190: line breaks in signatory title are not reflected in the cert
 2015-09-29 08:50:25 -04:00
Zia Fazal
604ac8504c use platform_name template tag 2015-09-29 17:01:55 +05:00
Saleem Latif
d91aa83af5 reverting the chnages sent in MAYN-131, final solution will be submitted in a separate PR 2015-09-29 14:03:19 +05:00
Saleem Latif
abfa6d9ad1 Line breaks in signatory title issue fixed 2015-09-29 12:38:58 +05:00
Saleem Latif
5b985a5914 updated error message 2015-09-28 16:20:57 +05:00
Chris Dodge
7b980b82e8 edx-procoting will be passing back which font-awesome icon to use 2015-09-25 12:17:00 -04:00
Chris Rodriguez
b49f9104b8 LMS: replacing proctoring markup from accordion 2015-09-24 13:21:37 -04:00
clrux
8076da139c Merge pull request #9775 from edx/clrux/ac-147 
Addressing contrast and hover states for 'clear filters' button on the find courses page
 2015-09-24 12:08:14 -04:00
Bill DeRusha
c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY 2015-09-24 11:49:03 -04:00
Chris Rodriguez
e3035a8fab LMS: a11y contrast fixes for find course page 2015-09-24 11:11:07 -04:00
Ned Batchelder
45176c7254 Merge pull request #9868 from louyihua/i18n_fix 
i18n fix
 2015-09-24 10:23:58 -04:00
Matt Drayer
e51c4f23d3 Merge pull request #9822 from edx/saleem-latif/SOL-565 
saleem-latif/SOL-565
 2015-09-24 10:19:43 -04:00
louyihua
66678c103f i18n fix 
1. Add missing '_()' in capa_base.py & video_xfields.py
2. Fix a bug in instructor_dashboard.py that causes crash when ANALYTICS_DASHBOARD_NAME contains non-ascii characters.
3. Workaround for mis-extractions inside .underscore files when using gettext along with interpolate.
 2015-09-24 13:02:12 +08:00
Akiva Leffert
5e2290f9ed Merge pull request #9726 from edx/aleffert/all-responsive 
Remove "responsive" check before deciding whether to add a viewport tag.
 2015-09-23 19:10:50 -04:00
David Baumgold
9b758379d8 i18n course browse copy 2015-09-23 16:19:42 -04:00
Akiva Leffert
73e976ae85 Remove "responsive" check before deciding whether to add a viewport tag. 
We also need to ensure that this tag is presented when loading xblocks
via the mobile app anyway. Since we're fine just giving responsive
content to everyone we don't need this check any more.

JIRA: https://openedx.atlassian.net/browse/MA-960?filter=13805
 2015-09-23 16:07:41 -04:00
Brian Beggs
c26bb9188a Revert "Upgrade django-pipeline and staticfiles" 2015-09-23 15:52:24 -04:00
Brian Beggs
4c05fa4f49 Merge pull request #9803 from edx/usman/use-included-staticfiles-app 
Upgrade django-pipeline and staticfiles
 2015-09-23 15:50:39 -04:00
clrux
0b64f2d612 Merge pull request #9525 from edx/clrux/ac-76 
LMS: Course navigation revamp
 2015-09-23 14:26:10 -04:00
Ahsan Ulhaq
508ded2673 LMS: course navigation menu refactor 2015-09-23 13:13:18 -04:00
Sarina Canelake
b7a432c2eb Merge pull request #9786 from OmarIthawi/edraak/descriptive-dashboard-title 
More descriptive dashboard title
 2015-09-23 13:05:08 -04:00
Saleem Latif
05a72486f3 date format "Monday at 3pm UTC" added for courses starting with-in 5 days 2015-09-23 12:17:08 +05:00
Usman Khalid
1e799eb508 Upgrade to django-pipeline v.1.5.3. 
TNL-3137
 2015-09-22 20:39:43 +05:00
David Baumgold
03aeae4bd7 Merge pull request #8271 from edx/sass-theming 
Comprehensive Theming
 2015-09-21 10:55:18 -04:00
Sarina Canelake
9a0152724b Merge pull request #9846 from edx/sarina/tooltips 
Make LMS courseware tooltips better
 2015-09-21 10:32:07 -04:00