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

23063 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
fc31b06a28 Merge branch 'm33_MDL-58027_Restore_Missing_HTMLEntities_Call' of https://github.com/scara/moodle 2017-03-15 00:37:02 +01:00
Dan Poltawski
edf102805a Merge branch 'MDL-58023_behat_find_node_in_navigation_improvement_master' of https://github.com/gthomas2/moodle 2017-03-14 16:31:05 +00:00
Dan Poltawski
732bd13171 Merge branch 'MDL-55528-master' of git://github.com/andrewnicols/moodle 2017-03-14 12:07:33 +00:00
David Monllao
291767fbfe Merge branch 'MDL-58114-master-excparams' of git://github.com/mudrd8mz/moodle 2017-03-14 11:27:26 +01:00
Andrew Nicols
594ada13c2 Merge branch 'MDL-57751-master' of https://github.com/xow/moodle 2017-03-14 11:27:24 +01:00
Matteo Scaramuccia
bf4f857acf MDL-58027 files: Restored missing htmlentities() call 2017-03-13 22:24:33 +01:00
gthomas2
01f2a530b7 MDL-58023 behat: Improve find_node_in_navigation function 2017-03-13 11:41:23 +00:00
Damyon Wiese
ac40d8b589 MDL-57596 forms: CLEANHTML in persistent forms 
Add special handling for text fields with the CLEANHTML type. This should
be used when students and teachers can edit the same field (you can't trust those students).

Applies cleaning on submitted data, and on data stored in the DB before it is put back in an editing form.
 2017-03-10 18:04:48 +00:00
Marina Glancy
6e65554ea1 MDL-58010 user: allow to update only whitelisted user preferences 2017-03-10 18:04:47 +00:00
Jun Pataleta
91b2bf2c9d MDL-55956 core: Update major db change version 2017-03-10 18:04:46 +00:00
Andrew Nicols
ef607980cf Merge branch 'MDL-57914-master' of git://github.com/jleyva/moodle 2017-03-10 18:04:45 +00:00
Andrew Nicols
c742c61956 Merge branch 'wip-mdl-57940' of https://github.com/rajeshtaneja/moodle 2017-03-10 18:04:44 +00:00
Andrew Nicols
e2310e4361 Merge branch 'MDL-57975-master' of git://github.com/ryanwyllie/moodle 2017-03-10 18:04:42 +00:00
Dan Poltawski
1523d53bdc Merge branch 'MDL-58035' of git://github.com/timhunt/moodle 2017-03-10 18:03:52 +00:00
Andrew Nicols
1568168717 MDL-55528 fileconverter_unoconv: Add new unoconv plugin 
AMOS BEGIN
 MOV [pathtounoconv,admin],[pathtounoconv,fileconverter_unoconv]
 MOV [pathtounoconv_help,admin],[pathtounoconv_help,fileconv_helperter_unoconv_help]
 MOV [unoconvwarning,admin],[unoconvwarning,fileconverter_unoconv]
 MOV [test_unoconv,assignfeedback_editpdf],[test_unoconv,fileconverter_unoconv]
 MOV [test_unoconvempty,assignfeedback_editpdf],[test_unoconvempty,fileconverter_unoconv]
 MOV [test_unoconvdoesnotexist,assignfeedback_editpdf],[test_unoconvdoesnotexist,fileconverter_unoconv]
 MOV [test_unoconvdownload,assignfeedback_editpdf],[test_unoconvdownload,fileconverter_unoconv]
 MOV [test_unoconvisdir,assignfeedback_editpdf],[test_unoconvisdir,fileconverter_unoconv]
 MOV [test_unoconvnotestfile,assignfeedback_editpdf],[test_unoconvnotestfile,fileconverter_unoconv]
 MOV [test_unoconvnotexecutable,assignfeedback_editpdf],[test_unoconvnotexecutable,fileconverter_unoconv]
 MOV [test_unoconvok,assignfeedback_editpdf],[test_unoconvok,fileconverter_unoconv]
 MOV [test_unoconvversionnotsupported,assignfeedback_editpdf],[test_unoconvversionnotsupported,fileconverter_unoconv]
AMOS END
 2017-03-10 10:45:46 +08:00
Andrew Nicols
34df779a95 MDL-55528 core_files: Create new fileconverter plugintype 2017-03-10 09:31:14 +08:00
Ryan Wyllie
8fa8675de8 MDL-57975 core: add userdate mustache php helper 
Part of MDL-55611
 2017-03-08 03:33:24 +00:00
Ryan Wyllie
0e5b3e282f MDL-57975 javascript: add userdate mustache js helper 
Part of MDL-55611
 2017-03-08 03:33:24 +00:00
Ryan Wyllie
b61015cfcd MDL-57975 javascript: add user_date.js 
Part of MDL-55611
 2017-03-08 03:33:23 +00:00
Ryan Wyllie
9c7ffb80d3 MDL-57975 core: test for user date external function 
Part of MDL-55611
 2017-03-08 03:33:23 +00:00
Ryan Wyllie
88c2941b26 MDL-57975 core: add get user date external function 
Part of MDL-55611
 2017-03-08 03:33:23 +00:00
John Okely
c0f70d1a7a MDL-57751 libraries: Remove <2.6 only check from load_installed_plugins 2017-03-08 08:37:36 +08:00
Dan Poltawski
228637feff Merge branch 'MDL-57990-master' of git://github.com/crazyserver/moodle 2017-03-07 14:00:07 -03:00
Dan Poltawski
7ebe17f38a Merge branch 'wip-mdl-58056' of https://github.com/rajeshtaneja/moodle 2017-03-07 11:08:24 -03:00
Tim Hunt
ea049ee618 MDL-58035 lib: log when the expected theme cannot be initialised 2017-03-07 13:29:46 +00:00
David Monllao
68aab93ea5 Merge branch 'MDL-57280-master' of git://github.com/ryanwyllie/moodle 2017-03-07 13:13:51 +01:00
David Monllao
9a2e5ad36c Merge branch 'wip-MDL-57485-master' of git://github.com/abgreeve/moodle 2017-03-07 12:15:46 +01:00
David Monllao
02c7f6e888 Merge branch 'MDL-58057-master' of https://github.com/snake/moodle 2017-03-07 12:09:00 +01:00
David Monllao
996731dded Merge branch 'MDL-45584_master' of git://github.com/markn86/moodle 2017-03-07 12:00:01 +01:00
Dan Poltawski
a3da85e42e Merge branch 'MDL-58040' of git://github.com/timhunt/moodle 2017-03-07 07:43:46 -03:00
Dan Poltawski
473efd8d53 Merge branch 'MDL-58052_behat_get_session_user' of https://github.com/gthomas2/moodle 2017-03-07 06:54:37 -03:00
Andrew Nicols
0c90bfe39b Merge branch 'MDL-57972-master' of git://github.com/ryanwyllie/moodle 2017-03-07 14:35:00 +08:00
Ryan Wyllie
75378ded5f MDL-57972 mustache: add shortentext template helper 
Part of MDL-55611
 2017-03-07 06:33:56 +00:00
Ryan Wyllie
180f5f23a6 MDL-57972 javascript: add upgrade instructions for truncate.js 
Part of MDL-55611
 2017-03-07 06:33:56 +00:00
Ryan Wyllie
7172b33e24 MDL-57972 javascript: Change truncate.js behaviour 
Updated truncate.js to behave closer to the moodle implementation of
shorten_text.

Part of MDL-55611
 2017-03-07 05:22:38 +00:00
Ryan Wyllie
d74d91f49a MDL-57972 javascript: Add truncate.js third party lib 
Part of MDL-55611
 2017-03-07 05:22:34 +00:00
Andrew Nicols
342af35ab8 Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle 2017-03-07 12:07:50 +08:00
Jake Dallimore
e858840437 MDL-58057 core_files: properly trim curl whitelist config when fetching 2017-03-07 09:49:22 +08:00
Ryan Wyllie
b6563dcfc3 MDL-57975 javascript: add sessionstorage.js 
Part of MDL-55611
 2017-03-07 01:29:13 +00:00
Andrew Nicols
29ce005862 MDL-55528 admin: Add a new generic admin setting type 2017-03-07 08:22:42 +08:00
Dan Poltawski
8b9196d7d2 Merge branch 'MDL-57887-nginx-username-logging' of https://github.com/brendanheywood/moodle 2017-03-06 13:43:38 -03:00
Jun Pataleta
ca75ec4fe0 MDL-55956 db: Add priority column for event table 
* New priority column in order to enable the rendering of a single,
relevant calendar event for a module that has user/group overrides.
* Insert refresh_mod_calendar_events_task record to task_adhoc
table to upgrade existing calendar events for mod plugins via cron
after upgrade process.
 2017-03-06 16:15:26 +08:00
Jun Pataleta
37d0c7c7fd MDL-55956 core: New adhoc task refresh_mod_calendar_events_task 
* New adhoc task that loops over mod plugins and calls the
<modname>_refresh_events() hook, if available.
 2017-03-06 16:12:07 +08:00
gthomas2
353e78765a MDL-58052 behat: user session function - use to edit current profile 2017-03-03 13:57:01 +00:00
Pau Ferrer Ocaña
fb41d2f0ef MDL-57990 course: Add sortorder as public field 2017-03-03 11:53:52 +01:00
Adrian Greeve
d630c0e37b MDL-57485 themes: Set images to default display type. 
Imported images in atto would no longer hold a URL
tag around it. display: block was the culprit.
 2017-03-03 11:15:23 +08:00
Juan Leyva
44acbb815f MDL-57914 mod_data: Allow to export properties for external_files 2017-03-02 22:57:04 +01:00
Russell Smith
f3789f2fb3 MDL-45584 cache: Make identifiers part of the cache creation. 
It is now safe to cache a reference to a cache and expect consistent results.

Changing identifiers altered cache results where a reference was
held to the cache. Identifiers have been set to be cached with
identifiers included so the caches are separate.

As a consequence of this it was identified that invalidation events
and identifiers don't easily work together as an event can't determine
which identifiers should be used for cache invalidation.  So invalidation
events have been made incompatible with identifiers being set.  No core
code used this combination as it's not possible to understand any expected
behaviour.

Event invalidation for application and session caches was centralised to the same
location.  The only difference was the name of the lastinvalidation variable. This
improves support and consistency of invalidation code.
 2017-03-02 11:06:17 +08:00
Andrew Nicols
50dcc8af9c MDL-53978 core: Do not run callbacks if upgrade is running 2017-03-02 10:24:05 +08:00
Eloy Lafuente (stronk7)
bb9716ccd6 Merge branch 'MDL-57321-master' of git://github.com/cameron1729/moodle 2017-03-02 00:00:37 +01:00