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
Eric Fischer
8838f11cd2 Move hint before content it refers to 
EDUCATOR-1557
 2017-11-08 16:13:11 -05:00
Robert Raposa
f835fc8c1f Merge pull request #15476 from open-craft/mtyaka/homepage-course-max-site-config 
Ability to set HOMEPAGE_COURSE_MAX via SiteConfiguration.
 2017-11-08 12:21:14 -05:00
Brian Mesick
d552dea16e Merge pull request #16464 from edx/bmedx/django111_urls_lms_3 
LMS urls cleanup for Django 1.11 part 3
 2017-11-08 11:26:57 -05:00
Matjaz Gregoric
9566b7a5f6 Ability to set HOMEPAGE_COURSE_MAX via SiteConfiguration. 
The setting controls the number of courses displayed on the homepage.
 2017-11-08 15:57:32 +01:00
bmedx
bebdc069a7 LMS urls cleanup for Django 1.11 
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
- This is the third urls update for LMS
 2017-11-07 14:17:54 -05:00
Gregory Martin
8089a0db41 Merge pull request #16452 from edx/yro/EDUCATOR-1554 
Yro/EDUCATOR 1554
 2017-11-06 17:24:05 -05:00
Clinton Blackburn
69eeca61d8 Opening courseware to anonymous users 
Anonymous users may now view units in the courseware. This access is limited to units that are not considered problems/graded (e.g. homework, exams).
 2017-11-06 16:42:06 -05:00
Gregory Martin
a990e1fee8 Add Paragon Implementation to Wiki 2017-11-06 16:33:46 -05:00
Matt Tuchfarber
166d784dd5 Merge pull request #16453 from edx/tuchfarber/more_program_marketing 
Make program marketing dynamic and less 500-prone.
 2017-11-06 15:07:43 -05:00
Matt Tuchfarber
28e1e2bb4b Make page more dynamic and less 500-prone. Also fix image sizing. Makes 
nav links dynamic based on content.
 2017-11-06 14:07:29 -05:00
Harry Rein
7f61828e12 Cleaning up mobile web. 2017-11-06 12:33:23 -05:00
Eric Fischer
2ede2b7397 Revert "Revert "Merge pull request #15641 from jspayd/toggle-timer-upstream"" 
This reverts commit e32615e132.
 2017-11-03 15:38:44 -04:00
Douglas Hall
174302c191 Fixed enterprise tagline styling. 
ENT-749
 2017-11-03 14:40:17 -04:00
Andy Armstrong
42396560f1 Merge pull request #16432 from edx/HarryRein/EDUCATOR-1681-import-error 
Import Issue.
 2017-11-02 16:56:04 -04:00
Tasawer Nawaz
01f6d69298 Merge pull request #16350 from edx/tasawer/learner-2735/add-success-component 
add success component on successful form submission
 2017-11-03 00:03:28 +05:00
Harry Rein
8e64b4c252 Import Issue. 2017-11-02 15:01:17 -04:00
tasawernawaz
5d97f6a3b0 add success component on successfull form submission LEARNER-2735 2017-11-02 22:41:58 +05:00
Harry Rein
22e05f622e Merge branch 'master' into release-mergeback-to-master 2017-11-02 13:33:03 -04:00
Saleem Latif
d36153cbb8 Hide braces when ENTERPRISE_TAGLINE is not set. 2017-11-02 12:20:33 +05:00
Harry Rein
63eeca73ce Removing waffle flag for responsive header. 2017-11-01 21:36:32 -04:00
Andy Armstrong
268bea9e62 Make the course content page responsive 
LEARNER-2754
 2017-11-01 17:34:04 -04:00
Robert Raposa
b57f144724 Merge pull request #16402 from edx/robrap/remove-pragma 
Remove pragmas to disable mako-missing-default
 2017-11-01 08:52:12 -04:00
Bill Filler
f9f4876bee Add 'View Consent' button to dashboard when required 
Enterprise customers can require user to agree to Data Sharing Consent
form before they can access a course. We now add it conditionally to
Course Dashboard when it's required so it's apparent to user and they
have a way to revist the consent form if they've previously declined or
the course has not yet started.

WL-1281
 2017-10-31 15:40:02 -04:00
Robert Raposa
fcfb40cf52 Remove pragmas to disable mako-missing-default 2017-10-31 14:42:55 -04:00
Gregory Martin
97c1a7580b Fix onload tabindex focus for wiki edits 2017-10-30 16:37:39 -04:00
Andy Armstrong
ae1c760ea4 Use Bootstrap theme colors and fonts in old stylesheets 
LEARNER-2977

