moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62640 commits 37 branches 540 tags 1.3 GiB
Commit graph

16411 commits

Author SHA1 Message Date
Sam Hemelryk
816f873068 Merge branch 'wip-MDL-40897-master' of git://github.com/marinaglancy/moodle 2013-07-30 09:39:03 +12:00
Sam Hemelryk
73b4c1da84 Merge branch 'MDL-40678-m' of git://github.com/andrewnicols/moodle 2013-07-30 08:55:35 +12:00
Sam Hemelryk
fb947a424a Merge branch 'wip-MDL-40660-master' of git://github.com/phalacee/moodle 2013-07-30 08:47:34 +12:00
Dan Poltawski
ef3a268060 Merge branch 'w31_MDL-40900_m26_32unzip' of https://github.com/skodak/moodle 2013-07-29 16:56:40 +08:00
Dan Poltawski
f7d374bd8f Merge branch 'w31_MDL-40887_m26_minify' of https://github.com/skodak/moodle 2013-07-29 16:49:39 +08:00
Petr Škoda
f83037e8e7 MDL-40887 import latest minify 2.1.7 2013-07-29 09:50:20 +02:00
Dan Poltawski
b47b4ffd91 Merge branch 'wip-MDL-40847-m26' of git://github.com/samhemelryk/moodle 2013-07-29 15:28:17 +08:00
Dan Poltawski
62ea0cb846 Merge branch 'wip-MDL-40842-m26' of git://github.com/samhemelryk/moodle 2013-07-29 13:48:19 +08:00
Jason Fowler
7eebe381a6 MDL-40660 - HTML Editor - Fix the width when toggling TinyMCE toolbars 2013-07-29 10:01:48 +08:00
Sam Hemelryk
8452248881 Merge branch 'w31_MDL-11270_m26_nvarcharmax' of https://github.com/skodak/moodle 2013-07-29 13:05:07 +12:00
Sam Hemelryk
609bda269e Merge branch 'w31_MDL-40891_m26_mkdirrace' of https://github.com/skodak/moodle 2013-07-29 11:53:02 +12:00
Sam Hemelryk
db5ee81576 Merge branch 'MDL-40854' of git://github.com/timhunt/moodle 2013-07-29 11:01:57 +12:00
Sam Hemelryk
3e76c7fa68 MDL-40842 behat: improved exception + debugging detection 2013-07-29 10:51:55 +12:00
Sam Hemelryk
6269efd29b Merge branch 'MDL-40806-m' of git://github.com/andrewnicols/moodle 2013-07-29 10:49:40 +12:00
Sam Hemelryk
ac7af0daf5 MDL-40847 moodlelib: coding style + phpdoc clean up 2013-07-29 08:29:28 +12:00
Petr Škoda
e8875a86be MDL-40900 do not use 32bit unsigned integers 
32bit PHP and any Windows PHP breaks otherwise.
 2013-07-28 13:10:57 +02:00
Marina Glancy
1171ad564b MDL-40897 avoid extra DB queries in groups_get_activity_groupmode() 2013-07-28 18:47:57 +10:00
Petr Škoda
e7451fb5bd MDL-40891 work around make_writable_directory() race condition 
You will still get a "PHP Warning:  mkdir(): File exists" but that should not cause any problems on production sites.
 2013-07-26 20:27:36 +02:00
Tim Hunt
9e1fe42150 MDL-40854 fix mod/...:view capabilities 
Prior to the fix, if you did not have a capability like mod/page:view,
then you woulds still see the link to the Page activity in the course
section, but when you clicked on it, you would run into a
require_capability error.

It is a principle that we never show users a link to a page they are not
allowed to access, therefore, when users do not have mod/...:view, they
should not see the link on the course page.

This patch implements this in the cm_info class, in a similar way to how
access restrictions by groups works.

It does not assume that the mod/...:view capability exists. If the
capability does not exist, then users are not prevented from seeing the
link.
 2013-07-26 11:44:43 +01:00
Petr Škoda
656250de83 MDL-11270 use NVARCHAR(MAX) and VARBINARY(MAX) in SQL Server 2013-07-26 09:28:50 +02:00
Petr Škoda
d11b8d0c63 MDL-40808 remove unused DML strings 2013-07-25 12:02:29 +02:00
Petr Škoda
17601a7e12 MDL-39985 add explicit MariaDB support 2013-07-24 10:45:20 +08:00
Frederic Massart
a60bc9a35b MDL-32746 libraries: Upgrade redirect for major version 
Due to the newly introduced event user_loggedin, the upgrade
could not be reached as the event class was not found during login.
To remedy this, we need to force the upgrade before login.
 2013-07-24 09:30:15 +08:00
