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
Dan Poltawski
f9fc19cdae
Merge branch 'MDL-49844-master' of git://github.com/lameze/moodle
2015-04-16 13:45:20 +01:00
Dan Poltawski
1d81e1afc0
Merge branch 'MDL-49842-master' of git://github.com/xow/moodle
2015-04-16 10:30:28 +01:00
David Monllao
960c0ec405
Merge branch 'wip-mdl-49456' of git://github.com/rajeshtaneja/moodle
2015-04-16 16:39:20 +08:00
Dan Poltawski
36410f1a69
Merge branch 'm29_MDL-47004_LDAP_Better_Default_ObjectClass' of https://github.com/scara/moodle
2015-04-16 09:22:21 +01:00
Rajesh Taneja
72bac0d3f2
MDL-49456 behat: Fixed following issues in parallel run
...
1. Parallel run without feature should exit with success
2. Updated exit codes to be more clear for each process
3. Fixed wwwroot and dataroot while executing with tags
4. Added support for running scenario/feature
5. Added support for or'ing tags
6. Added support for running single behat site
7. Fixed wrong example in help
8. Use parallel run only when parallel > 1
9. Exit showing behat site is not installed
10. Exit with error, if not a valid option
11. Added usage in help to explain how to use command
12. run.php should be able to run from any path
13. Pass all arguments to single run
2015-04-16 15:44:25 +08:00
John Okely
65903c7607
MDL-49842 install: Set front page summary to '' after cli install
...
This is to prevent front page summary from appearing as a 'new setting'
after the first upgrade of a site installed via cli.
2015-04-16 11:49:22 +08:00
David Monllao
7187ec30cb
Merge branch 'MDL-49377-master-updatemsg' of git://github.com/mudrd8mz/moodle
2015-04-16 09:44:10 +08:00
Andrew Nicols
fb3b04cb03
Merge branch 'patch-1' of https://github.com/sk-unikent/moodle
2015-04-16 07:45:04 +08:00
Matteo Scaramuccia
6514ced4f5
MDL-47004 LDAP: improved the default objectClass setting for AD.
2015-04-15 23:53:35 +02:00
Dan Poltawski
75e20c1845
Merge branch 'wip-MDL-18309-master' of git://github.com/marinaglancy/moodle
2015-04-15 09:54:36 +01:00
Simey Lameze
c7ccb543ac
MDL-46963 core_upgrade: change the call to guess_antelope_row_size
2015-04-15 15:01:19 +08:00
Simey Lameze
6592a11994
MDL-49844 core: add header to web page link
2015-04-15 14:33:07 +08:00
Frederic Massart
60de7df148
MDL-49800 core_output: Templates are not allowed in sub directories
2015-04-15 14:03:23 +08:00
David Monllao
e256b59702
Merge branch 'MDL-46963-master' of git://github.com/lameze/moodle
2015-04-15 13:35:37 +08:00
Andrew Nicols
12a9ae5c97
Merge branch 'MDL-49551_master' of git://github.com/markn86/moodle
2015-04-14 15:32:17 +08:00
Dan Poltawski
ce54688f8e
Merge branch 'MDL-49723-master' of git://github.com/lameze/moodle
2015-04-14 15:32:16 +08:00
Dan Poltawski
0627d5802c
Merge branch 'wip-MDL-45774-master' of git://github.com/abgreeve/moodle
2015-04-14 15:32:13 +08:00
Andrew Nicols
80b4868a50
Merge branch 'MDL-49762_master' of git://github.com/nadavkav/moodle
2015-04-14 15:32:11 +08:00
Andrew Nicols
69c150cbda
MDL-49840 testing: Always call composer install
2015-04-14 11:26:53 +08:00
Mark Nelson
17a3781259
MDL-49551 core_dml: deprecated set_logging()
2015-04-13 19:30:08 -07:00
Adrian Greeve
6e918b6437
MDL-45774 navigation: General fixes for the user navigation.
2015-04-13 15:54:24 +08:00
Adrian Greeve
72324523ad
MDL-45774 navigation: Version bump and upgrade.php edit.
2015-04-13 15:31:23 +08:00
Frederic Massart
08cb34a5a6
MDL-49819 profile: Move email to top and interests to lower location
2015-04-13 15:31:22 +08:00
Adrian Greeve
ee8ad79fe0
MDL-49819 navigation: My courses no longer active but still expanded.
...
The 'My courses' link in the navigation tree is expanded but no longer
active on the dashboard screen.
Part of MDL-45774.
2015-04-13 14:41:55 +08:00
