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

84018 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Nicols
17cc2842a7 Merge branch 'MDL-58359-master' of git://github.com/damyon/moodle 2017-04-10 13:35:36 +08:00
Jun Pataleta
9be24e45b7 Merge branch 'MDL-58357-master' of git://github.com/damyon/moodle 2017-04-10 13:26:21 +08:00
Andrew Nicols
3afd529013 Merge branch 'MDL-57393-master' of git://github.com/jleyva/moodle 2017-04-10 13:20:13 +08:00
Andrew Nicols
04e45e8e25 Merge branch 'master' of https://github.com/tniessen/moodle 2017-04-10 13:16:29 +08:00
Jake Dallimore
cea0492924 Merge branch 'MDL-58543' of git://github.com/stronk7/moodle 2017-04-10 12:36:56 +08:00
John Okely
61527865a1 MDL-39913 assignsubmission_file: Add validation 2017-04-10 12:07:58 +08:00
Andrew Nicols
3de074e4bf Merge branch 'MDL-58311_master' of https://github.com/sk-unikent/moodle 2017-04-10 12:00:59 +08:00
Andrew Nicols
1adae85448 Merge branch 'wip-mdl-58068' of https://github.com/rajeshtaneja/moodle 2017-04-10 11:54:09 +08:00
Damyon Wiese
d84b7f7f5c MDL-58359 icons: Revert the icons for completion 
We are missing one for "auto-completion not yet completed" etc.
 2017-04-10 11:47:08 +08:00
Damyon Wiese
1a10c79f67 MDL-58356 icons: Revert file type icons 2017-04-10 11:36:51 +08:00
Andrew Nicols
b140b13c25 Merge branch 'MDL-58453-master' of git://github.com/jleyva/moodle 2017-04-10 11:23:37 +08:00
Juan Leyva
e352f30699 MDL-58400 tool_mobile: Support direct launch of OAuth SSO process 2017-04-10 11:12:29 +08:00
Juan Leyva
a67e3bda2e MDL-58400 tool_mobile: Return enabled identity providers 
Via this public Ajax Web Service we return the list of identity
providers in a site.
 2017-04-10 11:12:28 +08:00
Jun Pataleta
627ea5b10e MDL-58400 auth: New helper methods for identity providers 
* get_identity_providers(): Retrieves available auth identity providers
* prepare_identity_providers_for_output(): Prepares auth identity
    provider data for output (e.g. to templates, WS, etc)
* Use these helpers for the login renderer
 2017-04-10 11:12:03 +08:00
Jake Dallimore
94a26699b1 Merge branch 'MDL-57813-master' of git://github.com/jleyva/moodle 2017-04-10 10:25:23 +08:00
Eloy Lafuente (stronk7)
2f090f4619 MDL-58543 upgrade: Replay 4 steps missed for some combinations 
Moved 4 steps (2017033100.01-04) that were introduced after master
version was 2017040300 and were not executed always.

They have been moved to 2017040700.01-04, just on top of current
weekly (2017040700.00), so they will be executed by everybody.

As far as the 4 fields are XMLDB ones they are executed conditionally
so it's safe to replay them (for people that already had them run).
 2017-04-09 14:11:20 +02:00
AMOS bot
56a9a019ae Automatically generated installer lang files 2017-04-08 00:05:03 +08:00
David Mudrák
f7cfa26ec4 MDL-58492 icons: Fix fontawesome for i/marker and i/marked icons 
These combo icons are used to mark something the current element. They
are supposed to be used in places like the course outline to
mark/highlight a section as the current one. Also workshop uses them to
switch to a phase (mark it as the current one).
 2017-04-07 14:35:16 +02:00
Jan Dageförde
6abce1e19a
MDL-58485 admin: Show all SVG plugin icons 2017-04-07 10:10:22 +02:00
Luca Bösch
9955d65e5c MDL-58180 lib: Role name pass format_text. 
In function stats_get_report_options, the role names are returned after
having been processed through format_text which lets the filters work on them.

Signed-off-by: Luca Bösch <luca.boesch@bfh.ch>
 2017-04-07 16:09:25 +08:00
Marina Glancy
4cf6871ccf MDL-57616 media_videojs: set min height for videos 
This partially reverts changes from MDL-57187 that added the limit for all videos and not just videojs.
Videojs displays a big play button that overlaps contents below during video loading.
 2017-04-07 16:09:02 +08:00
