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

62617 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
50aa2587a4 Merge branch 'MDL-40618_restore_get_questions' of https://github.com/mr-russ/moodle 2013-07-29 14:14:58 +08:00
Dan Poltawski
48638b915d Merge branch 'MDL-40323-master' of https://github.com/mackensen/moodle 2013-07-29 13:59:55 +08:00
Dan Poltawski
8cb1af9a18 Merge branch 'MDL-40857' of git://github.com/timhunt/moodle 2013-07-29 13:55:25 +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
Dan Poltawski
3047527093 Merge branch 'MDL-39359_master' of https://github.com/pauln/moodle 2013-07-29 13:45:50 +08:00
Dan Poltawski
26c0773f7b MDL-40775 feeback: remove uncessary header 2013-07-29 13:30:14 +08:00
Dan Poltawski
0c69118fca Merge branch 'MDL-40775_master' of git://github.com/grabs/moodle 2013-07-29 13:28:22 +08:00
Dan Poltawski
2c6f055818 Merge branch 'wip-MDL-29731-master' of git://github.com/marinaglancy/moodle 2013-07-29 13:20:59 +08:00
Dan Poltawski
90b423bda7 Merge branch 'MDL-36399' of git://github.com/timhunt/moodle 2013-07-29 12:40:05 +08:00
Dan Poltawski
245fb06b86 Merge branch 'MDL-40547' of https://github.com/Lightwork-Marking/moodle 2013-07-29 10:41:54 +08:00
Dan Poltawski
47c6239483 Merge branch 'MDL-40863' of git://github.com/timhunt/moodle 2013-07-29 10:09:45 +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
1091c53445 Merge branch 'MDL-40878' of git://github.com/timhunt/moodle 2013-07-29 12:54:31 +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
fa198e6346 Merge branch 'MDL-40727-master' of git://github.com/damyon/moodle 2013-07-29 11:50:00 +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
cfafbd1270 Merge branch 'MDL-40005_lti_headers' of git://github.com/moodlerooms/moodle 2013-07-29 10:53:05 +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
Paul Charsley
912cbaf16d MDL-40547 added marking allocation and workflow to 
mod_assign_get_assignments
 2013-07-29 09:09:57 +12:00
Petr Škoda
6763fde8d4 MDL-40891 prevent exceptions when creating directories in file store 
Even if cache creation fails moodle should continue working.
 2013-07-26 20:28:57 +02: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
Andreas Grabs
dd67e1bfc4 MDL-40775 mod_feedback - Undefined variable in feedback activity 2013-07-26 19:43:44 +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
Tim Hunt
7302fbf696 MDL-40857 External tool: fix incorrect moodle_url usage. 2013-07-26 11:40:32 +01:00
Tim Hunt
c11ff4be69 MDL-40857 External tool (LTI) capabilitiy names confusing. 
I have improved the names in the language file so that they actually say
what they do (based on my reading of the code). I have also added
comments to access.php explaining each capability.

I have corrected a few of the RISK in access.php which were wrong.

I have changed a couple of the archetypes so that guests cannot launch
LTI activities, and editing teachers cannot do editing things.
 2013-07-26 11:40:28 +01:00
Tim Hunt
3c620d7f7c MDL-40867 fix misleading PHPdocs for _get_coursemodule_info 2013-07-26 10:40:39 +01:00
Tim Hunt
06ca6cc955 MDL-40863 feedback and LTI mods need get_extra_capabilities fn 
Since moodle/site:accessallgroups is relevant to how them.
 2013-07-26 10:39:55 +01:00
Tim Hunt
cc12ae6c4f MDL-36399 LTI editing tool config breaks on Oracle. 
Note that this fix will fail if the tool URL is longer than 1333
characters.
 2013-07-26 10:38:17 +01:00
Petr Škoda
656250de83 MDL-11270 use NVARCHAR(MAX) and VARBINARY(MAX) in SQL Server 2013-07-26 09:28:50 +02:00
Damyon Wiese
bdd045c5ec weekly release 2.6dev 2013-07-26 11:24:11 +08:00
Petr Škoda
d11b8d0c63 MDL-40808 remove unused DML strings 2013-07-25 12:02:29 +02:00
Dan Poltawski
f68c3b0aac Revert "MDL-39770 mod_chat: some tweaks to make it prettier to reduce screen wastage" 
This reverts commit 9035e3d24b.
 2013-07-25 16:40:45 +08:00
Dan Poltawski
860f4788ab Revert "MDL-39770 mod_chat: cleanup of the Bubble chat theme" 
This reverts commit 5f06bf8554.
 2013-07-25 16:40:40 +08:00
Mark Nielsen
135b624b0c MDL-40005: LTI module uses Apache specific function for retrieving request headers 2013-07-24 09:07:14 -07:00
Marina Glancy
2c1bbbc58e MDL-29731, MDL-40843 Correctly access course_modinfo->get_groups() 2013-07-24 21:43:56 +10:00
Marina Glancy
2511a97fd6 MDL-29731 Bugs in recent activity when using separate groups 2013-07-24 21:39:26 +10:00
Damyon Wiese
05b659b252 MDL-40727 Cache: Fix file cache store on windows. 2013-07-24 17:04:44 +08:00
Jason Fowler
343dc4ae25 MDL-39748 - Grading - Fixing the increasing height regression 
Conflicts:

	theme/bootstrapbase/style/moodle.css
 2013-07-24 15:27:54 +08:00
Sam Hemelryk
feb34ff4e8 Merge branch 'w30_MDL-23493_m26_fonts' of https://github.com/skodak/moodle 2013-07-24 19:19:47 +12:00
Petr Škoda
964485a3a0 MDL-23493 fix borked regex matching for non-standard font extensions 2013-07-24 08:58:23 +02:00
Petr Škoda
17601a7e12 MDL-39985 add explicit MariaDB support 2013-07-24 10:45:20 +08:00
Paul Nicholls
381e6d7359 MDL-39359 - mod/assign: Allow zipped folder to be uploaded for returning feedback files 
The "Upload multiple feedback files in a zip" feature is convenient, but requires that
the files sit directly within the zip file. As the files will most likely be extracted
to a folder after downloading, it's quite reasonable to expect teachers to zip the
folder up rather than selecting all files and zipping them.  This patch allows for a
zipped folder to be uploaded; if the only file found after extracting is a directory,
the contents of the directory are used instead of the results of the extraction.
 2013-07-24 13:50:25 +12: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
904c38b31d Merge branch 'wip-MDL-37869-master' of git://github.com/phalacee/moodle 2013-07-24 11:28:26 +12: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)
8f9b2980b7 Merge branch 'MDL-39704_master' of https://github.com/nadavkav/moodle 2013-07-23 23:21:38 +02:00
Eloy Lafuente (stronk7)
e5ae5c1247 MDL-40801 Update versions in thirdpartylibs.xml 2013-07-23 23:11:24 +02:00