Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,074 Commits 1 Branch 0 Tags
90f2fb868e0646733fad8ec615af2d2dec11801e
Commit Graph

2026 Commits

Author SHA1 Message Date
Peter Fogg
0c1dc272d4 Change "Go to Course" to "Resume Course" on course home page. 
ECOM-2960
 2016-02-03 13:58:23 -05:00
Peter Fogg
71a00bf946 Revert "Move Course Handouts to Course Resources and Tools." 
This reverts commit e8909e4439f22a7568d95a7672ab60d4a36f7322.
 2016-02-03 13:58:23 -05:00
Bill DeRusha
e75f7950d4 Updates XBlock renders its own template. Adds expand and collapse JS + jasmine tests. 
ECOM-2809
 2016-02-03 13:58:23 -05:00
Peter Fogg
9b7ce7f3f2 Lighten course tab font weight. 2016-02-03 13:58:22 -05:00
Peter Fogg
c22677c171 Move Course Handouts to Course Resources and Tools. 
The existing course handouts section is moved underneath Course
Updates and News, with updated styling.

ECOM-2808
 2016-02-03 13:58:22 -05:00
Peter Fogg
786c4456ea Last-accessed courseware on the home page. 
ECOM-2806
 2016-02-03 13:58:22 -05:00
Peter Fogg
fd397964b3 Styling and template changes for the Course Home page. 
ECOM-2810
 2016-02-03 12:20:53 -05:00
Asad Iqbal
87d9a07931 Merge pull request #11242 from edx/asadiqbal08/WL-243-manual-lang 
WL-243 LMS Language Selection
 2016-01-29 14:07:46 +05:00
asadiqbal
99b883b7be WL-243 LMS Language Selection 2016-01-28 20:07:26 +05:00
Christine Lytwynec
092eae9ff3 Merge pull request #11130 from edx/clytwynec/ac-75 
AC-75 and AC-73
 2016-01-28 08:52:40 -05:00
Ahsan Ulhaq
5181513629 Show message for earned programs credentials 
ECOM-3015
 2016-01-28 13:05:50 +05:00
Christine Lytwynec
8c8953fe32 Update discussion markdown editor add link and image modals 2016-01-27 14:43:29 -05:00
Adam Palay
c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
 2016-01-26 11:25:41 -05:00
David Ormsbee
e851db58fe Merge pull request #11325 from edx/ormsbee/remove_old_sass 
Remove unused scss files.
 2016-01-25 17:13:45 -05:00
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1" 
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
 2016-01-25 12:46:57 -05:00
clrux
519e292d82 Merge pull request #11294 from edx/clrux/ac-323 
Adjusting .sr mixins for NVDA/JAWS on Windows
 2016-01-25 11:53:11 -05:00
David Ormsbee
2904da0e2e Remove unused scss files. 
We have some Sass files that basically generate duplicates of other
Sass files and are no longer referenced from any pages. This looks
like it might have been stuff that never got cleaned up when
comprehensive themeing was done.

List of removed files and what they were replaced by:

    application.scss ->  lms-main.scss
    application-rtl.scss -> lms-main-rtl.scss
    course.scss -> lms-course.scss
    course-rtl.scss -> lms-course-rtl.scss

This should help speed up the Sass compile.
 2016-01-25 11:20:54 -05:00
Ahsan Ulhaq
46df454536 Merge pull request #11241 from edx/feature/credentials-phase-1 
Feature/credentials phase 1
 2016-01-22 18:39:53 +05:00
Chris Rodriguez
a0a9617a86 Replacing height and width in lieu of word-wrap 2016-01-21 15:18:05 -05:00
Chris Rodriguez
33f967c04b Adjusting .sr mixins for NVDA/JAWS on Windows 2016-01-21 12:42:58 -05:00
Daniel Naranjo
a639846a26 Reemplace property min-width value 
The min-width property accept only values <length> | <percentage> | inherit. to reset better set to 0.
Properties documentation: https://www.w3.org/TR/CSS2/visudet.html#min-max-widths

This error generates an invalid style, and, therefore, this value is set to 760px by: https://github.com/edx/edx-platform/blob/master/lms/static/sass/course/courseware/_courseware.scss#L50
 2016-01-21 09:50:35 -05:00
Ahsan Ulhaq
4ce58a6f67 Show message for earned programs credentials 
ECOM-3015
 2016-01-20 12:50:30 +05:00
Matt Drayer
2c1680a9cb Merge pull request #11080 from edx/saleem-latif/SOL-1529 
SOL-1529: Allow PMs to Invalidate Certificates
 2016-01-04 10:46:27 -05:00
