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

12708 Commits

Author SHA1 Message Date
Sanford Student
24c4c8abed ma-1881 handling empty translations and testing 
using lists for json serializability, if that's a word
 2016-02-10 15:56:42 -05:00
Robert Raposa
29fe2c7b0c Move markup helpers to djangolib 2016-02-05 02:42:43 -05:00
Ned Batchelder
158c4e58a3 Merge pull request #11424 from edx/ned/make-i18n-more-foolproof 
Move JSON samples out of translated strings so translators can't make mistakes
 2016-02-04 20:31:42 -05:00
Kevin Falcone
98671a8aa6 Merge pull request #11399 from edx/jibsheet/dont-use-using 
Don't use using() in migrations
 2016-02-04 19:47:10 -05:00
Jonathan Piacenti
328c84a2bb Update bok_choy database cache. 2016-02-04 15:55:18 -06: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
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
6f9fd5d357 Move JSON samples out of translated strings so translators can't make mistakes 2016-02-04 10:07:05 -05:00
Chris Rodriguez
652e4ce0c1 LMS: darkening a gray on the profile page 2016-02-04 09:09:45 -05:00
muhammad-ammar
3127ac9180 bookmark button js caching 
TNL-3954
 2016-02-04 17:59:47 +05:00
Christina Roberts
901cafe57a Merge pull request #11419 from edx/christina/enable-test 
Remove skip from studio page bok choy test
 2016-02-03 16:37:10 -05:00
cahrens
19162fb752 Asset page is hopefully loading more reliably now. 2016-02-03 15:46:51 -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
77aa07544e Internationalize course info sidebar default. 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
Hasnain
d275dd4a70 Added bok choy test for proctoring instructor dashboard 2016-02-03 10:48:55 -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
Zia Fazal
23b24d503e Merge pull request #11404 from edx/ziafazal/WL-305 
ziafazal/WL-305: removed constraints on MicrositeHistory model to allow Updates on Microsite
 2016-02-03 11:17:35 +05: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
Toby Lawrence
78370f3644 Merge pull request #11400 from edx/PERF-258 
Add the ability to exclude files from URL canonicalization.
 2016-02-02 11:28:05 -05:00
Calen Pennington
dffbc69a3c Merge pull request #11329 from cpennington/fix-cert-type-names 
Fix the help text for cert_name_short and cert_name_long
 2016-02-02 11:19:09 -05:00
Calen Pennington
1d60c40bd2 Merge pull request #11215 from CredoReference/xblock_aside_example 
XBlockAsides: little example of usage
 2016-02-02 10:45:20 -05:00
Ben Patterson
dcfb95e76b Merge pull request #11387 from edx/benp/fix-test-tooltip 
Correct flaky condition on tooltip.
 2016-02-02 10:44:53 -05:00
Toby Lawrence
e57d1a2006 Add leading period so we don't get partial matches on extensions. 2016-02-02 10:07:13 -05:00
Zia Fazal
9aa6718b25 removed constraints on MicrositeHistory model to allow Updates on Microsite model 
fixed quality violations
 2016-02-02 19:01:09 +05:00
Ben Patterson
902126d55c Clarify method intent. Use BrokenPromise rather than assert. 2016-02-02 06:48:30 -05:00
Toby Lawrence
1183f6cec9 Add the ability to exclude files from URL canonicalization. 
To be able to more easily deal with same-origin issues, due to some course assets being loaded in an iframe, we're adding the ability to specify file extensions that should be excluded from URL canonicalization.  The default value is simply 'html', which means we won't rewrite asset links that point to files ending in .html.  Thus, they'll be loaded from the same origin as the parent page, and voila, no SOP issues.
 2016-02-01 21:44:35 -05:00
Peter Desjardins
2a5b6c9aa3 Edited wording of UI labels for configuring subsection prerequisites (gating) 2016-02-01 17:32:48 -05:00
Calen Pennington
8acb93690f Fix the help text for cert_name_short and cert_name_long 
This resolves the textual issue in [ECOM-2907] (https://openedx.atlassian.net/browse/ECOM-2907).
There will also be a data fix.
 2016-02-01 17:02:14 -05:00
Kevin Falcone
2d9708da03 Remove uses of using() from migrations 
This hardcoded the db_alias fetched from schema_editor and forces django
to try and migrate any second database you use, rather than routing to
the default database.  In testing a build from scratch, these do not
appear needed.

Using using() prevents us from using multiple databases behind edxapp.

Additionally - add back a removed backwards migration from certificates
0003.  I have no idea why this was dropped in the 1.8 upgrade.
 2016-02-01 16:57:26 -05:00
Douglas Hall
97cf6dd485 Merge pull request #11385 from edx/douglashall/fix_xmodule_import 
Remove gating api import from course xmodule
 2016-01-31 22:10:32 -05:00
Ben Patterson
07f8b8e9c3 Correct flaky condition on tooltip. 2016-01-30 16:56:12 -05:00
Douglas Hall
907d3e9f08 Merge pull request #11379 from edx/hasnain-naveed/HOL-44-extented 
HOL-44 / Added check for duplication of email
 2016-01-30 07:19:07 -05:00
Ben Patterson
d7be722ce7 [firefox upgrade] Wait for code mirror editor to be active 
Not an issue for our tests on firefox 28; however, once we upgrade to
Firefox 42 (or later), a new wait condition is needed here. Otherwise,
the content is not set because selenium's action chain is starting too
early.
 2016-01-29 20:42:17 -05:00
Douglas Hall
7c923355b2 Remove gating api import from course xmodule to avoid importing django related code into non-django related code 2016-01-29 18:42:04 -05:00
David Ormsbee
c13e623067 Speed up SASS compilation with libsass 2016-01-29 12:30:55 -05:00
Douglas Hall
dce3d9ca81 Merge pull request #11014 from edx/douglashall/PHX-219/subsection_gating 
PHX-219 Subsection Gating
 2016-01-29 11:05:39 -05:00
Hasnain
0971e3715a Added check for duplication of email 2016-01-29 14:01:07 +00:00
Zia Fazal
6e861f266b Merge pull request #11352 from edx/ziafazal/WL-209 
ziafazal/WL-209:Cert Social Sharing customization
 2016-01-29 16:50:17 +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
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
asadiqbal
99b883b7be WL-243 LMS Language Selection 2016-01-28 20:07:26 +05:00