Andrew Nicols
febceada8c
Merge branch 'MDL-56000-master' of git://github.com/lameze/moodle
2016-10-04 10:59:18 +08:00
Adrian Greeve
dd9ee3d837
MDL-56012 lib: Update of readme and xml file.
...
Also made edits to use the PSR-4 autoloader.
2016-10-04 10:47:06 +08:00
Adrian Greeve
cd198eafd6
MDL-56012 lib: Update spout to version 2.6.0
2016-10-04 10:12:29 +08:00
Adrian Greeve
ef783842df
MDL-56001 lib: Update of moodle documentation.
...
Update of readme_moodle.txt and thirdpartylibs.xml
with information about the update to 1.4.2
2016-10-04 10:01:15 +08:00
Adrian Greeve
d6d51786d5
MDL-56001 lib: Upgrade simplepie to 1.4.2
2016-10-04 09:59:25 +08:00
Andrew Nicols
a4bf84ebda
Merge branch 'wip-MDL-31243-master' of https://github.com/Beedell/moodle
2016-10-04 09:19:42 +08:00
Andrew Nicols
520071f0bd
MDL-55713 behat: Adjust how NamedPartials are loaded
2016-10-04 09:18:02 +08:00
Andrew Nicols
27ed5be84f
Merge branch 'MDL-53777-master' of git://github.com/jleyva/moodle
2016-10-04 08:51:24 +08:00
Eloy Lafuente (stronk7)
b8c241b1fd
Merge branch 'MDL-56172-master' of git://github.com/danpoltawski/moodle
2016-10-04 00:53:02 +02:00
Dan Poltawski
4e0f7f98ec
Merge branch 'MDL-52317' of https://github.com/NeillM/moodle
2016-10-03 16:09:25 +01:00
Dan Poltawski
8ba8b13bd9
Merge branch 'MDL-55786-master' of git://github.com/jleyva/moodle
2016-10-03 15:44:40 +01:00
Juan Leyva
afb7799a6d
MDL-55786 rating: New Web Service core_rating_add_rating
2016-10-03 12:22:29 +01:00
Dan Poltawski
c59a6ffd53
Merge branch 'MDL-55347-master' of git://github.com/jleyva/moodle
2016-10-03 10:31:52 +01:00
Juan Leyva
649777fb8d
MDL-55347 user: New WS core_user_set_users_preferences
2016-10-03 10:22:07 +01:00
Juan Leyva
0a90f6247d
MDL-53777 tool_mobile: New script for launching the mobile app
2016-10-03 10:02:33 +01:00
Juan Leyva
8a0a7414b2
MDL-53777 tool_mobile: Move mobile settings to the admin tool
2016-10-03 10:02:32 +01:00
Rajesh Taneja
a1d92ef25d
MDL-55986 behat: Fix unit tests to use fixtures
2016-10-03 15:38:24 +08:00
Rajesh Taneja
b04ca8c8a1
MDL-55986 behat: Added option to optimize parallel runs by tags
...
run.php should only be used for running behat
before this patch if tags were passed, then behat.yml
was being re-written with features havings tags.
As this is not ideal, this option is now removed and
features with tags will be optimally split
by init.php when --optimize-run option is passed
2016-10-03 15:38:04 +08:00
David Monllao
c41132f075
Merge branch 'MDL-55168-master' of git://github.com/danpoltawski/moodle
2016-10-03 14:33:24 +08:00
David Monllao
2e5a8fd7aa
Merge branch 'wip-mdl-56210' of https://github.com/rajeshtaneja/moodle
2016-10-03 13:53:29 +08:00
Simey Lameze
bc963d98d8
MDL-56009 lib: update RequireJS to 2.3.2
2016-10-03 13:21:33 +08:00
Daniel Thee Roperto
29406dded1
MDL-56231 library: Fixed PhpDoc for flexible_table constructor.
...
The flexible_table::__construct($uniqueid) accepts a string, not an int
as previously noted in the PhpDoc.
2016-10-03 16:07:11 +11:00
David Monllao
7b7ddd97b9
Merge branch 'wip-MDL-55990-master' of git://github.com/marinaglancy/moodle
2016-10-03 13:00:08 +08:00
Andrew Nicols
aac3b0bebb
Merge branch 'MDL-55767-master' of git://github.com/damyon/moodle
2016-10-03 12:55:06 +08:00
Jake Dallimore
d5553254e9
MDL-56010 libraries: Upgrade loglevel.js to 1.4.1 - post-import changes
2016-10-03 12:25:42 +08:00
Jake Dallimore
0b8cdaf6cb
MDL-56010 libraries: Upgrade loglevel.js to 1.4.1 - library import
2016-10-03 12:23:28 +08:00
Damyon Wiese
5e4fffa013
MDL-55767 tool_lpimportcsv: import/export competency fmwks
2016-10-03 11:47:07 +08:00
David Monllao
c31610afde
Merge branch 'MDL-56127' of git://github.com/stronk7/moodle
2016-10-03 11:09:16 +08:00
David Monllao
92e3294dfc
Merge branch 'MDL-56167-master' of git://github.com/danpoltawski/moodle
2016-10-03 11:04:34 +08:00
Andrew Nicols
5f21d5e8ab
Merge branch 'MDL-39117' of git://github.com/mr-russ/moodle
2016-10-03 10:13:09 +08:00
Daniel Neis Araujo
fbcdb0d710
MDL-22078 course: add end date
2016-10-03 09:51:36 +08:00
John Beedell
905953909f
MDL-31243 access/enrol libs: rename new groups functions
2016-09-30 09:27:59 +01:00
John Beedell
9121bb2d23
MDL-31243 access/enrol libs: new fns returning useful SQL fragments
...
Refactor similar SQL generation code from get_users_by_capability
and get_enrolled_uses to make get_with_capability_sql.
Modified files: accesslib.php, enrollib.php, grouplib.php, new tests.
2016-09-30 09:27:56 +01:00
John Beedell
9f5170e955
MDL-31243 access/enrol libs: move enrol functions
2016-09-30 09:27:53 +01:00
Dan Poltawski
99fe296eb2
MDL-55168 css: remove 0-length units
2016-09-30 09:25:25 +01:00
Dan Poltawski
aea8eaecde
MDL-55168 css: use shorthand colour props when possible
2016-09-30 09:25:24 +01:00
Dan Poltawski
bc33e9bd3f
MDL-55168 css: reformat plain css with stylefmt
2016-09-30 09:25:23 +01:00
Neill Magill
c3e1c98f04
MDL-52317 Atto: Large resized images may display scroll bars
...
When an image was added via Atto and it was set to resize automatically
if the alignment was set to Top, Middle or Bottom when it was made
smaller then a vertical scroll bar would be displayed.
This was caused by the interaction of the margin settings on the image
and the 100% width set via the img-responsive css class. The width of
an element only includes the content area and not any borders, padding
or margins.
This change stops atto hardcoding the styles for image alignment into
the images style tag, it instead adds a class that defines the alignment
the image should have.
This change has the benefit that themers will now be able to adjust
how atto image alignments work if they wish.
Images added before this patch will continue to have the issue
until they are edited by the plugin, at which time their legacy style
will be removed and the new alignment method will be added.
Thanks to Andrew Nicols who provided a refactor for the Alignment
and style detection code.
2016-09-30 08:48:33 +01:00
Rajesh Taneja
c2b0213b08
MDL-55986 behat: Re-factor exiting api's
...
Return all features and contexts, so they can
be filtered well at one place
2016-09-30 13:32:20 +08:00
Rajesh Taneja
eed52d64bb
MDL-56210 behat: Ensure behat waits for dependancy manager
2016-09-30 10:19:09 +08:00
Jake Dallimore
20df227e22
MDL-56011 libraries: upgrade mustache.php to 2.11.1
2016-09-30 08:40:41 +08:00
Deepa Jayaprakash
9b24ebd665
MDL-55861 course: Click drag&drop icon, incorrect activities shown
2016-09-29 16:42:10 +01:00
Dan Poltawski
81c9e018b4
MDL-56172 admin: remove cssoptimiser config options
2016-09-29 16:41:29 +01:00
Dan Poltawski
d52ebf11d3
MDL-56172 css: remove css optimiser
...
This functionality no longer makes sense inside Moodle now that we have
external tools like stylelint to help us with this. It was not able to
be used by any core themes.
The code was always marked as not for external use.
2016-09-29 16:40:40 +01:00
Eloy Lafuente (stronk7)
83edfba240
MDL-56127 forms: multiple select dependencies fixed
...
This is a fix for a regressions introduced by MDL-54778. It
seems that escaped all our tests because there isn't any case
of such a dependency in core, but Daniele Cordella was facing
it within his surveypro module.
2016-09-29 16:53:08 +02:00
Juan Leyva
80adabef0e
MDL-55100 course: New Web Service get_courses_by_field
2016-09-29 12:20:49 +01:00
Simey Lameze
48dc4059da
MDL-56000 lib: upgrade PHPMailer to 5.2.16
2016-09-29 15:09:10 +08:00
Eloy Lafuente (stronk7)
d231f3cb0d
Merge branch 'MDL-53870-master' of git://github.com/jleyva/moodle
2016-09-29 01:45:02 +02:00
Eloy Lafuente (stronk7)
d0deb28c24
Merge branch 'MDL-55804_master' of git://github.com/dmonllao/moodle
2016-09-29 01:14:33 +02:00
Eloy Lafuente (stronk7)
1138bbc69e
Merge branch 'wip-mdl-55879' of https://github.com/rajeshtaneja/moodle
2016-09-28 20:05:08 +02:00