Saleem Latif
9aa0a01cae Allow PMs to Invalidate Certificates 2016-01-04 14:28:32 +05:00
Peter Fogg
72ed155c8a Merge pull request #11046 from edx/merge-release-into-master 
Merge release into master
 2015-12-22 09:11:43 -05:00
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking 
Bookmarking
 2015-12-22 18:25:48 +05:00
Peter Fogg
39de6e828f Merge remote-tracking branch 'origin/release' into merge-release-into-master 2015-12-21 15:22:02 -05:00
clrux
ddc6b5ac6f Merge pull request #11041 from edx/clrux/ac-295 
LMS: Adding missing third topic state
 2015-12-21 13:11:43 -05:00
Chris Rodriguez
c603380a0b LMS: Adding missing third topic state 2015-12-21 12:13:47 -05:00
Matt Drayer
cf9468eaf0 Merge pull request #11007 from edx/asadiqbal08/SOL-1492 
asadiqbal08/SOL-1492 - WebCerts: Generate Cert from Support Tool
 2015-12-21 09:50:41 -05:00
Frances Botsford
7338f4bf31 adjust empty courseware search spacing 2015-12-21 09:26:32 -05:00
Usman Khalid
839b9484d7 Layout fixes required due to styling changes. 2015-12-21 15:42:29 +05:00
asadiqbal
37aebaa73b SOL-1492 2015-12-18 18:19:17 +05:00
umar-nawaz
132068eafb Merge pull request #10998 from edx/unawaz/swat-97-align 
[SWAT-97] Logistration alignment and padding.
 2015-12-18 15:58:53 +05:00
Peter Fogg
30f25105e9 Support tool for changing enrollments. 
Allows support staff or global staff to view a list of a learner's
enrollments, and change enrollment modes. We generate a
ManualEnrollmentAudit record for these enrollment changes in order to
track updates. Additionally, enrollment changes are handled through
the enrollment API, which handles bookkeeping such as granting refunds
where appropriate.

ECOM-2825
 2015-12-17 16:03:58 -05:00
Frances Botsford
0b9da334e2 adjusted styles for bookmarking 2015-12-17 12:25:09 -05:00
Frances Botsford
53eb9e605b layout fixes 2015-12-17 22:10:22 +05:00
muhammad-ammar
fcbe595c8a Bookmarks List Pagination 
TNL-2490
 2015-12-17 22:07:34 +05:00
muzaffaryousaf
3cbbb8f3b1 Add/Remove Bookmark button to each unit in LMS courseware. 
TNL-1957
 2015-12-17 22:07:32 +05:00
muhammad-ammar
c9b87aa099 Unit Bookmarks List View 
TNL-1958
 2015-12-17 22:07:31 +05:00
unawaz
a585fc7935 [SWAT-97] Logistration alignment and padding. 2015-12-17 16:07:42 +00:00
frances botsford
7c017969ca Merge pull request #10997 from edx/frances/lms-pagination-sass 
Make pagination pattern sass globally available in LMS
 2015-12-16 15:47:36 -05:00
clrux
3275b9d605 Merge pull request #10913 from edx/clrux/ac-177 
LMS: addressing contrast issues on the Progress page
 2015-12-16 15:12:42 -05:00
Peter Fogg
cb1aa0617d Merge pull request #10966 from edx/peter-fogg/fa-support-tool 
WIP for financial support tool.
 2015-12-16 15:08:59 -05:00
Peter Fogg
a680919e8c Support tool for changing enrollments. 
Allows support staff or global staff to view a list of a learner's
enrollments, and change enrollment modes. We generate a
ManualEnrollmentAudit record for these enrollment changes in order to
track updates. Additionally, enrollment changes are handled through
the enrollment API, which handles bookkeeping such as granting refunds
where appropriate.

ECOM-2825
 2015-12-16 14:17:19 -05:00
Frances Botsford
e18a6e28ca make pagination pattern sass globally available in LMS 2015-12-16 12:58:16 -05:00
Chris Rodriguez
8de5529ca4 LMS: addressing contrast issues on the Progress page 2015-12-16 11:09:27 -05:00
clrux
d8423a9018 Merge pull request #10914 from edx/clrux/ac-178 
LMS: addressing contrast on the Instructor dashboard
 2015-12-16 11:08:49 -05:00
Sarina Canelake
a9fc7aca69 Remove Legacy Instructor Dashboard 2015-12-14 10:12:38 -05:00
Bill DeRusha
67c322e77e Merge pull request #10946 from edx/bderusha/fa-require-country 
Validate country on FA form
 2015-12-14 08:36:40 -05:00