Marina Glancy
c59a65b273 MDL-40766 Smarter positioning of tinymce button 2013-07-24 10:58:32 +10:00
Sam Hemelryk
d853f819dc Merge branch 'MDL-40315_master' of git://github.com/dmonllao/moodle 2013-07-24 11:14:14 +12:00
Eloy Lafuente (stronk7)
154bc6b240 Merge branch 'w30_MDL-40642_m26_umask' of https://github.com/skodak/moodle 2013-07-23 23:42:11 +02:00
Eloy Lafuente (stronk7)
e5ae5c1247 MDL-40801 Update versions in thirdpartylibs.xml 2013-07-23 23:11:24 +02:00
Eloy Lafuente (stronk7)
7613bc7c3a Merge branch 'w30_MDL-40801_m26_jquery' of https://github.com/skodak/moodle 2013-07-23 23:06:35 +02:00
Eloy Lafuente (stronk7)
ae2605ec8d Merge branch 'wip-MDL-40540-m26' of git://github.com/samhemelryk/moodle 2013-07-23 22:56:34 +02:00
Eloy Lafuente (stronk7)
18c4d7e68c Merge branch 'w30_MDL-40723_m26_creators' of https://github.com/skodak/moodle 2013-07-23 20:32:40 +02:00
Eloy Lafuente (stronk7)
97c51dfb22 Merge branch 'MDL-40672_master' of git://github.com/dmonllao/moodle 2013-07-23 17:45:22 +02:00
Petr Škoda
c6f5e84f9d MDL-40723 fix docs typo 2013-07-23 15:59:02 +02:00
Petr Škoda
54d5308ef0 MDL-40723 use guess_if_creator_will_have_course_capability() for the new weird function 2013-07-23 15:55:07 +02:00
Eloy Lafuente (stronk7)
aa837b2fe6 Merge branch 'wip-MDL-40762-m26' of git://github.com/samhemelryk/moodle 2013-07-23 13:50:06 +02:00
Dan Poltawski
80a1b08d40 Merge branch 'MDL-40480' of git://github.com/timhunt/moodle 2013-07-23 16:41:45 +08:00
Damyon Wiese
0b92270b19 Merge branch 'MDL-38863_master' of git://github.com/dmonllao/moodle 2013-07-23 16:04:50 +08:00
David Monllao
a090296740 MDL-40672 behat: New activities data generator 2013-07-23 09:47:36 +02:00
David Monllao
72ddc05f67 MDL-38863 behat: Role assign generator 2013-07-23 09:46:39 +02:00
Damyon Wiese
6064e5cc00 Merge branch 'MDL-32746-master' of git://github.com/FMCorz/moodle 2013-07-23 14:49:42 +08:00
Damyon Wiese
683bd5b15e MDL-28019 tinymce managefiles: change tabs to spaces 2013-07-23 14:14:08 +08:00
Marina Glancy
9e88661e58 MDL-28019 Added plugin tinymce_managefiles 2013-07-23 14:12:55 +08:00
Marina Glancy
1d94557373 MDL-28019 Added plugin repository_areafiles 2013-07-23 14:12:45 +08:00
Frederic Massart
3b086e3094 MDL-32746 core: Implement new user_loggedin event 2013-07-23 11:36:35 +08:00
Dan Poltawski
35c1179047 Merge branch 'MDL-40793_profile_compare' of https://github.com/mr-russ/moodle 2013-07-23 10:42:02 +08:00
Damyon Wiese
9ced78bd3e Merge branch 'wip-MDL-40648-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	version.php
 2013-07-23 10:37:20 +08:00
Dan Poltawski
131580860b Merge branch 'MDL-35674-form-dependencies' of https://github.com/andrewnicols/moodle 2013-07-23 10:01:59 +08:00
Sam Hemelryk
092a99ef08 Merge branch 'MDL-40799-m' of git://github.com/andrewnicols/moodle 2013-07-23 11:12:39 +12:00
Eloy Lafuente (stronk7)
6d0085ef24 Merge branch 'MDL-40123_master' of git://github.com/dmonllao/moodle 2013-07-23 01:09:52 +02:00
Eloy Lafuente (stronk7)
63ff2c5c2f Merge branch 'MDL-39635_master' of git://github.com/dmonllao/moodle 2013-07-23 00:45:13 +02:00
Eloy Lafuente (stronk7)
59af378baf Merge branch 'w30_MDL-40795_m26_ajaxerrordisplay' of https://github.com/skodak/moodle 2013-07-22 18:56:40 +02:00