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

1043 Commits

Author SHA1 Message Date
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
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
Andy Armstrong
268bea9e62 Make the course content page responsive 
LEARNER-2754
 2017-11-01 17:34:04 -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
9cb906cb51 Fix i18n for the page title in course tabs 2017-10-25 11:22:30 -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
Matt Tuchfarber
17dd47bf76 Assume less perfect data 2017-10-16 15:46:10 -04:00
Matt Tuchfarber
946421c438 Rebuild program marketing page in Bootstrap and make it look similar 
to the Micromasters page
 2017-10-13 13:11:39 -04:00
Andy Armstrong
374cdb0a3d Convert course home page to Bootstrap 
LEARNER-1694

Fix a11y failure

Fix header styling

Fix layout issues

Further layout fixes
 2017-10-10 20:18:27 -04:00
Robert Raposa
8bf028620b Complete rename of CourseHomeEvents to CourseInfoEvents. 
LEARNER-2026
 2017-10-06 11:03:48 -04:00
Daniel Clemente Laboreo
adb6a5ac55 Use correct protocol in shared links (https/http) 2017-09-26 17:23:50 +03:00
Daniel Clemente Laboreo
7f7643b7b4 Encode URLs in shared links 
E.g. in "course-v1:edX+DemoX+Demo_Course" the "+" will become "%2B"
 2017-09-26 17:23:50 +03:00
Marco Morales
6c3924b40b Org label styling on openedx course about pages 
Modify organization label on openedx course index pages to not look like a button. 

Current: 


With Changes:
 2017-09-08 11:03:02 -04:00
Sofiya Semenova
038d5182ec Merge pull request #15922 from edx/ssemenova/ed-1101 
"View/Request Certificate" button logic on progress page and dashboard
 2017-09-06 11:20:21 -04:00
Sofiya Semenova
f3f7e78e24 educator-1101 view/request certificate button logic on progress page and dashboard 2017-09-05 15:29:22 -04:00
Eric Fischer
e32615e132 Revert "Merge pull request #15641 from jspayd/toggle-timer-upstream" 
This reverts commit 0c204e3520, reversing
changes made to 0495d70b46.
 2017-08-30 14:33:18 -04:00
Jesse Shapiro
b494ab7dba Show advertised start date on course details page 2017-08-29 15:45:00 -04:00
George Song
0c204e3520 Merge pull request #15641 from jspayd/toggle-timer-upstream 
Toggle timer visibility on timed exams
 2017-08-28 18:39:41 -04:00
Alex Dusenbery
2cc87952e3 EDUCATOR-1204 | can always view certs when ready for self-paced courses; don't hide cert buttons; update messaging. 2017-08-22 13:27:26 -04:00
Joshua Spayd
ab8717edbf Fix timer accessibility problems 2017-08-17 14:42:04 -07:00
Sofiya Semenova
ffd72c1051 Merge pull request #15705 from edx/ssemenova/ed-526 
EDUCATOR-526 Update view certificate button
 2017-08-16 15:52:54 -04:00
Sofiya Semenova
76f1df6b0e EDUCATOR-526 Update view cert button to only appear after availability 
date has passed
 2017-08-15 11:57:28 -07:00
Tyler Hallada
a9c1e1cf43 Squashed commit of the following: 
commit 12880fa21eac0c2e69b2d832d42829f00484561d
Author: Tyler Hallada <thallada@edx.org>
Date:   Fri Aug 11 11:17:22 2017 -0400

    Tweak exam override messaging in progress.html

commit 6f90352dc27b3a199eea7efaf84b72df50f570a9
Merge: e0e9f83789 7c535f5fb9
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:38:13 2017 -0400

    Merge remote-tracking branch 'origin/master' into EDUCATOR-926

commit e0e9f83789efa837577cedbcd5807c6fdba249e4
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:35:26 2017 -0400

    Revert "Comment out actual override and log instead"

    This reverts commit 4953cf30d9.

commit 27d6b537c8915ecd1af8af51c8f9509db6ea0a26
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:34:56 2017 -0400

    Revert "Fix tests"

    This reverts commit 1b2fec2129.

commit cabddd504ddcb4f92aeed8b5fec4bff0d64a8de3
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:34:36 2017 -0400

    Revert "Remove override behavior and log instead"

    This reverts commit 1ab1880337.

commit dc9407f4606804e00d5aee4e80d309c7d7f9c437
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:34:15 2017 -0400

    Revert "Fix python tests and use proctoring 1.0.0"

    This reverts commit 842ce8365f.
 2017-08-11 13:53:34 -04:00
