moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 19:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67532 commits 37 branches 544 tags 1.3 GiB
Commit graph

67532 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
7f6753151e MDL-43856 MathJax: Add a mathjax loader filter. 2014-04-03 14:36:16 +08:00
Marina Glancy
1a727e121e weekly release 2.7dev 2014-04-03 12:39:44 +08:00
Frederic Massart
52329a32f1 MDL-44747 editor_atto: Improved configuration error messages 2014-04-03 11:24:05 +08:00
Marina Glancy
e13016850c MDL-43021 course: corrections to the shortname and idnumber uniqueness validation 2014-04-03 11:07:01 +08:00
Rajesh Taneja
ae8c220fd5 MDL-44832 behat: Fixed behat test 2014-04-03 10:59:58 +08:00
Damyon Wiese
af6a2e9459 MDL-44846 Atto: Make the color plugins reliable. 
The problem is that in IE, the browser implements color commands with font tags (<font color=...>).

We specifically strip font tags to avoid abuse when pasting from word (the world has seen enough of Tahoma).

This solution instead uses Rangy to set inline styles on the selection. This works in all browsers nicely.

I also updated the toggleInlineSelectionClass function to use the same rangy function. This solves problems with
whitespace squashing in ie.
 2014-04-03 10:52:41 +08:00
Damyon Wiese
9d5859925e MDL-42195 Bootstrap: Make bootstrap responsive images "opt-in". 
This responsive image behaviour prevents setting of image sizes in text editors,
as well as a string of pix icon bugs / profile image bugs across Moodle.

We are switching to Bootstrap 3 syntax where you need img-responsive class to images
that want this behaviour.
 2014-04-03 09:21:50 +08:00
Eloy Lafuente (stronk7)
fc7557677d MDL-44720 modinfo: whitespace fix 2014-04-02 23:17:10 +02:00
Eloy Lafuente (stronk7)
6b8798dedb Merge branch 'wip-MDL-44720-master' of git://github.com/marinaglancy/moodle 2014-04-02 21:32:42 +02:00
Frederic Massart
907a6737fc MDL-44912 libraries: Allow empty values in admin setting colour picker 2014-04-02 17:20:58 +08:00
Damyon Wiese
c8afcb2e7b Merge branch 'master_MDL-44753' of https://github.com/danmarsden/moodle 2014-04-02 16:33:06 +08:00
Dan Poltawski
00f74dfd0d MDL-44590 course: fix deprecated behat step use 2014-04-02 15:58:29 +08:00
Dan Marsden
e067e6f0ad MDL-44753 SCORM: make correct selection of first sco - also fixes MDL-44896 2014-04-02 20:50:21 +13:00
Marina Glancy
bc348632e1 Merge branch 'MDL-44739-master-fixup' of git://github.com/FMCorz/moodle 2014-04-02 14:57:40 +08:00
Frederic Massart
c682844ae9 MDL-44739 theme_more: Force default settings to be set 2014-04-02 14:56:44 +08:00
Marina Glancy
ac32e42827 Merge branch 'MDL-42891-master' of git://github.com/ankitagarwal/moodle 2014-04-02 14:54:59 +08:00
Ankit Agarwal
2b0c88e2f6 MDL-42891 adminstration: update strings and display for login fails 2014-04-02 14:18:25 +08:00
Sam Hemelryk
e070ffd8ab Merge branch 'MDL-32729-im' of git://github.com/andrewnicols/moodle 2014-04-02 16:37:19 +13:00
Andrew Nicols
5c1af530db MDL-32729 Question: Load all hidden fields from the source form 2014-04-02 10:52:02 +08:00
Eloy Lafuente (stronk7)
c790670d77 Merge branch 'MDL-30085_grade_ws' of git://github.com/jleyva/moodle 2014-04-02 04:05:19 +02:00
Marina Glancy
a5af7087db Merge branch 'MDL-44749-master' of git://github.com/andrewnicols/moodle 2014-04-02 09:56:46 +08:00
Andrew Nicols
f87b22327f MDL-32729 Question: Correct button selection when openin qbank chooser 
Some browsers do not bubble form submission events to the window, and we
had more than one form on the page in certain conditions. We need to select
all of the forms on a page and then test the action.
 2014-04-02 09:54:32 +08:00
Andrew Nicols
9ad87e7900 MDL-44749 atto_collapse: Skip button inclusion if it will impact UX 
Do not show the collapse button if:
* it's specified after the cut-off and would therefore be unusable; or
* the total number of groups matches the number of groups to display anyway.
 2014-04-02 09:52:22 +08:00