Marina Glancy
a0cf7ee8de MDL-55939 course: no permission is needed to view frontpage 2017-04-07 16:04:29 +08:00
Marina Glancy
85b969f130 MDL-56370 mod_feedback: behat for repeat completion 2017-04-07 16:04:06 +08:00
Marina Glancy
d6f77a435f MDL-56370 mod_feedback: allow to restore values from last attempt 2017-04-07 16:04:06 +08:00
Marina Glancy
d0b4c8a787 MDL-55950 mod_feedback: correct link to response in the email 2017-04-07 16:03:42 +08:00
John Okely
62e87ae4b8 MDL-39913 assign: Add help on filetype submissions 2017-04-07 16:02:00 +08:00
Jonathon Fowler
4044cad5ea MDL-39913 assignsubmission_file: add file types restriction 
Testing for uploading a non-permitted file won't work as things stand
currently because the filemanager throws an exception that Behat
catches, which causes a fail.
 2017-04-07 16:02:00 +08:00
Jonathon Fowler
4e5a22df7a MDL-39913 filetypes: mimetypes remediation 
Going by http://www.iana.org/assignments/media-types/media-types.xhtml.
Disambiguated the Office 2007 types, Apple iWorks and other types
changes by tonyjbutler.
 2017-04-07 16:02:00 +08:00
Jan Dageförde
eb4ab7c4b8
MDL-58489 core: Fix unreachable HTTP error handling 2017-04-07 09:50:15 +02:00
Jun Pataleta
bd99cb9021 weekly release 3.3dev 2017-04-07 12:45:45 +08:00
Jun Pataleta
7e4a4d30df NOBUG: Fixed file access permissions 2017-04-07 12:45:45 +08:00
Jun Pataleta
dde6b3e9e3 NOBUG: Fixed SVG browser compatibility 2017-04-07 12:45:44 +08:00
Jun Pataleta
8fe00b70fc Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-04-07 12:45:44 +08:00
Andrew Nicols
e6a4780452 MDL-58297 core: Update to use new hashing functions 2017-04-07 10:40:23 +08:00
Andrew Nicols
a30a04fa01 MDL-58297 filestorage: New functions for hash calculation 2017-04-07 10:40:23 +08:00
David Monllao
6099f29beb MDL-55611 mod_quiz: Adapt behat test to myoverview 2017-04-06 18:59:12 +02:00
AMOS bot
92fa451cc2 Automatically generated installer lang files 2017-04-07 00:04:33 +08:00
David Monllao
2a69ffd212 MDL-12689 auth_shibboleth: No remote updates 2017-04-06 15:51:27 +02:00
Dan Poltawski
92fe5da36d MDL-12689 version: bump after behat fix 2017-04-06 10:52:24 +01:00
Dan Poltawski
b634c32668 Merge branch 'MDL-12689_master-fix' of git://github.com/dmonllao/moodle 2017-04-06 10:51:37 +01:00
David Monllao
6ef63c5920 MDL-12689 auth_cas: Default to English 2017-04-06 11:20:22 +02:00
Shamim Rezaie
74f83c14ee MDL-32596 tool_xmldb: Updated confirmcheckforeignkeys 
Updated $string['confirmcheckforeignkeys']
 2017-04-06 18:36:10 +10:00
Jake Dallimore
c846111951 Merge branch 'MDL-58220-master-fix5' of http://github.com/damyon/moodle 2017-04-06 16:29:13 +08:00
David Monllao
bc99a34d9c MDL-23919 mod_data: Required entries not available by default anymore 
Updating test accordingly, but still setting and checking a
field that is not part of the fieldsets opened by default.
 2017-04-06 10:25:17 +02:00
Damyon Wiese
340659cc29 MDL-58220 auth_oauth2: Linked logins only 4U 
You can only manage your own linked logins - never anyone elses.
 2017-04-06 16:06:12 +08:00
Dan Poltawski
b6deaa14b6 Merge branch 'MDL-55611-master-behat-fix' of git://github.com/lameze/moodle 2017-04-06 08:56:51 +01:00
Juan Leyva
94478c083d MDL-57813 mod_feedback: New WS mod_feedback_get_last_completed 2017-04-06 09:40:26 +02:00
David Monllao
287848d267 Merge branch 'wip-MDL-58364-master' of git://github.com/marinaglancy/moodle 2017-04-06 09:30:45 +02:00
Andrew Nicols
8602be9f00 MDL-55611 course: Fix incorrect merge conflict 2017-04-06 15:22:55 +08:00
Simey Lameze
daef59826a MDL-55611 core_tests: replace remaining I follow coursename steps 2017-04-06 15:22:15 +08:00