Fixes
 2017-10-29 22:22:08 -04:00
Harry Rein
58f93cc7cc Styling fixes for the dashboard and course header. 2017-10-29 15:04:29 -04:00
Matt Tuchfarber
e88d916c29 Merge pull request #16360 from edx/tuchfarber/marketing_hero 
Add hero to main.html and use it in program page
 2017-10-27 13:45:27 -04:00
Matt Tuchfarber
a93832aabe Add hero to main.html and use for program page 
Adding hero to main.html allows for full width marketing images to be
used. This commit includes the addition of the hero block into
main.html along with the program marketing page's use of that new
hero block.
 2017-10-27 12:26:21 -04:00
Andy Armstrong
8dc47f5797 Merge pull request #16336 from edx/andya/fix-browser-tab-i18n 
Fix i18n for the page title in course tabs
 2017-10-25 17:40:51 -04:00
Diana Huang
b0877270bf Add course grades to programs dashboard. 2017-10-25 15:44:47 -04:00
Andy Armstrong
9cb906cb51 Fix i18n for the page title in course tabs 2017-10-25 11:22:30 -04:00
Hasnain Naveed
b9cd1043df Merge pull request #16320 from edx/hasnain-naveed/WL-1060 
WL-1060 | Made the dashboard social sharing site aware.
 2017-10-25 16:01:41 +05:00
tasawernawaz
d839d17714 update css and html/ add basics for react 
LEARNER-2804
 2017-10-25 11:12:26 +05:00
Harry Rein
ed2e6dc889 Merge pull request #16306 from edx/HarryRein/responsive-dashboard 
Harry rein/responsive dashboard
 2017-10-24 12:33:12 -04:00
Uman Shahzad
0a726a4679 Show the Enterprise tagline on the logistration page. 2017-10-24 20:12:27 +05:00
Harry Rein
889e9880f5 Responsive dashboard and learner profile. 2017-10-24 11:08:35 -04:00
Hasnain
2277aaca3f WL-1060 | Made the dashboard social sharing site aware. 2017-10-24 16:35:44 +05:00
Ned Batchelder
5940342f71 Merge pull request #16180 from caesar2164/shopping-cart-style-fixes 
Fix Shopping-cart CSS and JS
 2017-10-23 13:51:43 -04:00
Harry Rein
3d79e3e05d Adding unified, responsive header. 2017-10-20 16:24:31 -04:00
Waheed Ahmed
c56f72878e Fix edX logo links to home page instead of dashboard. 
When you are on the Dashboard, or on any page in courseware, the logo
in the Header links to dashboard and the logo in the footer links
to edX home page.

LEARNER-2881
 2017-10-20 14:49:06 +05:00
Nimisha Asthagiri
41862cf163 Merge pull request #16035 from proversity-org/proverity/NVN-enrollment-search-instructor-dashboard-fix 
FIX: course enrollment search, FIX: hidden tabs on instructor dashboard
 2017-10-19 17:50:06 -04:00
Andy Armstrong
e2612bdccf Merge pull request #16249 from edx/andya/responsive-discussions 
Make the discussion board responsive
 2017-10-19 17:09:47 -04:00
Douglas Cerna
94bea7a707 Cherry picked Adolfo's commits and addressed Braden's observations 2017-10-19 14:24:58 -04:00
Andy Armstrong
d18022bb5d Make the discussion board responsive 
LEARNER-1923
 2017-10-19 14:09:22 -04:00
Matt Tuchfarber
b5ddcb3950 Merge pull request #16263 from edx/tuchfarber/program_marketing_fix 
Fix program marketing page when it doesn't have a video.
 2017-10-19 09:18:48 -04:00
Matt Tuchfarber
75e3845dad Fix issue where program doesn't have video 
I wrongly assumed a video field wouldn't exist on a program
that doesn't include a video. Since it exists and is set to null
this fixes the retrieval of the source url.
 2017-10-18 16:56:00 -04:00
Sofiya Semenova
7382fe12aa Merge pull request #16203 from edx/ssemenova/dashboard-cert-info 
Clean up dashboard_certificate_information template.
 2017-10-17 14:50:42 -04:00
Sofiya Semenova
b8d73df5a4 Cleaning up dashboard_certificate_information template. 2017-10-17 13:27:19 -04:00
Matt Tuchfarber
77c1ca51d8 Merge pull request #16248 from edx/tuchfarber/program_marketing_edits 
Fix program marketing page to assume less (fix 500 error on stage/prod)
 2017-10-17 10:31:26 -04:00