mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
76,022 Commits 36 Branches 519 Tags
Commit Graph

76022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
e763d96122 MDL-51819 theme: style fix for nested dropdowns 2015-11-12 21:54:50 +00:00
Dan Poltawski
5fdbdca9e5 MDL-51819 js: built changes 2015-11-12 09:00:56 +00:00
Dan Poltawski
5318521b17 Merge branch 'wip-MDL-51819-master' of git://github.com/abgreeve/moodle 2015-11-12 08:46:34 +00:00
Simeon Naydenov
b6ceafab52 MDL-51819 themes: Nested navigation dropdowns work on small screens. 2015-11-12 13:53:18 +08:00
Eloy Lafuente (stronk7)
9e9754b7aa Merge branch 'MDL-51515-master' of git://github.com/junpataleta/moodle 2015-11-11 23:14:47 +01:00
Damyon Wiese
6c2cfe281f MDL-51515 assign: Fix typo setting url in nav tree. 
Thanks to Nelson Moller and Tyler Bannister.
 2015-11-11 11:14:03 -06:00
Eloy Lafuente (stronk7)
84f7633f82 Merge branch 'MDL-36109-master' of git://github.com/danpoltawski/moodle 2015-11-11 17:10:11 +01:00
Eloy Lafuente (stronk7)
fdca1a1dd3 Merge branch 'MDL-51495' of https://github.com/NeillM/moodle 2015-11-11 16:56:27 +01:00
Eloy Lafuente (stronk7)
02c72ecb79 Merge branch 'MDL-50589-master' of git://github.com/jleyva/moodle 2015-11-11 16:53:08 +01:00
Neill Magill
f11fdf9c98 MDL-51495 calendar: E_WARNING in core_calendar_get_calendar_events 
If a user does not have the 'moodle/calendar:manageentries' capability then an E_WARNING
can be generated by the core_calendar_external::get_calendar_events() method, that an
expected array is null

This patch creates an array that is missing when a user does not have the capability.
 2015-11-11 15:24:31 +00:00
Neill Magill
11dc7c1c3d MDL-51495 calendar: Unit test to get an individual course event 
If is user requests a single event on a course via the web service they should be able to retrieve it.
 2015-11-11 15:18:37 +00:00
David Monllao
169167c186 Merge branch 'MDL-51913_statistics_dup_1st_column' of git://github.com/barrysspace/moodle 2015-11-11 12:38:47 +08:00
David Monllao
23eff2c0ff Merge branch 'MDL-51922-master' of git://github.com/andrewnicols/moodle 2015-11-11 10:24:57 +08:00
David Monllao
82ee9604a2 Merge branch 'MDL-51935-master' of git://github.com/dpalou/moodle 2015-11-11 09:59:36 +08:00
David Monllao
212dc418d4 Merge branch 'MDL-51991-master' of git://github.com/ryanwyllie/moodle 2015-11-11 09:18:52 +08:00
Eloy Lafuente (stronk7)
3c6210a452 Merge branch 'wip-mdl-52077' of https://github.com/rajeshtaneja/moodle 2015-11-10 23:44:28 +01:00
Eloy Lafuente (stronk7)
47a445e442 Merge branch 'wip-mdl-52066' of https://github.com/rajeshtaneja/moodle 2015-11-10 23:27:50 +01:00
Eloy Lafuente (stronk7)
2a8709f6df Merge branch 'MDL-51686-master' of git://github.com/damyon/moodle 2015-11-10 20:19:06 +01:00
Eloy Lafuente (stronk7)
f509e2e0a2 Merge branch 'MDL-50781-master' of git://github.com/danpoltawski/moodle 2015-11-10 20:13:21 +01:00
Eloy Lafuente (stronk7)
d18a8d716c Merge branch 'MDL-51720-master' of git://github.com/damyon/moodle 2015-11-10 19:28:41 +01:00
Eloy Lafuente (stronk7)
13cad25081 Merge branch 'MDL-51482-lastinvalidation-handling' of https://github.com/mpetrowi/moodle 2015-11-10 18:27:22 +01:00
Dan Poltawski
6ae9762b37 Merge branch 'MDL-52059' of git://github.com/stronk7/moodle 2015-11-10 14:48:27 +00:00
Dan Poltawski
8e4c398b52 Merge branch 'MDL-51314-groupmembership' of https://github.com/dmitriim/moodle 2015-11-10 14:44:22 +00:00
Eloy Lafuente (stronk7)
c31f23186e MDL-52059 versions: main version mini-bump 2015-11-10 12:35:17 +01:00
Eloy Lafuente (stronk7)
2e144835bb MDL-52059 versions: bump all versions and requires near release 
version = planned 2015111600 release version
requires= current 2015111000 rc3 version
 2015-11-10 12:33:52 +01:00