Marina Glancy
0123472c87 Merge branch 'MDL-41063' of git://github.com/jmvedrine/moodle 2014-04-02 09:46:35 +08:00
Eloy Lafuente (stronk7)
2e20fc3742 Merge branch 'MDL-31262' of git://github.com/timhunt/moodle 2014-04-02 03:18:05 +02:00
Marina Glancy
cc7c745c7d Merge branch 'master_MDL-44753' of git://github.com/danmarsden/moodle 2014-04-02 09:15:33 +08:00
Eloy Lafuente (stronk7)
96eead3f6c MDL-24408 Whitespace fix. 2014-04-02 03:14:36 +02:00
Eloy Lafuente (stronk7)
bfa5acac64 Merge branch 'MDL-24408_2' of https://github.com/oasychev/moodle 2014-04-02 03:14:06 +02:00
Eloy Lafuente (stronk7)
6faa517856 Merge branch 'wip-MDL-34012-master' of git://github.com/marinaglancy/moodle 2014-04-02 02:57:15 +02:00
Eloy Lafuente (stronk7)
b224448ac6 Merge branch 'wip-MDL-43398-master' of git://github.com/marinaglancy/moodle 2014-04-02 02:47:59 +02:00
Eloy Lafuente (stronk7)
0555761203 Merge branch 'w14_MDL-44843_m27_localedash' of https://github.com/skodak/moodle 2014-04-02 02:22:51 +02:00
Eloy Lafuente (stronk7)
bd032a64f9 Merge branch 'wip-MDL-41102-master' of git://github.com/marinaglancy/moodle 2014-04-02 02:18:54 +02:00
Sam Hemelryk
3ed2a4b2cc Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle 2014-04-02 13:04:46 +13:00
Eloy Lafuente (stronk7)
57c92af7ad Merge branch 'MDL-42816-master' of https://github.com/StudiUM/moodle 2014-04-02 01:52:41 +02:00
Eloy Lafuente (stronk7)
929e32489f Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle 2014-04-02 01:12:52 +02:00
Eloy Lafuente (stronk7)
e154e9d8cd Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
 2014-04-02 00:27:30 +02:00
Dan Marsden
c87a50cb45 MDL-44753 SCORM: add check during SCORM restore to make sure valid launch sco is set 2014-04-02 10:01:54 +13:00
Sam Hemelryk
067573bd02 Merge branch 'MDL-44832-master' of git://github.com/damyon/moodle 2014-04-02 09:54:33 +13:00
Sam Hemelryk
de878a38c8 Merge branch 'MDL-44719-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/deprecatedlib.php
 2014-04-02 09:54:13 +13:00
Sam Hemelryk
8412561a3d Merge branch 'MDL-44756_help' of https://github.com/andyjdavis/moodle 2014-04-02 09:51:47 +13:00
Sam Hemelryk
53361c3087 Merge branch 'MDL-44772-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-04-02 09:43:25 +13:00
Sam Hemelryk
3b07cc1c4e Merge branch 'MDL-44762-master' of git://github.com/FMCorz/moodle 2014-04-02 09:29:11 +13:00
Sam Hemelryk
9b1a4cde78 Merge branch 'MDL-44834-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-04-02 09:28:49 +13:00
Sam Hemelryk
0ea11b7cee Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-02 09:27:23 +13:00
Sam Hemelryk
b9c16d401a Merge branch 'MDL-43284-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-02 09:27:03 +13:00
Eloy Lafuente (stronk7)
eafbd56da9 Merge branch 'wip-MDL-35305-master' of git://github.com/marinaglancy/moodle 2014-04-01 21:50:09 +02:00
sam marshall
e645b4d580 MDL-43975 Sessions: Should support memcache, not just memcached 
This commit adds a session handler which works using memcache (without
requiring the memcached extension), similar to the support for
memcache within MUC.

This may be less reliable than memcached but we have been using a
similar approach on our system without problems. In case, I added a
warning in config-dist.php.
 2014-04-01 13:34:50 +01:00
Marina Glancy
b3d75528de Merge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/moodle 2014-04-01 17:40:35 +08:00
Marina Glancy
e3e9701113 Merge branch 'wip-MDL44021' of git://github.com/jennymgray/moodle 2014-04-01 17:40:22 +08:00
Ankit Agarwal
53b9e63b80 MDL-42891 administration: Replace use of logtable in notify_login_failures() with new logging apis 2014-04-01 17:35:01 +08:00