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

5102 Commits

Author SHA1 Message Date
Peter Fogg
77343a02d2 Merge pull request #11486 from itsbenweeks/info_display_number_fix 
info page course id -> display_number_with_default
 2016-02-11 12:53:21 -05:00
Ben Weeks
52e8db34fd course id/org/name -> display_stuff_with_default 2016-02-11 10:25:12 -05:00
Muzaffar yousaf
a26d576458 Merge pull request #11499 from mehrozezahid/mehrozezahid/TNL-4096 
Added target='_blank' to both cohort external doc links.
 2016-02-11 12:46:32 +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
mehrozezahid
4ed9d0a44a Added target='_blank' to both href attributes 2016-02-10 14:49:44 +05:00
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05:00
Saleem Latif
ccbd88acc1 Merge pull request #11402 from edx/saleem-latif/WL-298 
WL-298: Create a theme named 'stanford-style' to be used by comprehensive theming
 2016-02-10 10:38:46 +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
Robert Raposa
29fe2c7b0c Move markup helpers to djangolib 2016-02-05 02:42:43 -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
Muhammad Ammar
886d54dce9 Merge pull request #11320 from edx/ammar/boomark-button-requirejs-caching 
bookmark button js caching
 2016-02-04 21:07:45 +05:00
muhammad-ammar
3127ac9180 bookmark button js caching 
TNL-3954
 2016-02-04 17:59:47 +05:00
Saleem Latif
14572c19d4 Create a theme named 'stanford-style' to be used by comprehensive theming 2016-02-04 11:17:23 +05:00
Robert Raposa
f555ffd585 Refactor and improve js_utils helpers 
- Rename escape_json_dumps to dump_js_escaped_json
- Rename escape_js_string to js_escaped_string
- Update js_escaped_string to output empty string for None
- Introduce dump_html_escaped_json
- Move dump_js_escaped_json after the pipe as new best practice
- Introduce additional uses of helpers
- Introduce new djangolib directory and move js_utils
 2016-02-03 17:13:21 -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
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
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
Matt Drayer
71a6779dfa Merge pull request #11138 from fghaas/no-video-if-unset 
lms: Only show welcome video if show_homepage_promo_video is set
 2016-02-03 13:08:31 -05:00
Ahsan Ulhaq
96d030b6d9 Reverse and Rename Courseware and Course Info Tabs 
ECOM-2678
 2016-02-03 12:20:53 -05:00
Peter Fogg
fd397964b3 Styling and template changes for the Course Home page. 
ECOM-2810
 2016-02-03 12:20:53 -05:00
clrux
8a2d989369 Merge pull request #11247 from edx/clrux/ac-313-fixup 
CMS: Removing H1 and H2 from editor options; updating editor icons
 2016-02-03 09:28:44 -05:00
Florian Haas
fef6f64a7b lms: Only show welcome video if show_homepage_promo_video is set 
While show_homepage_promo_video would previously toggle the control to
play the welcome video on and off, the YouTube embed iframe would be
included in index.html unconditionally. This created the ugly
situation that YouTube would try to pull in a non-existent video, and
that a DoubleClick tracking beacon would be introduced to the start
page for no reason.

Instead, make sure show_homepage_promo_video toggles the entire modal
video section on and off, suppressing it altogether unless
show_homepage_promo_video is set.
 2016-02-03 09:37:27 +01:00
Chris Rodriguez
4ae40e7bdd Updating icons on problem type editor 2016-02-02 15:41:04 -05:00
Chris Rodriguez
81d86eea42 Changing H2 to H3 in problem templates 2016-02-02 15:41:02 -05:00
Adam
979552512d Merge pull request #11380 from edx/fix-typo 
fix typo on certificate page
 2016-02-02 10:49:42 -05:00
Diana Huang
cd0bb4c7e0 Add ability to generate static i18n files. 2016-02-01 15:54:10 -05:00
Adam Palay
cf28ed9491 fix typo on certificate page 2016-01-29 09:12:46 -05:00
Zia Fazal
06e38e1c24 added branding to 404 and 500 error pages 
changes based on feedback

renamed a definition and added test coverage

fixed broken tests
 2016-01-29 15:46:51 +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
Douglas Hall
22eda46e5f Merge pull request #11368 from edx/hotfix/2016-01-28_release_into_master 
Merging release into master
 2016-01-28 14:12:29 -05:00
Douglas Hall
22430f610b Merge branch 'release' into hotfix/2016-01-28_release_into_master 2016-01-28 12:40:00 -05:00
Peter Fogg
6e6c397776 Reenable course home improvements check. 
This was disabled some time ago due to PLAT-900, which caused cached
objects to be unpickled and used in new code which could expect to
find new fields that didn't exist on the old objects. That issue is
now fixed.

ECOM-2853
 2016-01-28 11:33:45 -05:00
asadiqbal
99b883b7be WL-243 LMS Language Selection 2016-01-28 20:07:26 +05:00
Douglas Hall
2447540d5f Updated proctored/timed exam header bar text; Upgraded edx-proctoring to pull in additional text changes 2016-01-28 09:40:14 -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
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
Zia Fazal
c0648ab164 moved IS_EDX_DOMAIN dependent feature to edx.org theme 2016-01-22 15:32:19 -05:00
Saleem Latif
2d83449240 Remove microsite_configuration/microsite.py references from individual templates 
* mattdrayer: Updated get_themed_template_path
 2016-01-22 14:27:58 -05:00
Ibrahim
0f09bb8a94 raise 404 when copyright template is missing 2016-01-22 12:02:46 -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
Mushtaq Ali
d8b902ad58 Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg 
Escape Course Name in enrolment message
 2016-01-20 20:04:23 +05:00