mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-12 03:52:16 +02:00
Code Issues Projects Releases Wiki Activity
88,558 Commits 36 Branches 531 Tags
Commit Graph

88558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
7d0fcb5c86 MDL-61864 tool_policy: Fix whitespace issues 2018-04-18 12:16:53 +08:00
Andrew Nicols
a8b35f9ccd Merge branch 'wip-MDL-61864-master' of git://github.com/marinaglancy/moodle 2018-04-18 12:01:29 +08:00
Jun Pataleta
4fa9393def Merge branch 'MDL-56511-master-lint' of git://github.com/andrewnicols/moodle 2018-04-18 11:23:52 +08:00
Andrew Nicols
7b87d98d6e MDL-56511 theme_boost: Fix SCSS lint issues 2018-04-18 11:02:56 +08:00
Jun Pataleta
3a37a5e934 Merge branch 'MDL-61950-master' of git://github.com/ryanwyllie/moodle 2018-04-18 09:46:57 +08:00
Andrew Nicols
6979cf56e2 Merge branch 'MDL-56511-master' of git://github.com/andrewnicols/moodle 2018-04-18 09:35:29 +08:00
Bas Brands
89f0061e23 MDL-56511 theme_boost: Work around CSS Parser restrictions 
The CSS Parser used in Moodle does not handle the use of complex
calculations at this stage.
The temporary workaround here uses a fixed position to ensure that the
popover arrows affected are in the correct location.
 2018-04-18 09:31:57 +08:00
Bas Brands
3ec69c2ece MDL-56511 theme_boost: Update to Bootstrap 4 stable 
Behat fixes by David Monllao <davidm@moodle.com>
    - Blocks
    - Modals
    - Messaging styling
    - Breadcrumb
    - Pagination
    - Course & categories management
 2018-04-18 09:31:53 +08:00
Eloy Lafuente (stronk7)
45fc6559b4 Merge branch 'master_MDL-59857' of https://github.com/danmarsden/moodle 2018-04-18 03:06:56 +02:00
Eloy Lafuente (stronk7)
6d4bc5bd34 weekly release 3.5dev 2018-04-17 19:54:27 +02:00
Eloy Lafuente (stronk7)
857617e9db NOBUG: Fixed file access permissions 2018-04-17 19:54:27 +02:00
Eloy Lafuente (stronk7)
cc41793c50 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-04-17 19:54:24 +02:00
David Monllao
b71ce36030 MDL-60953 search: Set solr as search engine for testing 
Also replacing field label references for "All groups" references as
there is a mforms bug related to hideIf.
 2018-04-17 13:26:21 +02:00
Jun Pataleta
659bdbd22a Merge branch 'MDL-61663-master-phpunit' of git://github.com/andrewnicols/moodle 2018-04-17 14:44:12 +08:00
Andrew Nicols
ceb2167df1 MDL-61663 phpunit: Add portfolio to the testsuite list 2018-04-17 14:39:56 +08:00
Marina Glancy
d5cfbc918f MDL-61864 tool_policy: cancel button when agreeing to policies 
Show cancel button during signup only and do not show when user is logged
in and has to accept changed policies

When cancel button is clicked redirect to the site homepage
 2018-04-17 14:19:19 +08:00
Marina Glancy
432a90f1ed MDL-61868 tool_policy: export agreements in privacy api 
Part of MDL-61864
 2018-04-17 14:19:16 +08:00
Jun Pataleta
c3fd1e97ba Merge branch 'MDL-61862-master' of git://github.com/FMCorz/moodle 2018-04-17 12:07:49 +08:00
Andrew Nicols
5cddf50e69 Merge branch 'wip-MDL-61663-master' of git://github.com/abgreeve/moodle 2018-04-17 11:45:50 +08:00
Andrew Nicols
ae9167bb3b Merge branch 'MDL-61977-master' of git://github.com/zig-moodle/moodle 2018-04-17 11:42:39 +08:00
Adrian Greeve
0f198a4f8e MDL-61663 portfolio: Update to the external system link names. 
Changed the name of the link to something less like an English
string for each of the portfolios.
 2018-04-17 11:39:11 +08:00
Frédéric Massart
29b44cedfc MDL-61862 mod_feedback: Tweak query to support UNION on TEXT fields 
Thanks Oracle.
 2018-04-17 11:35:55 +08:00
