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

85577 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Nelson
1370d793fc MDL-56046 mod_quiz: do not close the sheet twice 2017-06-28 18:24:48 +02:00
Eloy Lafuente (stronk7)
1555f25b24 Merge branch 'MDL-57809-34-progressbar' of https://github.com/roperto/moodle 2017-06-28 18:24:47 +02:00
David Monllao
364ccb771a MDL-57734 version: Bump 2017-06-28 18:24:47 +02:00
David Monllao
aa736731ba Merge branch 'MDL-57734-master' of https://github.com/xow/moodle 2017-06-28 18:24:46 +02:00
Eloy Lafuente (stronk7)
d4bd3dbb69 Merge branch 'wip-MDL-59136-master' of git://github.com/marinaglancy/moodle 2017-06-28 18:24:46 +02:00
David Monllao
6ac5f70c01 Merge branch 'MDL-59053-downcase-username_LATEST' of git://github.com/spaceraccoon/moodle 2017-06-28 18:24:45 +02:00
David Monllao
34b3c1da70 Merge branch 'MDL-32151-master' of git://github.com/junpataleta/moodle 2017-06-28 18:24:45 +02:00
Eloy Lafuente (stronk7)
0f9bdd637a Merge branch 'MDL-59362_master' of git://github.com/markn86/moodle 2017-06-28 18:24:44 +02:00
Simey Lameze
83f50acd53 MDL-59285 tool_mobile: add user profile page callback 2017-06-28 16:39:07 +08:00
Jun Pataleta
7c482415a9 MDL-59294 theme_bootstrapbase: Fix display of ID provider buttons 2017-06-28 13:27:41 +08:00
Marina Glancy
6b7a32f33c MDL-56579 media_videojs: use new config element for selecting file types 2017-06-28 12:12:48 +08:00
Adam Olley
556ceb2071 MDL-58651 logstore_database: Add ability to not send database options 
In the core dml:
PostgreSQL connections now use advanced options to reduce connection overhead.
These options are not compatible with some connection poolers. The
dbhandlesoptions parameter has been added to allow the database to configure
the required defaults.

This item adds a setting to the logstore_database plugin to let you set the
same flag for your destination database - without it you won't be able to ship
logs to a postgresql database with a pgbouncer frontend.
 2017-06-28 13:21:01 +09:30
Marina Glancy
6023e58bd1 MDL-59363 mod_workshop: user object must have alternative name fields 2017-06-28 11:36:11 +08:00
Eloy Lafuente (stronk7)
56fc5143ad Merge branch 'MDL-59073_workshop_prevent_submission_without_content_or_file' of https://github.com/dannyjung90/moodle 2017-06-27 16:59:44 +02:00
David Monllao
1243fce158 Merge branch 'wip-MDL-59308-master' of git://github.com/marinaglancy/moodle 2017-06-27 16:41:26 +02:00
David Monllao
93c97fdc3a Merge branch 'MDL-59158-master' of git://github.com/junpataleta/moodle 2017-06-27 16:39:41 +02:00
David Monllao
c4b25152cc Merge branch 'MDL-57927-master' of git://github.com/lameze/moodle 2017-06-27 15:55:17 +02:00
Eloy Lafuente (stronk7)
c32f0cd62a Merge branch 'MDL-58844-master' of git://github.com/andrewnicols/moodle 2017-06-27 11:41:08 +02:00
Eloy Lafuente (stronk7)
ce836829e6 Merge branch 'MDL-59296-master' of git://github.com/crazyserver/moodle 2017-06-27 11:37:52 +02:00
Damyon Wiese
859e2033cb MDL-58544 oauth2: Allow trusted issuers 
Add a setting to each issuer that skips the email confirmation when creating and linking accounts.
 2017-06-27 16:50:27 +08:00
Mark Nelson
a24c59b9b4 MDL-59396 core_user: removed 'My courses' select from participants page 
Part of MDL-59290.
 2017-06-27 16:44:41 +08:00
Eloy Lafuente (stronk7)
e2aa2f25f1 Merge branch 'MDL-59123-master-3' of git://github.com/ryanwyllie/moodle 2017-06-27 09:24:24 +02:00
Jake Dallimore
8d7ae061e3 Merge branch 'MDL-59312-master' of https://github.com/xow/moodle 2017-06-27 15:07:44 +08:00
Ryan Wyllie
5dd40ec4b4 MDL-59123 admin: add cli script to compile theme CSS 
Added a script to selectively compile theme CSS. In order to allow
compiling on per theme basis without purging all theme CSS in the
local cache I have made some changes to how CSS is compiled and
how it is accessed via local cache.
 2017-06-27 06:48:45 +00:00
