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

89636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
b596cdda82 Merge branch 'MDL-62656-master' of git://github.com/mihailges/moodle 2018-07-03 23:33:01 +02:00
David Monllao
2af5c8e7ef Merge branch 'MDL-60014-master-catcherror-nopermission-annotatepdfcron' of https://github.com/Eva-Dv/moodle 2018-07-03 23:33:01 +02:00
David Monllao
772ae9d4fd Merge branch 'MDL-62691-master' of git://github.com/bmbrands/moodle 2018-07-03 23:33:00 +02:00
David Monllao
f8839747ce Merge branch 'MDL-62813-master' of git://github.com/lameze/moodle 2018-07-03 23:33:00 +02:00
David Monllao
de0b684c38 Merge branch 'MDL-62654-master' of git://github.com/bmbrands/moodle 2018-07-03 15:19:18 +02:00
David Monllao
3a0e92cd6a Merge branch 'MDL-32232-master' of https://github.com/lucaboesch/moodle 2018-07-03 13:59:57 +02:00
David Mudrák
dd808ec6b9 MDL-62796 tool_policy: Fix a regression in Behat test 
We now correctly show the popup with links to policies that apply to
anonymous visitors of the site. So the name of the guests only policy
became visible in this popup in more cases and it caused false failures.

The point of the lines affected by this patch is to make sure that the
policy does / does not appear in the list of policies to be accepted. So
I am making it more specific of where the text is / is not supposed to
be seen.
 2018-07-03 10:58:29 +02:00
Jake Dallimore
83e2051845 Merge branch 'MDL-59261-master' of git://github.com/ryanwyllie/moodle 2018-07-03 14:44:32 +08:00
Bas Brands
af9edb2e6a MDL-59261 theme_boost: compiled css fallback 2018-07-03 14:14:52 +08:00
Michael Hawkins
a990e4faff MDL-62767 theme: Remove old localcaches when clearing/updating theme cache 2018-07-03 14:00:29 +08:00
Michael Hawkins
9af6a71c70 MDL-62801 themes: Added missing filelib include 2018-07-03 13:07:27 +08:00
Marina Glancy
d80533be40 MDL-62790 course: cap check in core_course_get_categories 2018-07-03 12:01:15 +08:00
Jake Dallimore
25a592ff5f Merge branch 'MDL-62715-master' of git://github.com/andrewnicols/moodle 2018-07-03 08:49:35 +08:00
Eloy Lafuente (stronk7)
d34b408d98 Merge branch 'MDL-62763-master-enfix' of git://github.com/mudrd8mz/moodle 2018-07-02 20:09:07 +02:00
Eloy Lafuente (stronk7)
b197a1d4cb Merge branch 'MDL-62621-master-ixcomment' of git://github.com/mudrd8mz/moodle 2018-07-02 20:00:29 +02:00
David Monllao
3f3d7fec0c Merge branch 'wip-MDL-62796-master' of git://github.com/marinaglancy/moodle 2018-07-02 12:21:42 +02:00
Helen Foster
9722f6a25e MDL-62763 lang: Merge English strings from the en_fix language pack 
Significant string changes:

* various strings in tool_dataprivacy and tool_policy - 'Data Protection
  Officer' changed to 'privacy officer'
* idnumbermod_help,core - mentioning resource and custom reporting
 2018-07-02 11:15:26 +02:00
David Monllao
e460c95893 Merge branch 'MDL-62713-master' of https://github.com/sammarshallou/moodle 2018-07-02 10:40:40 +02:00
Eloy Lafuente (stronk7)
744a9de339 Merge branch 'MDL-61244-master-fix' of git://github.com/junpataleta/moodle 2018-07-02 10:36:30 +02:00
Jake Dallimore
221a79361a Merge branch 'MDL-62801-master' of git://github.com/mickhawkins/moodle 2018-07-02 16:18:23 +08:00
David Mudrák
82b7ad70b1 MDL-62621 comments: Add missing indexes on comments table 
The composite index over the fields contextid, commentarea and itemid
helps the comments API to load all comments for the given area
effectively.

The index over the userid field helps the privacy API to load all
comments by the given user.
 2018-07-02 10:04:26 +02:00