Eloy Lafuente (stronk7)
bcf2ea710c Moodle release 3.0rc3 v3.0.0-rc3 2015-11-10 10:50:56 +01:00
Eloy Lafuente (stronk7)
c95d00ac94 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-11-10 10:50:48 +01:00
Dan Poltawski
0880780ee8 MDL-52063 forum: Moved notification is not a problem 
The default behaviour of $OUTPUT->notification() is to indiciate a
problem.
 2015-11-10 09:39:18 +00:00
Dan Poltawski
022f5b5e50 Merge branch 'MDL-52054-master-option4' of git://github.com/xow/moodle 2015-11-10 09:17:51 +00:00
Dani Palou
487f6471a0 MDL-51935 wiki: Add missing strings in wiki 2015-11-10 10:05:06 +01:00
John Okely
616dd1b594 MDL-52054 forum: Prevent error when clicking move without a destination 2015-11-10 16:43:19 +08:00
Ryan Wyllie
d26d0d9b7e MDL-51991 atto_table: simplify settings 
Cleaned up the language strings on the Atto table settings page
and reduced the number of settings options for border styling.
 2015-11-10 08:15:01 +00:00
John Okely
32b4161a3c MDL-52055 block_online_users: Only show users from current course 2015-11-10 08:13:41 +00:00
Rajesh Taneja
81676e84e6 MDL-52077 unittest: Fixed string typo 2015-11-10 13:53:47 +08:00
Rajesh Taneja
27c99f5007 MDL-52066 unittest: Use ics file from external repo 2015-11-10 13:27:00 +08:00
John Okely
d7f95392ac MDL-52054 forum: Revert MDL-46321. Add the "move" button back. 
This reverts commit 5a699f25a20f71b8044e952b9b5153733fce952c.
 2015-11-10 10:46:37 +08:00
John Okely
cb658a4d04 MDL-52063 forum: Display message when moving forum 2015-11-10 10:24:06 +08:00
Eloy Lafuente (stronk7)
f62d6ffa3d Merge branch 'MDL-47979-master-blocks-config' of git://github.com/mudrd8mz/moodle 2015-11-09 23:42:26 +01:00
Eloy Lafuente (stronk7)
d1bd327454 Merge branch 'MDL-52045-master-block_tags_settings' of git://github.com/mudrd8mz/moodle 2015-11-09 23:39:33 +01:00
AMOS bot
381fdb96bf Automatically generated installer lang files 2015-11-10 00:04:06 +08:00
David Mudrák
8159f23e76 MDL-47979 blocks: Do not display link to legacy file admin/block.php 
The deprecated file admin/block.php was removed in Moodle 2.6. Since
then, all blocks that declare has_config() must provide a settings.php
file.
 2015-11-09 13:30:40 +01:00
Dan Poltawski
2f3e84c132 Merge branch 'MDL-51837-master' of git://github.com/junpataleta/moodle 2015-11-09 11:33:00 +00:00
Dan Poltawski
f46aa6bc42 Merge branch 'MDL-51628-master' of git://github.com/damyon/moodle 2015-11-09 11:01:21 +00:00
Dan Poltawski
f808f8f553 Merge branch 'wip-MDL-52039-master' of https://github.com/marinaglancy/moodle 2015-11-09 08:48:49 +00:00
David Mudrák
afb52b6f31 MDL-52045 block_tags: Fix invalid has_config() declaration 
As the settings.php has been removed in MDL-51132, the block should no
longer declare it has global configuration.
 2015-11-09 09:34:53 +01:00
David Monllao
0f1b3c69d8 Merge branch 'MDL-40245_master' of git://github.com/SWiT/moodle 2015-11-09 16:12:44 +08:00
David Monllao
a2bb9b8751 Merge branch 'MDL-49473-master' of git://github.com/danpoltawski/moodle 2015-11-09 15:12:30 +08:00
David Monllao
814809d59e Merge branch 'wip-MDL-52008-master' of git://github.com/abgreeve/moodle 2015-11-09 13:16:06 +08:00
AMOS bot
323e38c4a1 Automatically generated installer lang files 2015-11-08 00:04:45 +08:00
Marina Glancy
9390d02099 MDL-52039 block_tags: remove unused setting 2015-11-07 12:45:35 +08:00