Tyler Hallada
4953cf30d9 Comment out actual override and log instead 2017-08-09 11:19:31 -04:00
Tyler Hallada
8a851b3ec1 Color the override notice differently 2017-08-04 11:28:09 -04:00
Tyler Hallada
05de4a485b Add override notice to progress page 2017-08-03 16:32:17 -04:00
Joshua Spayd
dc22ec5018 Make timer toggle accessible 2017-07-26 20:56:16 +00:00
Matt Tuchfarber
827c703d16 Change templates to use site aware email 
Template were using global TECH_SUPPORT_EMAIL for error pages. This
changes them to use the site email if there is one.
 2017-07-26 16:45:12 -04:00
Joshua Spayd
db6f59987d Style timer with class rather than style attribute 2017-07-25 00:12:11 +00:00
Joshua Spayd
9da5be0298 Move JavaScript to edx-proctoring repo 2017-07-20 16:02:09 -07:00
Joshua Spayd
dd6d172abe WIP: Add toggle timer functionality 
JavaScript needs to be moved to edx-proctoring repo
 2017-07-17 20:17:22 +00:00
Nimisha Asthagiri
66bbe9023b RET: Cleanup Planning Prompts experimental code 2017-07-11 08:35:59 -04:00
Andy Armstrong
a815003b3b Handle anonymous and unenrolled users on the new course home page 
LEARNER-1696
 2017-07-10 17:52:28 -04:00
George Song
d020d7a2f9 Merge pull request #15474 from open-craft/mtyaka/chromeless-class 
Add chromeless class to the wrapper when in chromeless mode.
 2017-07-10 13:32:31 -07:00
Andy Armstrong
a113ab51d9 Removed unused accessible_modal template 2017-07-07 11:37:53 -04:00
Matjaz Gregoric
c448426cd3 Add chromeless class to the wrapper when in chromeless mode. 
This makes it easier for CSS rules to target chromeless mode. This is
useful for xblocks which want to use some CSS tweaks specific to the
chromeless view.
 2017-07-06 09:18:57 +02:00
Robert Raposa
a864b450a8 Merge pull request #15436 from edx/robrap/rename-xss-linter 
Rename xss linter.
 2017-06-30 16:22:38 -04:00
Robert Raposa
b370fe2314 Part II: Rename xss linter. 2017-06-30 13:20:23 -04:00
Robert Raposa
2e80c1e66b Refactor, enhance, and adjust unified_course_view flag. 
This includes several general enhancement in addition
to the fixes for unified_course_view:
1. Add support for default when no waffle flag defined.
2. Add support for table_blacklist to assertNumQueries.
3. Rename flag to 'course_experience.course_outline_page'.
4. Change flag default to True when it is not defined.
 2017-06-29 11:04:35 -04:00
Ibrahim
44f1f7f975 start button fix in mobile 2017-06-29 13:06:19 +05:00
Harry Rein
aea407b13e Merge pull request #15355 from edx/HarryRein/LEARNER-1485-course-reviews-tool 
LEARNER-1485: Adding a reviews page and link from the course tool bar
 2017-06-23 13:09:13 -04:00
Marko Jevtic
75531b2fef [LEARNER-437] Reflect discount on the Program About Page (WL) 2017-06-23 17:34:06 +02:00
Harry Rein
82daaa5ad3 Adding a reviews page to the course and updating the reviews module on the course about page. Removed the existing coursetalk implementation and put it in a fragment, removed the tests as well. Added configuration settings to specify the reviews template as well as the reviews provider. This is all protected by a waffle flag. 2017-06-23 11:27:48 -04:00
Marko Jevtic
d48100d386 [LEARNER-1367] Move Program Marketing page from private themes repo to edx platform repo 
[LEARNER-311] Enable a purchase button on the Program page - platform (WL)
 2017-06-23 16:27:37 +02:00
Harry Rein
e57e4e0c54 Merge pull request #15335 from edx/HarryRein/LEARNER-198 
Only show 'Resume Course' button for enrolled users
 2017-06-16 09:42:17 -04:00
Harry Rein
d5ed3de388 Hiding 'Resume Course' button for users that are not enrolled in the course and adding test to assure behavior. 2017-06-15 17:07:03 -04:00
Harry Rein
bdf38ae00e Implemented an upgrade verification sock. 
This sock sits at the bottom of both the home and the course content pages. It allows the user to click a 'Learn More' button to open a panel that allows the user to navigate to the upgrade checkout page. The sock is only shown for users that have not yet upgraded in a course that has a verification upgrade date that has not yet passed. Python tests cover the various course mode and upgrade dates.
 2017-06-15 13:10:34 -04:00
Nimisha Asthagiri
7d6ab17385 Merge pull request #15316 from edx/ret/planning-prompt-population 
Planning Prompts experiment: check content availability date
 2017-06-14 09:10:03 -04:00