Jun Pataleta
26ffa8e4d3 MDL-61244 core_admin: Fix Behat navigation to purge caches page 2018-07-02 14:56:42 +08:00
Mihail Geshoski
c3c42514a1 MDL-62656 course: Align elements in course and category management 2018-07-02 08:25:01 +08:00
Eloy Lafuente (stronk7)
aedd74c610 Merge branch 'MDL-61244_master' of https://gitlab.com/marxjohnson/moodle 2018-07-02 01:42:00 +02:00
sam marshall
23f6a88341 MDL-62713 core_search: Cron error indexing sections in some cases 2018-06-29 10:48:16 +01:00
Michael Hawkins
3f2ed99d26 MDL-62801 themes: Remove old mustache caches when new one generated 2018-06-29 10:49:21 +08:00
Luca Bösch
73e571aae1 MDL-32232 lesson: changing a page type chooser option for consistency 2018-06-28 23:06:34 +02:00
Simey Lameze
23b05f1841 MDL-62813 calendar: add behat test for form validation 2018-06-28 14:04:46 +08:00
Jake Dallimore
f61ee4e857 weekly release 3.6dev 2018-06-28 14:02:55 +08:00
Simey Lameze
c20ac98869 MDL-62813 calendar: fix dmlreadexception on event form 2018-06-28 13:22:20 +08:00
Eloy Lafuente (stronk7)
ce514b08ee Merge branch 'MDL-62325-master' of git://github.com/rezaies/moodle 2018-06-28 02:05:50 +02:00
Eloy Lafuente (stronk7)
b66476d15d Merge branch 'wip-MDL-62755-master' of git://github.com/abgreeve/moodle 2018-06-28 01:55:53 +02:00
Eloy Lafuente (stronk7)
d7a10f5746 Merge branch 'MDL-61889-master' of git://github.com/junpataleta/moodle 2018-06-28 01:44:26 +02:00
Eloy Lafuente (stronk7)
8f63202014 Merge branch 'MDL-62747' of https://github.com/timhunt/moodle 2018-06-28 00:30:38 +02:00
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
Jake Dallimore
2bffba3cb6 Merge branch 'MDL-61732-master' of https://github.com/Dagefoerde/moodle 2018-06-27 12:17:48 +08:00
Eloy Lafuente (stronk7)
ef0a8b99b2 Merge branch 'MDL-45088-master' of https://github.com/lucaboesch/moodle 2018-06-27 03:21:53 +02:00
Eloy Lafuente (stronk7)
242b8fc0f3 Merge branch 'MDL-62703-master' of git://github.com/bmbrands/moodle 2018-06-27 03:17:31 +02:00
Eloy Lafuente (stronk7)
e872f93325 Merge branch 'MDL-41265-master' of git://github.com/mihailges/moodle 2018-06-27 03:06:47 +02:00
Eloy Lafuente (stronk7)
d77104e28c Merge branch 'MDL-62471_master' of git://github.com/dmonllao/moodle 2018-06-27 02:38:27 +02:00
Eloy Lafuente (stronk7)
0eac61de66 Merge branch 'MDL-62735-master-refactor' of https://github.com/snake/moodle 2018-06-26 10:44:08 +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
Jake Dallimore
decd90e2a3 Merge branch 'MDL-62698' of git://github.com/timhunt/moodle 2018-06-26 15:26:21 +08:00
Marina Glancy
e2029b8387 MDL-62796 tool_policy: show popup for users who are not logged in 2018-06-26 13:24:44 +08:00
Jun Pataleta
dd26f1be12 MDL-61889 tool_dataprivacy: Fix CI errors 2018-06-26 13:20:31 +08:00
Eloy Lafuente (stronk7)
01911b9f1f Merge branch 'MDL-59047-master' of git://github.com/bmbrands/moodle 2018-06-26 03:04:35 +02:00
Eloy Lafuente (stronk7)
cb6ba9b1be Merge branch 'MDL-62730-master' of https://github.com/snake/moodle 2018-06-26 02:53:42 +02:00
Eloy Lafuente (stronk7)
8e059bc39f Merge branch 'MDL-51419-master' of https://github.com/snake/moodle 2018-06-26 02:41:43 +02:00
Eva Davitasvili
88c77c8ea3 MDL-60014 assign: Annotate PDF - catch no permission error 2018-06-25 14:11:24 -04:00