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

81 Commits

Author SHA1 Message Date
Alison Hodges
2f5362f80a Fixes DOC-3360 to make help context-sensitive 2016-09-27 14:01:43 -04:00
asadiqbal
2833d1e9a5 WL-603 load locale paths for themes directories 2016-09-22 13:26:11 +05:00
Jesse Shapiro
ce2ab5b15c Adding 'visible' field for SSO providers 2016-09-08 11:27:09 -04:00
Peter Desjardins
c50e028507 Adjusted Sass for the doc-link so that it will work in pattern library pages and also in the edx.org theme. Added the documentation link to the edx.org theme header. 2016-09-07 23:46:09 -04:00
Marco Morales
2e2a23b9d3 Merge pull request #13204 from edx/marco/copyrightyear/update 
Updated copyright year for LMS / CMS
 2016-08-26 10:51:43 -04:00
hasnain naveed
72581a08ce WL-474 | theme boilerplate 2016-08-19 09:18:52 -04:00
marcotuts
8343918c9f updated copyright setting file 
updated LMS footer to include year in copyright message
 2016-08-15 10:04:24 -04:00
Renzo Lucioni
363f9e2cd5 Merge pull request #13170 from edx/renzo/dashboard-programs 
Display programs of all categories on the student dashboard
 2016-08-11 10:06:15 -04:00
Renzo Lucioni
9c81ba47e2 Display programs from all categories on the student dashboard 
Removes most remaining hardcoded references to XSeries from the LMS. Part of ECOM-4638.
 2016-08-11 09:00:23 -04:00
Renzo Lucioni
b6f466b04b Make edX logo in edx.org footer more accessible 
The logo in the edx.org footer now links to the edX home page, consistent with the logo in the header. ECOM-4117.
 2016-08-10 10:53:05 -04:00
Saleem Latif
6277bd27e6 Remove all usages of USE_CUSTOM_THEME and THEME_NAME from python files 2016-07-27 14:53:02 +05:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming 
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
 2016-07-27 13:55:14 +05:00
