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

3509 Commits

Author SHA1 Message Date
vkaracic
f58c2cd6b0 Otto checkout flow 2016-02-17 15:04:19 -05:00
Ned Batchelder
4b7dcb2bdd Update translations (autogenerated message) 2016-02-11 12:23:55 +00:00
Awais Jibran
dabda5bc75 Merge pull request #11375 from attiyaIshaque/ai/tnl3573-resetpassword-empty-page-fix 
Resetting password shows empty page.
 2016-02-10 18:39:21 +05:00
Asad Iqbal
64291d3c01 Merge pull request #11391 from edx/asadiqbal08/WL-272 
asadiqbal08/WL-272 - Studio Language Selection
 2016-02-10 18:30:29 +05:00
Attiya Ishaque
a042cbc7f0 Resetting password shows empty page. 
TNL-3573
 2016-02-10 14:47:41 +05:00
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05:00
Renzo Lucioni
cceeff3657 Remove unnecessary p tag from XSeries dashboard message 2016-02-09 16:05:06 -05:00
Andy Armstrong
84773d2ff7 Merge pull request #11482 from edx/release 
Merge release back to master
 2016-02-09 12:49:41 -05:00
Andy Armstrong
caf4cfbd3a Merge pull request #11268 from edx/andya/add-pattern-library 
Add edX Pattern Library to edx-platform
 2016-02-09 12:07:03 -05:00
clrux
a5e34d4e12 Merge pull request #11105 from edx/clrux/ac-23 
Updating forum buttons and overall icon cleanup
 2016-02-09 10:53:31 -05:00
Chris Rodriguez
4454c819c8 LMS: forum markup tweaks and cleanup 2016-02-09 09:34:58 -05:00
Saleem Latif
c265dfbac4 Merge pull request #11390 from edx/saleem-latif/SOL-1529-translation-updates 
Going to merge, "Remove concatenation of i18n strings."
 2016-02-09 11:35:17 +05:00
Andy Armstrong
a27c702517 Merge pull request #11455 from edx/clrux/hotfix-rc-2016-02-09 
Hotfix: ac-201
 2016-02-08 14:35:56 -05:00
Peter Fogg
f3c20e7360 Correctly add profile image to edX header. 2016-02-08 12:47:27 -05:00
Chris Rodriguez
ad36f761c1 Hotfix: ac-201 2016-02-08 09:05:52 -05:00
Saleem Latif
dc502ea913 Remove concatenation of i18n strings. 2016-02-08 11:24:19 +05:00
Andy Armstrong
d731b07bd4 Add UXPL to edx-platform 
UITK-39
 2016-02-05 13:33:55 -05:00
Ned Batchelder
aec1ed3992 Merge pull request #11423 from edx/ned/update_translations 
Update translations (autogenerated message)
 2016-02-04 16:50:35 -05:00
Brian Talbot
0195877842 certificates: reference NPM installed UXPL 
* remove static UXPL + lib files from root
* updating edx-pattern-library npm version to 0.8.12
* resolving UXPL syntax/version changes
* syntax/spacing corrections
* correcting npm-based lib paths
* UXPL update - syncing up sass LTR/RTL compile
* UXPL update - font-size, line-heights, + colors
* UXPL update - breakpoint names
* UXPL update - removing unnecessary %reset-link reference
* customizing UXPL buttons for banner actions
 2016-02-04 15:55:26 -05:00
Ned Batchelder
bd377587ac Update translations (autogenerated message) 2016-02-04 15:50:17 +00:00
clrux
9ef9bc6efb Merge pull request #11129 from edx/clrux/ac-201 
LMS: darkening a gray on the profile page
 2016-02-04 10:11:24 -05:00
Ned Batchelder
3dcb4b0793 Update translations (autogenerated message) 2016-02-04 14:51:33 +00:00
Chris Rodriguez
652e4ce0c1 LMS: darkening a gray on the profile page 2016-02-04 09:09:45 -05:00
Peter Fogg
8ed051e3cf Merge pull request #10642 from edx/feature/self-paced 
Course home page improvements.
 2016-02-03 15:06:59 -05:00
Christina Roberts
9a786d08a2 Merge pull request #11395 from edx/christina/fix-test-typo 
Fix unit tests so they are testing aria-expanded.
 2016-02-03 14:41:49 -05:00
Peter Fogg
244843d929 Track events on the course home page. 
Events are added for accessing the courseware, entering the verified
upgrade flow, and toggling a course update.

ECOM-2983
 2016-02-03 13:58:24 -05:00
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
Diana Huang
1e1f5abe10 Check in new static i18n JS files. 2016-02-01 15:54:14 -05:00
Diana Huang
cd0bb4c7e0 Add ability to generate static i18n files. 2016-02-01 15:54:10 -05:00
cahrens
8f19128d83 Fix unit tests so they are testing aria-expanded. 2016-02-01 14:01:05 -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
Diana Huang
640b5d31f4 Merge pull request #10699 from doganov/TNL-3644 
Fixes TNL-3664 by collapsing actions dropdown after an action item is clicked.
 2016-01-25 13:43:24 -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