Commit graph

73402 commits

Author SHA1 Message Date
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
ce16ceb667 Merge branch 'MDL-49983-master-fix-2' of https://github.com/xow/moodle 2015-05-05 11:57:03 +08:00
John Okely
ad13aff7c4 MDL-49983 lang: Remove language strings that were added in 2.9 2015-05-05 11:35:21 +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
David Monllao
9f3adc943b Merge branch 'MDL-49848-master' of git://github.com/xow/moodle 2015-05-05 10:37:53 +08:00
Andrew Nicols
3e5b4aa9bc Merge branch 'MDL-49845-fix-master' of git://github.com/gurgus/moodle 2015-05-05 10:28:50 +08:00
John Okely
172ed01a29 MDL-49848 message: Make messaging interface responsive 2015-05-05 10:27:14 +08:00
Andrew Nicols
e8cf6330c2 MDL-50055 enrol: Stop requiring javascript for behat tests 2015-05-05 10:23:18 +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
Dave Cooper
4ad43f2a2f MDL-49845 lang: Fixing incorrect component name for deprecated string 2015-05-05 10:01:48 +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
David Monllao
890078bf03 MDL-49983-master lang: Fixing wrong mygrades string location 2015-05-04 18:16:53 +08:00
David Monllao
d670f31fc7 Merge branch 'MDL-49923-master-fix1' of git://github.com/damyon/moodle 2015-05-04 18:06:26 +08: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
Damyon Wiese
dd636abf38 MDL-49923 theme_clean: The core renderer was in the wrong folder
Renderers need to follow autoloading rules or be included from renderer.php.
2015-05-04 16:57:10 +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
David Monllao
119ff65c0e Merge branch 'MDL-49954-master' of git://github.com/jleyva/moodle 2015-05-04 15:16:01 +08:00
Andrew Nicols
9787c4caba Merge branch 'MDL-49845-master' of git://github.com/gurgus/moodle 2015-05-04 15:03:22 +08:00
David Monllao
9996e8954b Merge branch 'wip-MDL-49846-master-fix' of git://github.com/abgreeve/moodle 2015-05-04 14:57:18 +08:00
Andrew Nicols
d3f1cde59e MDL-49987 upgrade: Correct missing main_savepoint update 2015-05-04 14:40:09 +08:00
David Monllao
3994812f38 Merge branch 'wip-mdl-50042' of git://github.com/rajeshtaneja/moodle 2015-05-04 14:16:09 +08:00
Adrian Greeve
bdf899a503 MDL-49846 tool_monitor: Context simplification and clean up.
Removed some unnecessary variables and simplified the context
usage in the index.php page.
2015-05-04 14:05:44 +08:00
Dave Cooper
327e68e69d MDL-49845 notes: Changed headers for notes index 2015-05-04 14:02:17 +08:00
Dave Cooper
a7e98a6900 MDL-49845 blog: Changed headers for blog 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
Andrew Nicols
6e9abef568 Merge branch 'MDL-49983-master' of git://github.com/xow/moodle 2015-05-04 12:39:48 +08:00
John Okely
4887d15228 MDL-49983 navigation: Remove 'my' from user context navigation 2015-05-04 12:38:50 +08:00
Andrew Nicols
23c4c76ff9 Merge branch 'wip-MDL-49846-master-v2' of git://github.com/abgreeve/moodle 2015-05-04 12:31:20 +08:00
Adrian Greeve
19452c99d7 MDL-49846 tool_monitor: Subscription page now filters on site events. 2015-05-04 12:29:54 +08:00
David Monllao
44e2802555 Merge branch 'MDL-49923-master' of git://github.com/FMCorz/moodle 2015-05-04 11:14:45 +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