Commit graph

20541 commits

Author SHA1 Message Date
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
Michael Aherne
5ea1e1110f MDL-50009 cron: Prevent tasks from leaving uncommitted transactions 2015-04-29 09:39:07 +01:00
Andrew Nicols
3db610583e Merge branch 'MDL-49928-master' of git://github.com/ankitagarwal/moodle 2015-04-29 13:40:44 +08:00
Ankit Agarwal
b647db20e1 MDL-49928 userprofile: Reorder blocks 2015-04-29 10:15:00 +05:30
Andrew Nicols
2fac3c3c5f Merge branch 'wip-MDL-49888-master' of git://github.com/abgreeve/moodle 2015-04-29 12:18:52 +08:00
Dan Poltawski
a6dbe2fb1a Merge branch 'wip-mdl-49974' of https://github.com/rajeshtaneja/moodle 2015-04-28 15:01:08 +01:00
Frederic Massart
c7d5ca8d16 MDL-49981 badges: Missing link to manage your badges 2015-04-28 10:13:36 +01:00
Adrian Greeve
12261113a9 MDL-49888 navigation: Added missing reports to user profile.
Added statistics and grade to the reports section in the user
profile.
2015-04-28 14:30:26 +08:00
Rajesh Taneja
b6e98dc8bd MDL-49974 unit_test: Use datetime format supported by different os
%k is not supported by windows, so using %H
2015-04-24 13:01:01 +08:00
Andrew Nicols
ed8caffa5a Merge branch 'MDL-49613' of https://github.com/NeillM/moodle 2015-04-23 08:40:44 +08:00
Dan Poltawski
1f23341f7d Merge branch 'MDL-49800-master' of git://github.com/FMCorz/moodle 2015-04-22 10:47:56 +01:00
Neill Magill
9d72ae249c MDL-49613 access: count_role_users gives unexpected results
The count_role_users function in lib/accesslib.php gives the wrong results if a user has the
same role at multiple levels in a context path.

For example a user is a coursecreator on a course and the category that the course is in,
in this case they would be counted twice, rather than being recognised as the same user.

This change will make the function only count unique users.
2015-04-22 09:34:45 +01:00
Neill Magill
3a92084c6b MDL-49613 access: Unit test for count_role_users 2015-04-22 09:34:44 +01:00
Dave Cooper
f13a911317 MDL-49849 profile: Split site access information into it's own section 2015-04-22 14:08:18 +08:00
Simey Lameze
e35bac3e80 MDL-49854 core: User navigation refinements
Fixing some reported issues:
- Removing unnecessary conditional include
- Require login in grade/report/mygrades.php
- Remove unnecessary defined('MOODLE_INTERNAL') call
- Fixing context_header::__construct $imagedata param type
2015-04-21 11:46:32 +08:00
Andrew Nicols
793645a03f Merge branch 'm29_MDL-49782' of https://github.com/totara/moodle 2015-04-21 10:43:48 +08:00
Rajesh Taneja
0fe86bbdbb MDL-49799 behat: replaced asd.com with example.com
asd.com is a valid domain, we should use reserved domain names for testing
2015-04-20 11:21:20 +08:00
Rajesh Taneja
f8b71928d2 MDL-49456 behat: Use proper dir separator to support different os 2015-04-17 11:48:37 +08:00
Dan Poltawski
8da277ea96 Merge branch 'MDL-49894-master' of git://github.com/jleyva/moodle 2015-04-16 16:10:23 +01:00
Juan Leyva
6d28e2cfa6 MDL-49894 webservices: Add missing API changes in upgrade.txt 2015-04-16 15:19:42 +02:00