Commit graph

21061 commits

Author SHA1 Message Date
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
Damyon Wiese
003577cd85 MDL-50085 output: Remove component and subtype from renderer
They were only added to support templates, and due to refactoring
are not required any more. So we should remove this API change.
2015-05-05 03:19:47 +02:00
Damyon Wiese
410034eef0 MDL-50085 templates: Minor fixes from peer review
* rename get_filename to get_filepath
* phpdocs fixes
* improve formatting of exceptions
* lang string improvement
2015-05-05 03:19:39 +02:00
Damyon Wiese
fcc383db0f MDL-50085 Mustache : Strictly define the search paths for templates.
This change moves several repeated sections of code that was searching
for templates and valid template locations to a new class. It adds
unit tests for the new class and verifies subsystem support for templates.
2015-05-05 03:19:25 +02:00
Ankit Agarwal
a4f19cfc95 MDL-48002: inbound: Add outlook fixture 2015-05-04 15:14:13 +05:30
Ankit Agarwal
7f9b8cf3a3 MDL-48002 inbound: Update regex for token matching 2015-05-04 15:13:50 +05:30
Damyon Wiese
3454072f31 MDL-50059 Output: Remove heading param from full_header
It was only used for a hack in clean to show the logo.
2015-05-04 17:02:33 +08:00
John Okely
35ea78d2ba MDL-49987 Navigation: Put messages before preferences, not mypreferences 2015-05-04 16:31:16 +08:00
Dave Cooper
eb42bb7e83 MDL-50084 pix: Updated pix to use the templatable interface 2015-05-04 15:56:45 +08:00
Ankit Agarwal
bf06f672f4 MDL-48002: inbound: Add ios fixture 2015-05-04 13:25:10 +05:30
Andrew Nicols
9787c4caba Merge branch 'MDL-49845-master' of git://github.com/gurgus/moodle 2015-05-04 15:03:22 +08:00
Andrew Nicols
d3f1cde59e MDL-49987 upgrade: Correct missing main_savepoint update 2015-05-04 14:40:09 +08:00
Dave Cooper
327e68e69d MDL-49845 notes: Changed headers for notes index 2015-05-04 14:02:17 +08:00
Dave Cooper
7193ea2cd2 MDL-49845 profile: changed 'My preferences' display logic 2015-05-04 14:02:17 +08:00
Dave Cooper
c1f97c777f MDL-49845 blog: Fixed navigation logic for blog 2015-05-04 14:02:16 +08:00
Dave Cooper
298c9da5f1 MDL-49845 navigation: Fix breadcrumbs for links in my profile. 2015-05-04 14:02:16 +08:00
Andrew Nicols
6df7f2008b Merge branch 'MDL-49987-master' of git://github.com/damyon/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2015-05-04 13:40:57 +08:00
John Okely
4887d15228 MDL-49983 navigation: Remove 'my' from user context navigation 2015-05-04 12:38:50 +08:00
Ankit Agarwal
5e4438b5c3 MDL-48002 inbound: Update fixtures to add client info 2015-05-04 08:00:01 +05:30
Ankit Agarwal
0174fa9bc0 MDL-48002 inbound: add tests for evolution 2015-05-04 08:00:01 +05:30
Andrew Nicols
a8a742cb50 MDL-48002 inbound Unit tests from fixtures for quoted text 2015-05-04 08:00:01 +05:30
Ankit Agarwal
aef3c18b76 MDL-48002 inbound: Remove quoted text from forum emails 2015-05-04 08:00:00 +05:30
Andrew Nicols
b861cc96f7 Merge branch 'wip-MDL-50066-master' of git://github.com/marinaglancy/moodle 2015-05-04 09:07:26 +08:00
Damyon Wiese
3c568cd3db MDL-49987 upgrade: Make sure messages is in the user menu
Because we have removed messages from the navigation tree,
it is important that it exists in the user menu. That is the default
behaviour, but if sites previously removed it, we need to make sure it
is inserted back.
2015-05-03 21:47:20 +08:00
David Monllao
600596fd6a Merge branch 'MDL-49840-master' of git://github.com/andrewnicols/moodle 2015-05-01 11:05:59 +08:00
Marina Glancy
2960eb4dd2 MDL-50066 strings: unable to deprecate string from moodle.php 2015-04-30 16:14:53 +08:00
Andrew Nicols
c80270fe89 Merge branch 'MDL-50033-master-enfix' of git://github.com/mudrd8mz/moodle 2015-04-30 10:47:33 +08:00
Andrew Nicols
3056a260f6 Merge branch 'MDL-49932_master' of git://github.com/markn86/moodle 2015-04-30 10:25:27 +08:00
Mark Nelson
3b318d3e69 MDL-49932 core_install: removed upgrade step changing 'defaulthomepage'
The upgrade step was changing any site that had the setting
'defaulthomepage' set to HOMEPAGE_SITE to HOMEPAGE_MY. We can
not make the assumption that users want this setting changed.
2015-04-29 15:30:45 -07:00
Helen Foster
0634dc3b76 MDL-50033 lang: Merge English strings from the en_fix language pack 2015-04-29 21:43:00 +02:00
Dan Poltawski
f60ea7d7df Merge branch 'MDL-50041-master' of git://github.com/FMCorz/moodle 2015-04-29 11:53:47 +01:00
Frederic Massart
cda2a8273a MDL-50041 gdlib: Badges need PNG files from process_new_icon() 2015-04-29 18:50:20 +08:00