David Monllao
e812df2260
Merge branch 'MDL-62620' of git://github.com/stronk7/moodle
2018-06-04 14:28:15 +02:00
David Monllao
995457b8cf
Merge branch 'wip-MDL-37977-master' of git://github.com/marinaglancy/moodle
2018-06-04 14:22:01 +02:00
David Monllao
b321d231ff
Merge branch 'MDL-42366-master' of https://github.com/lucisgit/moodle
2018-06-04 13:17:07 +02:00
Eloy Lafuente (stronk7)
9a89adcb98
MDL-62620 behat: Update master to use 3.36.0 behat extension tag
2018-06-01 12:16:04 +02:00
Marina Glancy
dcce35754c
MDL-37977 frontpage: Move html from index.php to renderer
2018-06-01 11:32:08 +08:00
Marina Glancy
a400dd2d85
MDL-37977 frontpage: renderer method for frontpage section1
2018-06-01 11:32:06 +08:00
David Monllao
5b4ca9eb5b
weekly release 3.6dev
2018-05-31 08:39:27 +02:00
Tony Butler
166ac972c3
MDL-42366 assignfeedback_editpdf: Improve meaningfulness of cursor image
...
Various improvements to make the cursor image more accurately reflect
the currently selected editing tool or action:
* Replace crosshair with default cursor for read-only student view
* Use currently selected stamp image as cursor when using stamp tool
* Use text cursor for text higlighter tool and improve its accuracy
* Use default cursor for select tool (as indicated by its button icon)
2018-05-30 14:50:34 +01:00
David Monllao
8cb2821928
Merge branch 'MDL-62532-master' of git://github.com/rezaies/moodle
2018-05-30 10:20:02 +02:00
Andrew Nicols
5a38bc90a8
Merge branch 'MDL-57486-master-fix' of git://github.com/junpataleta/moodle
2018-05-30 13:20:42 +08:00
Jun Pataleta
95c2e43008
MDL-57486 tool_recyclebin: Close the files recordset properly
2018-05-30 13:15:30 +08:00
Andrew Nicols
f77bb2834c
Merge branch 'MDL-57600-master' of git://github.com/lameze/moodle
2018-05-30 09:16:57 +08:00
Andrew Nicols
b3475a6874
MDL-57486 tool_recyclebin: Coding style fix
2018-05-30 08:35:08 +08:00
Andrew Nicols
3d579187e9
Merge branch 'master_MDL-57486' of https://github.com/danmarsden/moodle
2018-05-30 08:31:12 +08:00
David Monllao
4069f62436
MDL-62381 editor_tinymce: Rearrange style modification
2018-05-29 16:36:26 +02:00
David Monllao
060884dfd6
Merge branch 'MDL-62381_master' of https://github.com/Syxton/moodle
2018-05-29 16:34:40 +02:00
Matt Davidson
197e714dfd
MDL-62381 editor: Fix tinymce icons
...
Icon sizing is being overwritten on images.
2018-05-29 09:04:08 -04:00
Jun Pataleta
f1b701e6ce
Merge branch 'MDL-62544-master' of git://github.com/Dagefoerde/moodle
2018-05-29 16:24:59 +08:00
Dan Marsden
5efcb522b1
MDL-57486 tool_recyclebin: Delete items when context already deleted.
2018-05-29 14:24:50 +12:00
Jun Pataleta
f9be03432a
Merge branch 'MDL-56498-master' of git://github.com/mickhawkins/moodle
2018-05-29 09:37:16 +08:00
David Monllao
77e7c45487
Merge branch 'MDL-62316_oauth_guess_image_fix' of https://github.com/leonstr/moodle
2018-05-28 16:46:30 +02:00
David Monllao
c89b495650
Merge branch 'wip-MDL-62584-master' of git://github.com/marinaglancy/moodle
2018-05-28 16:31:00 +02:00
Eloy Lafuente (stronk7)
00977e984e
MDL-62478 upgrade: add 3.5.0 separation line to all upgrade scripts
2018-05-28 13:15:48 +02:00
David Monllao
d5010fb5e2
MDL-42779 course: Update line jump so it equals 35
2018-05-28 11:46:38 +02:00
David Monllao
4a34457ea7
Merge branch 'MDL-42779-master' of https://github.com/lucaboesch/moodle
2018-05-28 11:42:44 +02:00
David Monllao
1d6dd4388d
Merge branch 'MDL-57742_master' of git://github.com/markn86/moodle
2018-05-28 09:13:53 +02:00
David Monllao
17ed12eb17
Merge branch 'm35_MDL-59596_DDL_Issues_With_MariaDB_10p2_SQLMode' of https://github.com/scara/moodle
2018-05-28 08:15:09 +02:00
Jun Pataleta
8a930e444b
Merge branch 'wip-MDL-62493-master' of git://github.com/marinaglancy/moodle
2018-05-28 13:01:09 +08:00
Mark Nelson
6d32804f8a
MDL-57742 core_lib: Updated readme_moodle.txt
2018-05-28 12:55:25 +08:00
David Balch
528060a1a9
MDL-57742 core_lib: Make tool_consumer_instance_guid optional
...
In the specification, tool_consumer_instance_guid is only listed
as recommended. However, the library was requiring it.
https://www.imsglobal.org/specs/ltiv2p0/implementation-guide#toc-42
2018-05-28 12:47:05 +08:00
Andrew Nicols
87095d1405
Merge branch 'MDL-62515-master' of git://github.com/junpataleta/moodle
2018-05-28 12:27:45 +08:00
Marina Glancy
024ede2c6b
MDL-62584 xmlrpc: return correct content-length
2018-05-28 11:14:42 +08:00
Simey Lameze
4834d388da
MDL-57600 course: fix typo on courselib test
2018-05-28 09:38:16 +08:00
Alex
a91437a3c1
MDL-57600 format: Fix spelling errors
2018-05-28 09:35:35 +08:00
Jun Pataleta
6a7a11a7b3
Merge branch 'MDL-61832-master' of https://github.com/lucaboesch/moodle
2018-05-28 09:21:48 +08:00
Shamim Rezaie
3722c7d697
MDL-62532 core_question: Include standard tags in the tags autocomplete
2018-05-28 10:53:57 +10:00
Andrew Nicols
407f5d053c
MDL-62543 mod_forum: Add RSS Unit tests
2018-05-28 08:53:45 +08:00
Andrew Nicols
daad84d150
Merge branch 'MDL-62543-master' of git://github.com/tobiasreischmann/moodle
2018-05-28 08:53:41 +08:00
Eloy Lafuente (stronk7)
4a0c770372
Merge branch 'MDL-62408_master' of https://github.com/marxjohnson/moodle
2018-05-28 01:40:07 +02:00
Marina Glancy
7115c32949
MDL-62493 tool_policy: correct redirection
...
do not override session->wantsurl
do not redirect guests to user.php, they get an error there
2018-05-25 14:29:40 +08:00
Marina Glancy
deaf67147d
MDL-62493 tool_policy: allow guests to sign up
2018-05-25 14:29:40 +08:00
Jan Dageförde
df751f0040
MDL-62544 privacy: error notification type
2018-05-24 16:44:17 +02:00
Jan Dageförde
97009b73cf
MDL-62544 privacy: Allow data requests on behalf of a user by admin/DPO
2018-05-24 16:43:06 +02:00
Luca Bösch
ed38521b1d
MDL-61832 lesson: don't hide lesson page editing options
2018-05-24 15:45:30 +02:00
Luca Bösch
d29bde5943
MDL-42779 course: Pagination in management page preserves view action
2018-05-24 15:44:35 +02:00
David Monllao
6b2e04676a
weekly on-sync release 3.6dev
2018-05-24 10:47:52 +02:00
David Monllao
3399860ee8
NOBUG: Fixed SVG browser compatibility
2018-05-24 10:47:51 +02:00
David Monllao
59cc07ae99
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2018-05-24 10:47:50 +02:00
Tobias Reischmann
82b50d3187
MDL-62543 forum: Switched the usage of the deleted flag for rss
...
The deleted flag was introduced through the Privacy API and was used
for post selection for the rss feed. In there it was used in the
wrong way, which lead to the exclusion of all non deleted posts instead
of excluding all deleted ones.
This commit fixes this problem.
2018-05-23 14:05:28 +02:00
Simey Lameze
1bcc54ef25
MDL-61189 editor_tinymce: save data before submitting
2018-05-23 10:48:27 +08:00