Andrew Nicols
f5e587c1db
Merge branch 'wip-MDL-51841-master' of git://github.com/abgreeve/moodle
2015-10-27 11:03:43 +08:00
Andrew Nicols
4727a4a207
Merge branch 'MDL-51864-master' of git://github.com/junpataleta/moodle
2015-10-27 10:57:45 +08:00
Andrew Nicols
d891a6dcb7
Merge branch 'MDL-51127-master' of git://github.com/lazydaisy/moodle
2015-10-27 10:47:48 +08:00
Eloy Lafuente (stronk7)
70ae75674d
MDL-51863 packer: ensure empty zip files behavior remains consistent
...
With PHP bug #70322 fixed, ZipArchive::close() did start returning false
and throwing PHP Warnings with recent PHP versions (5.6.14 and up).
Previously (5.6.13 verified) it was returning true, and false in older
versions (5.4.x verified).
This change does silent the 2 "hacky" calls to close() that we perform
in core leaving the 3rd one (used for files having files) unmodified.
A new unit test has been created to cover the close() behavior, ideally
supporting both old and new PHP versions without harcoding any PHP
version.
Note that we don't use to rely much on results coming from close(), and
that's a good thing given the buggy behavior commented above. This just
keeps empty zips working like they were before.
2015-10-26 21:16:54 +01:00
Tim Hunt
42406bc413
MDL-51915 lib tests: Extra unit test for html_to_text.
2015-10-26 18:30:21 +00:00
Barry Oosthuizen
3e90d870bc
MDL-51913 report_stats: Make first column unique
2015-10-26 17:22:31 +00:00
Dan Poltawski
d3cd5f1f8f
Merge branch 'wip-MDL-51834-master' of https://github.com/kwiliarty/moodle
2015-10-26 13:54:41 +00:00
Dan Poltawski
3ec49c6de3
Merge branch 'MDL-51906-master' of git://github.com/andrewnicols/moodle
2015-10-26 13:49:32 +00:00
Dan Poltawski
ff1543e0df
Merge branch 'MDL-51894-master' of git://github.com/andrewnicols/moodle
2015-10-26 12:40:15 +00:00
Dan Poltawski
eb154d9c14
Merge branch 'MDL-51855-master' of git://github.com/lameze/moodle
2015-10-26 10:20:02 +00:00
Eloy Lafuente (stronk7)
f7d8c61ae7
Merge branch 'MDL-51824-master' of git://github.com/lameze/moodle
2015-10-26 09:59:21 +01:00
Simey Lameze
0bc41cfcec
MDL-51824 auth: include required CLI library
2015-10-26 15:52:11 +08:00
Adrian Greeve
d304952b43
MDL-51840 forms lib: keyboard navigation with ajax works.
...
Ajax autocomplete forms can now be navigated properly with
the keyboard.
2015-10-26 15:03:42 +08:00
Adrian Greeve
adebc069bd
MDL-51841 forms lib: Autocomplete fields work with spaces.
2015-10-26 15:02:52 +08:00
Adrian Greeve
abfaf50217
MDL-51841 forms lib: Autocomplete fields work with spaces.
2015-10-26 14:55:19 +08:00
Damyon Wiese
81c471e2a9
MDL-51821 forms: Be more explicit in autocomplete if no suggestions
2015-10-26 14:20:25 +08:00
Damyon Wiese
bdd60287e5
MDL-51821 forms: Better handling for deselecting items in autocomplete
...
Fixes 3 problems with deselecting items in an autocomplete field:
1. Keep track of whether items were in the offical suggestion list, or are newly created
tags and remove the "newly created tags" from the suggestion list when they are
deselected
2. Change the aria-role for the selected items list when items cannot be deselected (and
do not treat it like a multiselect list).
3. When leaving and returning focus to the selected items list, remember the last
active-descendant.
2015-10-26 14:20:25 +08:00
Andrew Nicols
3365244fda
Merge branch 'MDL-51824-master' of git://github.com/lameze/moodle
2015-10-26 13:56:49 +08:00
Simey Lameze
37e51a5daa
MDL-51824 core: initial deprecation of auth sync CLI scripts
...
This commit does the initial deprecation of the CLI scripts of CAS and LDAP authentication plugins.
2015-10-26 13:36:27 +08:00
Damyon Wiese
32f3de567f
MDL-51838 autocomplete: Scroll the suggestions list
...
Keep the active item "visible" when using keyboard nav on a long list of suggestions.
2015-10-26 12:20:33 +08:00
Andrew Nicols
fd424b99f2
MDL-51894 inboundmessage: Ensure that all mailboxes exist
2015-10-26 12:17:15 +08:00
Andrew Nicols
5459e754c6
MDL-51906 testing: Fix travis builds for beta/rc
...
These were previously checking the release string for presence of the 'dev'
string. On friday we moved to beta, and will shortly move to RC.
We should be checking the version maturity instead.
This change switches to checking for MATURITY_STABLE in the maturity
string. If it is found, the branch behaviour follows the $branch version.
If it is not found, we use master.
This also adds a check to ensure that if the branch is not found, we exit
early instead of performing CI Tests over the entirety of Moodle.
2015-10-26 12:03:51 +08:00
Simey Lameze
abc2491211
MDL-51855 mod_question: fix offset error during upgrade
2015-10-26 11:51:18 +08:00
Andrew Nicols
3953d0b7a7
Merge branch 'MDL-51842-master' of git://github.com/xow/moodle
2015-10-26 11:29:02 +08:00
John Okely
0fc2bccd60
MDL-51842 theme_bootstrapbase: Fix alignment of parallel buttons
2015-10-26 10:49:26 +08:00
Andrew Nicols
3363cbe55b
Merge branch 'MDL-51779_master' of https://github.com/Syxton/moodle
2015-10-26 09:46:38 +08:00
Eloy Lafuente (stronk7)
8b3090c13b
MDL-51903 behat: move guest enrolment to new UI
...
With MDL-30674 we missed to change this use from the
old (course edition) UI to the new (enrolment methods) one.
2015-10-25 21:13:08 +01:00
Jun Pataleta
3dbdeb5ccb
MDL-51864 blocks: Fixed title display for block_course_summary
2015-10-24 00:03:39 -05:00
lazydaisy
b395f7b599
MDL-51127 theme_bootstrapbase: Re-aligned RTL context header button.
2015-10-23 18:28:20 +01:00
AMOS bot
1bc3f19a5b
Automatically generated installer lang files
2015-10-24 00:04:00 +08:00
Syxton
626d833543
MDL-51779 assign: PDF annotate quality
...
Fixes the quality of pdf content when annotating.
2015-10-23 09:22:38 -04:00
Dan Poltawski
9382ac38d6
Moodle release 3.0beta
2015-10-23 13:47:50 +01:00
Dan Poltawski
efad76904c
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2015-10-23 13:47:49 +01:00
Dan Poltawski
ec2e5c4151
NOBUG: correcting pre-beta version name
2015-10-23 13:46:59 +01:00
Eloy Lafuente (stronk7)
e326fbeea2
MDL-30674 enrol_guest: version bump in case it's needed for something
2015-10-23 13:31:59 +02:00
Eloy Lafuente (stronk7)
2ee8636553
Merge branch 'MDL-30674-master-wip' of https://github.com/andrewnicols/moodle
2015-10-23 12:46:53 +02:00
Dan Poltawski
8c976328c1
MDL-40863 mod_resource: bump version
...
(not technically necessary - but I prefrer to make it explicit against
stable)
2015-10-23 11:34:52 +01:00
Dan Poltawski
94b8c29248
MDL-40863 mod_resource: add missing behat tag
2015-10-23 11:27:57 +01:00
Marina Glancy
9a58434601
MDL-40863 mod_resource: do not cache user-specific info
2015-10-23 11:25:51 +01:00
Andrew Hancox
ba8b641dce
MDL-40863 mod_resource: Add option to show modified date
2015-10-23 11:25:07 +01:00
Eloy Lafuente (stronk7)
d9b60d6f25
Merge branch 'MDL-51739-master-individual-locking' of git://github.com/ryanwyllie/moodle
2015-10-23 10:42:17 +02:00
Ryan Wyllie
f1ecad609a
MDL-51739 theme: allow config to lock theme selector
...
If any of the devices have their theme set in config.php
it will lock the theme selector UI from being able to change
the theme.
2015-10-23 05:06:21 +00:00
Kevin Wiliarty
b71890687a
MDL-51834 auth,profile: locks custom fields based on auth settings
2015-10-22 23:39:49 -04:00
Andrew Nicols
0b7dc6e8cd
Merge branch 'MDL-45515-master' of git://github.com/ryanwyllie/moodle
2015-10-23 10:59:34 +08:00
jinhofer
f067581828
MDL-45515 lib/editor/atto/plugins/table: added behat
2015-10-23 02:57:51 +00:00
jinhofer
b87e11c849
MDL-45515 atto/plugins: Added border style and BG colour to table
...
This commit adds the option for borders to be added and
styled, background colours to be set, and width to be set for tables
in the Atto HTML Editor. For those that desire to restrict
use of this, the plugin settings allow the admins to restrict
how much freedom their users have with borders.
2015-10-23 02:57:50 +00:00
Andrew Nicols
5164b76e75
MDL-30674 enrol_guest: Respect
2015-10-23 10:40:42 +08:00
AMOS bot
32440787d4
Automatically generated installer lang files
2015-10-23 00:04:16 +08:00
Dan Poltawski
0a05907873
Merge branch 'MDL-51737-master-3' of git://github.com/andrewnicols/moodle
2015-10-22 14:43:20 +01:00
Dan Poltawski
cf84a5d2dd
MDL-51458 travis: note the purpose of config
2015-10-22 12:14:04 +01:00