moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73249 commits 37 branches 544 tags 1.3 GiB
Commit graph

20097 commits

Author SHA1 Message Date
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
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
Adrian Greeve
3a13707a0a MDL-49819 navigation: Admin section in user profile update. 
The Admin section will now only show when the admin or someone
    with similar capabilities views the user profile. The edit profile
    link has also been moved.

    Part of MDL-45774.
 2015-04-13 14:41:24 +08:00
Simey Lameze
9b8104ce9b MDL-46963 environment: add check for antelope row format 2015-04-13 14:18:12 +08:00
Andrew Nicols
f3cd1624c3 MDL-49828 timezones: Correct typo in unit tests 2015-04-13 11:08:38 +08:00
Andrew Nicols
dfa966c710 Merge branch 'wip_MDL-49828_m29_tz3' of https://github.com/skodak/moodle 2015-04-13 11:01:25 +08:00
Petr Skoda
980a3a12ce MDL-49828 timezones: add tests for DST switching 2015-04-12 15:23:08 +12:00
Petr Skoda
91bafd76f5 MDL-49828 timezones: improve settings performance 2015-04-12 12:38:06 +12:00
Petr Skoda
75a1e85e3a MDL-49828 timezones: fix messed up phpunit detection 2015-04-12 12:37:32 +12:00
Petr Skoda
e49cb057a1 MDL-49828 timezones: fix typos introduced by MDL-49684 2015-04-12 12:11:10 +12:00
Adrian Greeve
f81893572c MDL-49819 navigation: Added grades back to admin block. 
Students can once again see the grades in the admin block
When navigating a course.

Part of MDL-45774.
 2015-04-10 17:22:55 +08:00
Damyon Wiese
5d25a2cbe9 MDL-49412 User Navigation: Behat fixes for editors 
Part of MDL-45774
 2015-04-10 17:18:24 +08:00
Damyon Wiese
6bdc788054 MDL-45774 Navigation: Hide the second dashboard node from the navbar 2015-04-10 17:18:23 +08:00
Ankit Agarwal
07820cea4a MDL-49412 navigation: Remove redundant reports node 
Part of MDL-45774.
 2015-04-10 17:18:22 +08:00
Ankit Agarwal
7a437e3661 MDL-49412 behat: I am on site homepage behat step 
Part of MDL-45774.
 2015-04-10 17:18:22 +08:00
Damyon Wiese
7b05a0feb6 MDL-49412 Behat: Add a 'I follow "x" in the user menu step' 
Part of MDL-45774.
 2015-04-10 17:18:22 +08:00
Damyon Wiese
5472f9f4e0 MDL-45774 Navigation: Add upgrade step to change defaulthomepage 2015-04-10 17:18:21 +08:00
Adrian Greeve
efd32edbee MDL-45774 navigation: Deprecation of useredit_shared_definition_preferences. 2015-04-10 17:18:04 +08:00