Andrew Nicols
18e58659bb Merge branch 'MDL-61980-master' of git://github.com/mihailges/moodle 2018-04-17 11:34:25 +08:00
Andrew Nicols
cabbda70b1 Merge branch 'MDL-61916-master' of git://github.com/cescobedo/moodle 2018-04-17 11:17:08 +08:00
Andrew Nicols
9dabc4b966 Merge branch 'MDL-61918-master' of git://github.com/mihailges/moodle 2018-04-17 11:12:24 +08:00
Andrew Nicols
f9f74f7a11 Merge branch 'MDL-61903-master' of git://github.com/mihailges/moodle 2018-04-17 11:09:01 +08:00
Andrew Nicols
f8ad868fad Merge branch 'm35_MDL-60923_New_BackupDir_Setting-v2' of https://github.com/scara/moodle 2018-04-17 09:44:44 +08:00
Mihail Geshoski
885378ca4e MDL-61903 webservice: Implement null privacy provider 
Implement null privacy provider to rest, soap and xmlrpc webservice plugins.
 2018-04-17 09:19:59 +08:00
Andrew Nicols
d282ecf683 Merge branch 'MDL-61435-master' of git://github.com/lameze/moodle 2018-04-17 08:37:58 +08:00
Matteo Scaramuccia
40d90f438a MDL-60923 scheduled tasks: stale temp files in $CFG->backuptempdir too 2018-04-16 23:50:28 +02:00
Matteo Scaramuccia
ef844148a9 MDL-60923 backup: Added $CFG->backuptempdir 
The new setting will allow to host the temporary backup files
into a specific target directory. Defaults to '$CFG->tempdir/backup'.

Calling make_backup_temp_directory() checks that the required sub-directory
will be properly created under the new target directory.
 2018-04-16 23:50:28 +02:00
Jun Pataleta
d51c946700 Merge branch 'MDL-61862-master' of git://github.com/FMCorz/moodle 2018-04-16 23:30:42 +08:00
Eloy Lafuente (stronk7)
06dbe955d0 MDL-61819 editor: add testsuite to phpunit.xml 2018-04-16 16:36:42 +02:00
David Monllao
77d9eca5f2 Merge branch 'MDL-61819-master' of git://github.com/andrewnicols/moodle 2018-04-16 16:12:59 +02:00
Andrew Nicols
5377f8a263 MDL-61819 core_editor: Implement core provider 2018-04-16 21:54:51 +08:00
Andrew Nicols
0d619f41c2 MDL-61819 editor_atto: Implement null provider 2018-04-16 21:54:50 +08:00
Andrew Nicols
8c815348eb MDL-61819 editor: Implement editor null providers 2018-04-16 21:54:49 +08:00
David Monllao
99719b6e89 Merge branch 'MDL-39035-master' of https://github.com/lucaboesch/moodle 2018-04-16 12:57:34 +02:00
Frédéric Massart
9f6296e5de MDL-61862 mod_feedback: Implement core_privacy API 2018-04-16 18:45:27 +08:00
David Monllao
82f0ddc7c7 MDL-60953 search: Update groups support method name 2018-04-16 11:45:18 +02:00
David Monllao
9dbb24fa7a Merge branch 'MDL-60953-master' of https://github.com/timhunt/moodle 2018-04-16 11:43:53 +02:00
David Monllao
d2c80085fd Merge branch 'MDL-61741-master-paypal' of git://github.com/mudrd8mz/moodle 2018-04-16 10:57:19 +02:00
David Monllao
2ffb0309dd Merge branch 'wip-MDL-61808-master' of git://github.com/abgreeve/moodle 2018-04-16 09:59:43 +02:00
Jun Pataleta
1e09c9ac8f Merge branch 'MDL-61708-lti-fullnamedisplay' of https://github.com/wjroes/moodle 2018-04-16 15:29:08 +08:00
Jun Pataleta
cdd11481b4 Merge branch 'MDL-61974-master' of git://github.com/andrewnicols/moodle 2018-04-16 13:17:21 +08:00
Sara Arjona
24966a26c7 MDL-61868 tool_policy: Implement privacy API 
Part of MDL-61864
 2018-04-16 11:30:14 +08:00
Sara Arjona
4e9e2b0a0a MDL-61844 policy: Avoid to accept new policies during current session 
Avoid redirection for accepting new policies during the manager user session
when $user->policyagreed=0 and he/she activates the first policy for logged in users.

Part of MDL-61864
 2018-04-16 11:30:14 +08:00
Sara Arjona
3f9b276b97 MDL-61866 tool_policy: Add readme_moodle.txt file and reorganise styles.css 
- Review changes made in jquery-eu-cookie-law-popup.js, for minimising them
(add eslint-disable to disable checking)
- Reorganise styles.css to separate CSS code from jquery-eu-cookie-law-popup
to policy one.
- Create readme_moodle.txt file, with instructions for updating the
jquery-eu-cookie-law-popup lib.

Part of MDL-61864
 2018-04-16 11:30:14 +08:00
Marina Glancy
cc3790d0ea MDL-61864 tool_policy: function can_delete_version 
review TODOs in code, make sure they are either removed or tracker issues are created
 2018-04-16 11:30:13 +08:00
Marina Glancy
673b598109 MDL-61864 tool_policy: coding style fixes 2018-04-16 11:30:13 +08:00