David Monllao
de6b4e9dac
Merge branch 'MDL-50340-master' of git://github.com/ankitagarwal/moodle
2015-05-27 11:58:22 +08:00
David Monllao
9d1593d686
Merge branch 'wip-mdl-49772' of git://github.com/rajeshtaneja/moodle
2015-05-27 11:50:01 +08:00
Rajesh Taneja
b7861ddab3
MDL-49772 behat: Removed optimization as it's not required
...
This api is called very few times in behat
initilisation process, so such optimization
is an over engineer. Hence removing it.
2015-05-27 11:20:48 +08:00
jinhofer
36231b6cd5
MDL-49732 atto/plugins/link: Added CTRL+K for creating a link
2015-05-26 15:45:05 -05:00
Eloy Lafuente (stronk7)
777cb3ece8
Merge branch 'wip-mdl-49772' of https://github.com/rajeshtaneja/moodle
2015-05-26 18:48:03 +02:00
Dan Poltawski
2a72614f53
Merge branch 'MDL-49787_email_attachments_symlink_fix' of https://github.com/iamandrew/moodle
2015-05-26 12:57:12 +01:00
Dan Poltawski
e0db4c775e
Merge branch 'MDL-50271-master' of git://github.com/jleyva/moodle
2015-05-26 11:31:38 +01:00
David Monllao
74c32f21e2
Merge branch 'MDL-48664-master' of git://github.com/jethac/moodle
2015-05-26 14:45:34 +08:00
David Monllao
fb00b083ce
Merge branch 'MDL-46550-master' of git://github.com/ankitagarwal/moodle
2015-05-26 12:28:59 +08:00
Jetha Chan
b146b6a8c3
MDL-48664 output: change paging_bar to not use non-breaking spaces
2015-05-26 12:13:14 +08:00
Daniel Neis
2108ac8a4f
MDL-30960 messages: add option to set authtype
2015-05-25 13:40:48 -03:00
Ankit Agarwal
2d3fcda8ec
MDL-50340 adminstration: Fix restore course links
2015-05-25 11:11:20 +05:30
Juan Leyva
b3e1e2d007
MDL-50271 webservices: Allow to load multiple themes in WS_SERVER mode
2015-05-22 13:27:23 +02:00
Tomasz Muras
75aefe070b
MDL-50260 lib: remove unnecessary isset check in optional_param().
...
There is no need to do check:
if (!isset($default))
As we're guaranteed that function was called with 3 arguments (func_num_args() == 3).
2015-05-21 18:54:28 +02:00
David Mudrák
de158ec57c
MDL-50313 docs: Fix the documentation for the FEATURE_IDNUMBER constant
...
The constant is used by course/moodleform_mod.php to decide whether the
field 'ID number' (cmidnumber) should be included in the common module
settings section of the activity settings form. Activity modules that do
not use grades (such as the Label) can explicitly return false when
checking for this feature support. By default, all activity modules are
supposed to support it.
2015-05-21 16:53:00 +02:00
Rajesh Taneja
91a96d402a
MDL-49772 behat: Added support to updatestep file by parallel run
2015-05-21 13:24:29 +08:00
Dan Poltawski
9e4e5d1194
Merge branch 'wip-mdl-50116' of https://github.com/rajeshtaneja/moodle
2015-05-19 08:27:49 +01:00
Rajesh Taneja
d31e69f976
MDL-50116 behat: Fixed xpath for selecting table row
2015-05-19 13:32:32 +08:00
Eric Merrill
0f7f2134a7
MDL-48467 atto: Clean the textarea during submission when in HTML mode
2015-05-19 01:39:22 +02:00
Damyon Wiese
4c7dfac372
MDL-50254 Mustache: Missing alias for namespaced class in mustache
...
Thanks to Francesco Bigiarini for the report and suggested fix.
2015-05-18 15:11:12 +08:00
Ankit Agarwal
fa31be3b7f
MDL-46550 logs: Fix incorrect url
...
Thanks to Nadav Kavalerchik for the suggestion on patch
2015-05-18 11:49:55 +05:30
Tony Levi
aa7017432a
MDL-42192 accesslib: Cache capabilities list
...
With thanks to Andrew Nicols <andrew@nicols.co.uk> for some ammendments.
2015-05-14 11:23:47 +09:30
Eloy Lafuente (stronk7)
a17d9a6b99
Merge branch 'MDL-50187_master' of git://github.com/dmonllao/moodle
2015-05-12 09:48:28 +02:00
Eloy Lafuente (stronk7)
b758ab3053
MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts
2015-05-12 00:21:05 +02:00
David Monllao
2261bc153a
MDL-50187 docs: Including all x.y releases
2015-05-11 11:05:06 +08:00
Andrew Nicols
802dbbf882
MDL-50153 messageinbound: Normalise line endings instead of rtrim
2015-05-08 15:40:51 +08:00
Andrew Nicols
2d07240f23
MDL-50153 messageinbound: Make messageinbound tests dos-safe
2015-05-08 12:16:31 +08:00
Andrew Nicols
cba92dc805
MDL-50153 core: Use directory_separator when autoloading psr0 classes
2015-05-08 12:14:48 +08:00
Dan Poltawski
fad8ee28f1
Merge branch 'MDL-50120-master' of git://github.com/FMCorz/moodle
2015-05-07 10:52:25 +01:00
Frederic Massart
69a3587196
MDL-50120 core_user: Profile edit redirects to profile or preferences
2015-05-07 14:31:03 +08:00
Andrew Nicols
92f47ae2f9
Merge branch 'MDL-49783-master' of git://github.com/mastnym/moodle
2015-05-07 09:42:21 +08:00
Martin Mastny
eaec9cfec7
MDL-49783 forms: Collapsed form section is opened on error
2015-05-07 08:57:30 +08:00
Dan Poltawski
57fc76ab92
Merge branch 'MDL-50102' of git://github.com/stronk7/moodle
2015-05-06 10:50:35 +01:00
Marina Glancy
8b4568500b
MDL-49788 navigation: Ensure we only check active enrolments
2015-05-06 08:01:31 +01:00
Andrew Nicols
43ef409276
Merge branch 'MDL-49985_master' of git://github.com/markn86/moodle
...
Conflicts:
mod/forum/post.php
2015-05-06 11:11:21 +08:00
Juan Leyva
c4a150219a
MDL-49718 webservices: Fix forced format and force external text cleaning
2015-05-06 10:56:09 +08:00
Eloy Lafuente (stronk7)
26ea380d24
MDL-50102 versions: bump all versions and requires near release
...
version = planned 2015051100 release version
requires= current 2015050500 rc1 version
Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
2015-05-05 17:43:19 +02:00
Frederic Massart
db200a8e9f
MDL-49179 setuplib: print_error() uses local URLs exclusively
2015-05-05 18:31:13 +08:00
Frederic Massart
d031c2dcb9
MDL-49401 moodlelib: PARAM_LOCALURL supports loginhttps
2015-05-05 18:31:13 +08:00
Mark Nelson
b3cb726431
MDL-49985 core_course: revert commit belonging to MDL-18309
...
This reverts commit 6601690202
.
This commit was adding the 'returnurl' param unnecessarily to the
course links in the navigation block, causing a lot of long URLs
to be created.
2015-05-05 01:09:20 -07:00
Andrew Nicols
8b3ba5b370
Merge branch 'MDL-49983-master-fix-3' of https://github.com/xow/moodle
2015-05-05 15:34:00 +08:00
David Monllao
48645e475b
Merge branch 'wip-MDL-49778-master' of git://github.com/abgreeve/moodle
2015-05-05 15:20:47 +08:00
Adrian Greeve
aac6717056
MDL-49778 lib: Update to upgrade_stale_php_files_present()
2015-05-05 15:18:33 +08:00
John Okely
6289c2ea94
MDL-49983 admin: Improve user menu grades setting language strings
2015-05-05 15:13:01 +08:00
Andrew Nicols
d2bec50b7c
MDL-48002 inbound: Tidy up language in unit test
2015-05-05 10:57:35 +08:00
David Monllao
96ec51bdec
Merge branch 'MDL-50055-master' of git://github.com/andrewnicols/moodle
2015-05-05 10:51:30 +08:00
Andrew Nicols
2b964e1d24
MDL-50055 tests: Add new step to deal with Single Selects
2015-05-05 10:23:17 +08:00
David Monllao
a7f81bc72d
Merge branch 'MDL-48002-master' of git://github.com/ankitagarwal/moodle
2015-05-05 10:21:06 +08:00
Andrew Nicols
d29bfb25ca
Merge branch 'MDL-50084-master' of git://github.com/gurgus/moodle
2015-05-05 10:18:21 +08:00
Andrew Nicols
8ac391b826
Merge branch 'MDL-50059-master' of git://github.com/damyon/moodle
2015-05-05 09:55:11 +08:00