mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-23 00:50:15 +01:00
Code Issues Projects Releases Wiki Activity
89,591 Commits 36 Branches 527 Tags
Commit Graph

24692 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
d451152b7e Merge branch 'MDL-62783' of https://github.com/timhunt/moodle 2018-06-28 00:25:33 +02:00
Eloy Lafuente (stronk7)
9d05da3f6d Merge branch 'm36_MDL-51080_MAriaDB_Wrong_DB_Type' of https://github.com/scara/moodle 2018-06-27 23:25:03 +02:00
Juan Pablo de Castro
6aa8a3b6d0 MDL-14274 lib/evalmath: support of conditional math in formulas. 
- Comparison operators >, ==, <, <=, >=
- "if(condition, valueiftrue, valueif false)" function.

(amended to keep non-related lines unmodified - whitespace & indent)
 2018-06-26 10:25:44 +02:00
Tim Hunt
f4e18a0ae7 MDL-62783 XMLDB: Generate PHP with [] arrays 2018-06-22 13:58:27 +01:00
Jake Dallimore
4d5046b0eb MDL-51419 core_files: Support for utf8 in file names in MS Edge 2018-06-22 10:29:23 +08:00
Eloy Lafuente (stronk7)
cb57d12d01 Merge branch 'mdl57404' of https://github.com/egiles/moodle 2018-06-20 01:02:30 +02:00
Jun Pataleta
ec4d05c6b6 Merge branch 'MDL-61894-master' of https://github.com/lucaboesch/moodle 2018-06-19 17:57:31 +08:00
Andrew Nicols
2ffb5ea5e9 Merge branch 'MDL-62519_master' of git://github.com/markn86/moodle 2018-06-19 10:33:52 +08:00
Andrew Nicols
3b6811a113 Merge branch 'MDL-62320-master' of git://github.com/vmdef/moodle 2018-06-18 13:47:21 +08:00
Andrew Nicols
dcb2cea690 Merge branch 'MDL-62234-master' of git://github.com/bmbrands/moodle 2018-06-18 09:51:18 +08:00
Evan Giles
53007faad1 MDL-57404 admin_settings: Allow comments in ip block 
This adds the ability to to add comments to ip lists in moodle.

Currently, the configiplist textentry box does not allow the user to annotate
the IP addresses defined.  For example, I'd like to be able to define:
 192.168.1.1     # London office
 10.1.1.1        # New york office
 118.209.246.240 # My home IP

This would allow me to revisit this list after a few months, and remove
IP addresses that are no longer required - without having to manually confirm
each IP address
 2018-06-16 21:08:46 +10:00
Victor Deniz
046dd892c7 MDL-62320 mimetypes: Add JSON to the default mime types list 2018-06-15 12:54:23 +01:00
Matteo Scaramuccia
09ca972877 MDL-51080 env: warn when running MariaDB w/ wrong dbtype 2018-06-14 23:54:35 +02:00
Luca Bösch
e6914883ed MDL-61894 tag: Modal buttons style. 2018-06-14 17:34:29 +02:00
Andrew Nicols
460dc37184 MDL-60207 modal: Fix close modal behat for clean 2018-06-14 10:19:45 +08:00
Bas Brands
1b21702511 MDL-62234 Theme boost: Improve atto dialogue styling 2018-06-13 11:34:41 +02:00
Andrew Nicols
0e75d337ee Merge branch 'MDL-60207-master' of git://github.com/ryanwyllie/moodle 2018-06-13 09:41:45 +08:00
Andrew Nicols
c3f13f534d Merge branch 'MDL-6074-master' of git://github.com/mihailges/moodle 2018-06-13 09:38:55 +08:00
Mihail Geshoski
5226999dd7 MDL-6074 blocks: Hide user in online users block 2018-06-13 09:02:24 +08:00
David Monllao
4a47a69519 Merge branch 'MDL-58063-master' of git://github.com/mihailges/moodle 2018-06-12 11:05:37 +02:00
David Monllao
bcb4a27dd6 Merge branch 'MDL-55609-master' of git://github.com/andrewnicols/moodle 2018-06-12 10:07:35 +02:00
Mark Nelson
6ffd66f350 MDL-62519 atto_recordrtc: detach click listener when recording again 2018-06-12 14:35:03 +08:00
Andrew Nicols
6f38bb9bdc Merge branch 'MDL-60819-master' of https://github.com/snake/moodle 2018-06-12 08:58:49 +08:00
Eloy Lafuente (stronk7)
d157f8774e Merge branch 'MDL-62577-m' of https://github.com/micaherne/moodle 2018-06-12 00:07:43 +02:00
Jake Dallimore
28c3f6e4d8 MDL-60819 core_files: fix exception thrown from generate_image_thumbnail 
This function now requires gdlib.php.
 2018-06-11 10:44:51 +08:00