Jake Dallimore
cb37f200a8 Merge branch 'MDL-59275-master' of git://github.com/lameze/moodle 2017-06-27 13:57:11 +08:00
Damyon Wiese
3d185faceb MDL-59380 fragments: Include js from templates 
Mustache templates containing {{#js}} blocks are not returned via the
fragments API. This is because the requirements manager is assigned when the renderer is created
and not updated by the call to start collecting page requirements.
 2017-06-27 13:20:32 +08:00
Jake Dallimore
196558a5d8 Merge branch 'MDL-56046_master-fix' of git://github.com/markn86/moodle 2017-06-27 13:16:42 +08:00
Mark Nelson
4c7593ff5b MDL-59364 core_user: removed 'User details' option in participants page 
Part of MDL-59290.
 2017-06-27 13:13:07 +08:00
Simey Lameze
92c8cb9d98 MDL-59275 auth: prevent user login failed coding error 2017-06-27 13:04:02 +08:00
Mark Nelson
e0ee37e426 MDL-56046 dataformat: changes to docs, upgrade.txt and error message 2017-06-27 11:35:05 +08:00
Eloy Lafuente (stronk7)
7ad2822269 Merge branch 'MDL-56046_master' of git://github.com/markn86/moodle 2017-06-27 02:42:31 +02:00
Eloy Lafuente (stronk7)
139648e5bd Merge branch 'MDL-40818-master' of git://github.com/junpataleta/moodle 2017-06-27 01:50:28 +02:00
Andrew Nicols
29d409b642 MDL-58844 testing: Move to GCE build infrastructure 
Switch back to GCE build infrastructure for Travis Builds and move
databases to RAM Disk.

This also adds a software entropy generator (haveged) which is
recommended when using a RAMdisk for the database.
 2017-06-27 07:42:38 +08:00
Eloy Lafuente (stronk7)
51fc76193d Merge branch 'MDL-59295-master' of git://github.com/lameze/moodle 2017-06-27 00:53:28 +02:00
Eloy Lafuente (stronk7)
1dac440f55 MDL-58813 phpunit: pick test from 32_STABLE to fix expected behavior 2017-06-26 19:46:05 +02:00
Eloy Lafuente (stronk7)
df30a5a25f Merge branch 'MDL-1322-master' of git://github.com/junpataleta/moodle 2017-06-26 18:15:25 +02:00
Eloy Lafuente (stronk7)
41c17610c0 Merge branch 'MDL-59297_myoverview_error' of git://github.com/davosmith/moodle 2017-06-26 13:04:42 +02:00
Mark Nelson
faf45f9c47 MDL-56046 core: enable multiple sheets for flexible table 2017-06-26 13:59:30 +08:00
Mark Nelson
d4606c1b24 MDL-56046 dataformat: added related information to upgrade.txt 2017-06-26 13:59:30 +08:00
Jun Pataleta
390098fa64 MDL-1322 calendar: Add course short name in calendar event 
* Add the course's short name for a course event in order to let the
user know immediately which course an event belongs to. Particularly
helpful for activity events.
 2017-06-26 13:37:39 +08:00
Mark Nelson
eb26be5b39 MDL-56046 dataformat_*: convert core plugins 2017-06-26 13:29:32 +08:00
Mark Nelson
ce3beb267c MDL-56046 core: convert download_as_dataformat to use new API 2017-06-26 13:29:32 +08:00
Mark Nelson
b62b5879af MDL-56046 core_dataformat: added functions to support multiple sheets 
Also removed write_header() and write_footer(). The reason for this
is because in core we want to know if the format being used supports
multiple sheets. To do this, and ensure we do not break third-party
dataformat plugins, we are using method_exist(). If write_header()
and write_footer() remain in the base class then this will always
be true.
 2017-06-26 13:29:32 +08:00
Mark Nelson
6d721cab9e MDL-59362 core: ensure we use 'new' when throwing exceptions 2017-06-26 13:08:05 +08:00
Marina Glancy
1c4a0506e5 MDL-59136 roles: avoid double escaping in role names 2017-06-26 11:57:09 +08:00
Marina Glancy
eca7e52901 MDL-59336 themes: change FA mapping for i/new 2017-06-26 11:36:35 +08:00
Jake Dallimore
e6142a1e2e Merge branch 'MDL-49484-master' of github.com:jebarviabb/moodle 2017-06-26 10:51:43 +08:00
Yair Spielmann
409ad1d60a MDL-57734 admin: New setting for when to use the noindex meta tag 2017-06-26 10:38:25 +08:00
Josh Ebarvia
a06face2ce MDL-49484 mod_lesson: Fix lesson page headers when editing 2017-06-24 05:21:25 +09:30
AMOS bot
b87f163a1b Merge branch 'master' into install_master 2017-06-24 00:08:36 +08:00