Simon Chen
1d768cde7a ECOM-4904 Move the program editor backbone app to Studio (#12962) 2016-07-19 19:09:51 -04:00
Adam Palay
58073d2fe1 small fix to typo in activation email 2016-07-12 13:46:25 -04:00
Matt Drayer
68312bdd2d Revert "Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"" 
2. Update COMPREHNSIVE_THEME_DIR to COMPREHENSIVE_THEME_DIRS
3. Update paver commands to support multi theme dirs
4. Updating template loaders
5. Add ENABLE_COMPREHENSIVE_THEMING flag to enable or disable theming via settings
6. Update tests
7. Add backward compatibility for COMPREHEHNSIVE_THEME_DIR
 2016-06-30 15:19:51 +05:00
Sylvia Pearce
ce3da57546 Merge pull request #12783 from edx/sylvia/DOC-2361 
Account registration and activation text string revisions
 2016-06-27 15:01:36 -04:00
Sylvia Pearce
8b1f28d317 Account registration and activation text string revisions 2016-06-27 13:32:53 -04:00
Chris Rodriguez
62a6f891c4 AC-398 putting edx.org social media links in list, updating styles 2016-06-27 11:31:42 -04:00
ssemenova
c1f793172f change icon tags from i to span 
TNL-4692
 2016-06-07 10:52:00 -04:00
AlasdairSwan
a7d036f912 Merge pull request #12613 from edx/release 
Release 1st June 2016
 2016-06-01 15:22:19 -04:00
ssemenova
36c867c42a changed icon html from <i> to <span> 
TNL-4651
 2016-05-31 15:46:23 -04:00
tasawernawaz
feb8ca4467 Revert "ECOM-4334 Update learner dashboard" 
This reverts commit caa5a0ac02.
 2016-05-31 14:36:19 +00:00
Robert Raposa
ebf89d63e9 Merge pull request #12541 from edx/robrap/fix-imports 
Fix import order for HTML, Text.
 2016-05-25 15:23:08 -04:00
Ahsan Ulhaq
a8f2de8375 Course Dashboard Visual Update 
ECOM-4398
 2016-05-24 16:17:19 +05:00
Tasawer
caa5a0ac02 ECOM-4334 Update learner dashboard 2016-05-23 21:41:06 +05:00
Robert Raposa
addb5bf634 Fix violations with n filter. 2016-05-23 09:00:32 -04:00
Robert Raposa
7223ee9316 Fix import order for HTML, Text. 2016-05-23 08:47:08 -04:00
AlasdairSwan
7bca66c23e Merge pull request #12408 from edx/alasdair/ECOM-4215-program-details-page-setup 
ECOM-4215 adding setup for new program details page
 2016-05-12 18:25:13 -04:00
AlasdairSwan
bc5daffc96 ECOM-4215 adding setup for new program details page 2016-05-12 16:39:23 -04:00
Bill DeRusha
98254e5cec Safe templatize: choose.html 2016-05-12 11:29:20 -04:00
Robert Raposa
80c3f84262 Fix safe template issues for 0 violations for some rules 2016-05-10 15:35:57 -04:00
Tasawer
4a18ec8041 ECOM-3731 update browser new course area 2016-05-03 15:14:32 +00:00
Qubad786
a3adaa96c4 add imports and fix html 2016-04-29 01:14:55 +05:00
Kevin Falcone
b61d9b9d09 TNL-4396 Apply same fix to edx dashboard 
This was fixed on the openedx dashboard, but missed on the edx.org theme
for the dashboard.
 2016-04-29 01:14:54 +05:00
Andy Armstrong
fe88402982 Merge branch 'master' into alasdair/fedx-118-pattern-library-styles-with-current-partials 2016-04-25 16:51:25 -04:00
Andy Armstrong
c42b36ccd1 Fixes 2016-04-25 13:35:57 -04:00
AlasdairSwan
a9971ef2ba FEDX-118 Adding header to test page 2016-04-25 10:56:28 -04:00
Chris Rodriguez
2a23757fbc Sending skip links to single main, making more relevant 2016-04-25 10:00:45 -04:00
tasawernawaz
b4e1e97185 ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-18 08:48:21 +00:00
Renzo Lucioni
5bb0e90878 Merge pull request #12156 from edx/renzo/merge-release-into-master 
Manually merge release into master
 2016-04-15 00:47:54 -04:00
Simon Chen
75951b5936 ECOM-3195 Edit the navigation header on dashboard to expose program listing page 2016-04-14 14:44:40 -04:00
Nimisha Asthagiri
c73a238e57 Fix Dashboard on edx.org theme. 2016-04-13 17:11:53 -04:00
Matt Drayer
392ee7d258 Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming" 
This reverts commit a796b56314.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
 2016-04-12 08:22:14 -04:00
Ron Mulero
12f8edc24f Add registerd trademarked logo to footer of edx.org and edge.edx.org. 2016-04-07 19:55:51 -04:00
Omar Khan
793bb0f1e9 Custom icons for third party auth login buttons 
- Icon images can be uploaded from the django admin
- Test coverage improved
 2016-04-01 08:57:43 +07:00
Nimisha Asthagiri
0c604da9ee Merge pull request #11900 from edx/nasthagiri/css-template 
XSS Safe by default: dashboard, header, footer, navigation, help_modal
 2016-03-31 17:25:30 -04:00
Nimisha Asthagiri
6eec5ac472 XSS Safe Default - dashboard 2016-03-31 16:33:17 -04:00
Zia Fazal
a796b56314 saleem-latif/WL-328: Multi-Site Comprehensive Theming 
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
saleem-latif: Update Theme storages to work with Caching, Pipeline and collectstatic
saleem-latif: Incorporate feedback changes
mattdrayer: Pylint violation fix
mattdrayer: Fix broken pavelib test
 2016-03-28 14:57:01 -04:00
Jesse Zoldak
f891d27cbb Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming" 
This reverts commit 954dae584a.
 2016-03-16 11:19:36 -04:00
Zia Fazal
954dae584a ziafazal/WL-328: Multi-Site Comprehensive Theming 
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
 2016-03-14 13:42:53 -04:00