Mihail Geshoski
5b97c08412 MDL-58063 blocks: Cannot access manage files in HTML block in clean 2018-06-08 08:25:53 +08:00
David Monllao
a7fb68f27f Merge branch 'MDL-62273-master' of https://github.com/sammarshallou/moodle 2018-06-06 11:16:41 +02:00
Jun Pataleta
054900f5ed Merge branch 'MDL-61826-master' of git://github.com/junpataleta/moodle 2018-06-06 11:16:38 +02:00
Andrew Nicols
f32a9acadf Merge branch 'm36_MDL-61702_MariaDB_InnoDB10d3d1_Params_Removed' of https://github.com/scara/moodle 2018-06-06 11:16:25 +02:00
David Monllao
01dc21198f Merge branch 'MDL-46344-master' of https://github.com/lucaboesch/moodle 2018-06-06 11:16:16 +02:00
David Monllao
75ebfbdf99 Merge branch 'MDL-50812-master' of https://github.com/nashtechdev01/moodle 2018-06-06 11:16:13 +02:00
David Monllao
c051057058 Merge branch 'wip-MDL-61694_Check_Password_Callback' of https://github.com/Spudley/moodle 2018-06-06 11:16:06 +02:00
Jun Pataleta
5870677fd4 Merge branch 'MDL-61778-master' of git://github.com/mickhawkins/moodle 2018-06-06 11:16:03 +02:00
Jun Pataleta
7766dbed5d MDL-61826 auth: Make Facebook endpoints more maintainable 2018-06-06 12:44:24 +08:00
Łukasz Szeremeta
ac45c16544 MDL-61826 auth: Facebook OAuth2 - getting a better-quality profile photo 
Get 200x200 px instead of 50x50 px user profile picture from Facebook OAuth2.
 2018-06-06 12:09:09 +08:00
Eloy Lafuente (stronk7)
2ace1fb16b Merge branch 'fix/MDL-52666' of https://github.com/mikr0/moodle 2018-06-04 17:36:19 +02:00
Luca Bösch
d8343b5432 MDL-46344 outputrenderers: Localize 'This page is'. 2018-06-01 11:41:30 +02:00
sam marshall
bef86c669c MDL-62273 Profile: Callback allows plugins to control profile access 
Adds a new callback, <plugin>_control_view_profile. Plugins may
return core_user::VIEWPROFILE_PREVENT to prevent access,
core_user::VIEWPROFILE_DO_NOT_PREVENT to make no change, or
core_user::VIEWPROFILE_FORCE_ALLOW to allow access even when Moodle
would normally prevent it.

This allows third-party plugins to restrict (or allow) access to
profile pages in response to arbitrary business logic.
 2018-06-01 09:59:01 +01:00
Michael Hawkins
d0f3b5f083 MDL-61778 message: Renamed online status icon and replaced Boost icon 2018-06-01 10:15:11 +08:00
Andrew Nicols
e984917db8 MDL-55609 testing: Add a create_and_enrol helper 2018-06-01 07:30:32 +08:00
Matteo Scaramuccia
82c2d98fa2 MDL-61702 dml: MariaDB 10.3 supports only the Barracuda file format. 
More details about this change also in https://tracker.moodle.org/browse/MDL-59099

Ref.: https://mariadb.com/kb/en/library/mariadb-1031-release-notes/#other-variables
 2018-05-31 22:55:00 +02:00
Tim Hunt
a266ae30fa MDL-50812 core_useragent: <body> classes for Chrome and Edge 2018-05-31 09:42:07 +07: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
Ryan Wyllie
7e0305be70 MDL-60207 javascript: remove click handler in YUI modal initialiser 2018-05-29 10:05:00 +08:00
Treu Quan
30e1f5a023 MDL-60207 javascript: close modal when user touch/click outside it 2018-05-29 10:04:37 +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
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
1d6dd4388d Merge branch 'MDL-57742_master' of git://github.com/markn86/moodle 2018-05-28 09:13:53 +02:00