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

71876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
a2209774ce Merge branch 'MDL-44560-master' of git://github.com/xow/moodle 2015-01-20 12:57:41 +08:00
Andrew Nicols
81a5c2b672 Merge branch 'MDL-38277_m29v2' of https://github.com/sbourget/moodle 2015-01-20 12:34:07 +08:00
Andrew Nicols
b4d70adb9e Merge branch 'MDL-43163' of git://github.com/jmvedrine/moodle 2015-01-20 11:23:41 +08:00
Andrew Nicols
a8ed2e50ea Merge branch 'MDL-48596' of git://github.com/jmvedrine/moodle 2015-01-20 10:54:19 +08:00
Andrew Nicols
715b525e28 Merge branch 'MDL-48741' of git://github.com/stronk7/moodle 2015-01-20 09:40:37 +08:00
Andrew Nicols
a8d8e315ec Merge branch 'MDL-46976-master' of git://github.com/danpoltawski/moodle 2015-01-19 11:59:30 +08:00
Andrew Nicols
ba8e7b3e2f Merge branch 'MDL-48073-master' of git://github.com/gurgus/moodle 2015-01-19 11:36:47 +08:00
Nivedita Setru
b6772ac721 MDL-48073 enrol: Fixed group filter resetting erroneously. 2015-01-19 11:24:36 +08:00
Andrew Nicols
7b0fdf24ab Merge branch 'MDL-43386' of git://github.com/jmvedrine/moodle 2015-01-19 09:24:44 +08:00
Jean-Michel Vedrine
59f1c9f5a8 MDL-43386 Lesson: Grade essay student response formatting not correct 2015-01-18 20:36:46 +01:00
Jean-Michel Vedrine
1cd5f23995 MDL-48596 mod_lesson: editing interface won't expand to full screen 2015-01-16 15:10:16 +01:00
Jean-Michel Vedrine
f47c365a48 MDL-43163 mod_lesson: Coding style problem: ->BOX 2015-01-16 15:09:15 +01:00
John Okely
4b793ed78b MDL-44560 mod_glossary: Fix indentation in mod/glossary/sql.php 2015-01-16 11:49:48 +08:00
John Okely
6fe5646a29 MDL-44560 glossary: Fix pagination on glossary category view 
Credit to Sebastian B for this fix
 2015-01-16 11:10:31 +08:00
Eloy Lafuente (stronk7)
4f6c2d9f8b MDL-48741 behat: add new moodle_list formatter (rerun compatible) 2015-01-16 03:13:58 +01:00
Stephen Bourget
9e84423b79 MDL-38277 Lesson: Fix strings on activity report 2015-01-15 12:41:57 -05:00
David Mudrák
edb13e3c2d MDL-48493 admin: Move the acknowledgement to the plugin validation page 
Previously, the acknowledgement was required only when installing
plugins from the ZIP file. It is valid when installing plugins from the
Plugins directory, too. So we display it at the validator page now to
make sure it is displayed in both cases.

There is no need to require the admin to check the acknowledgement box
now. We do not do that anywhere in admin UI (and there are more
dangerous operations than installing a plugin). Admins still can deploy
plugins manually without this tool anyway. And at the end, they are
admins. They should know what they are doing. Simply displaying the
acknowledgement message before they click the install button is enough.
 2015-01-15 12:58:14 +01:00
David Mudrák
1f6a9391ef MDL-48493 admin: Add icon to repeat permission check in plugin installer 2015-01-15 12:58:14 +01:00
David Mudrák
c192a33001 MDL-48493 admin: Do not require selected plugin type on installation 
Now we allow the plugin type left unselected and we attempt to
auto-detect it. Only when the auto-detection fails, the admin has to
manually select the type of the plugin.
 2015-01-15 12:58:14 +01:00
David Mudrák
bbf3cd4e93 MDL-48493 admin: Make plugin installer able to detect plugin component 
On contrary to deeper heuristic (read: guessing) we perform in the
Plugins directory (such as looking at the names of the language files),
here we simply rely on the plugin component being correctly defined in
the version.php file.

The validator class has more robust processing, to make sure the
component declaration is not provided in a commented area of the
version.php etc.  However, as it is fully acceptable that the
auto-detection fails if the version.php uses non-standard syntax, this
easier approach is valid here.
 2015-01-15 12:58:14 +01:00
Andrew Nicols
da0ef2e4cf weekly release 2.9dev 2015-01-15 08:46:37 +00:00
Andrew Nicols
03ab756eb1 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-01-15 08:35:03 +00:00
Eloy Lafuente (stronk7)
cb2456c379 Merge branch 'MDL-41674' of git://github.com/mr-russ/moodle 2015-01-15 08:35:03 +00:00
Andrew Nicols
2a43613b73 Merge branch 'master_MDL-48418' of https://github.com/greg-or/moodle-mod_assign 2015-01-15 08:35:02 +00:00
Eloy Lafuente (stronk7)
778f0becee Merge branch 'MDL-47761-master' of git://github.com/xow/moodle 2015-01-15 08:35:02 +00:00
Eloy Lafuente (stronk7)
ccb722b76c Merge branch 'MDL-48574_workflow_state_updated_batch_single' of https://github.com/Dave-B/moodle 2015-01-15 08:35:01 +00:00
Eloy Lafuente (stronk7)
639910a75d Merge branch 'MDL-41166-master' of git://github.com/danpoltawski/moodle 2015-01-15 08:35:01 +00:00
Eloy Lafuente (stronk7)
6f1c51b61a Merge branch 'MDL-48753_master' of git://github.com/markn86/moodle 2015-01-15 08:35:00 +00:00
Dan Poltawski
63cc7cfc61 Merge branch 'MDL-48675' of git://github.com/jmvedrine/moodle 
Conflicts:
	mod/lesson/upgrade.txt
 2015-01-15 08:34:58 +00:00
Dan Poltawski
02362f4414 Merge branch 'MDL-36824_m29' of https://github.com/sbourget/moodle 2015-01-15 08:33:29 +00:00
Dan Poltawski
594276893e Merge branch 'MDL-39103-master' of git://github.com/xow/moodle 
Conflicts:
	mod/lesson/lib.php
 2015-01-15 08:33:27 +00:00
Dan Poltawski
584e582bfc Merge branch 'MDL-45784-master' of git://github.com/xow/moodle 2015-01-15 08:32:45 +00:00
Dan Poltawski
db387f25de Merge branch 'MDL-47931' of git://github.com/jmvedrine/moodle 2015-01-15 08:32:44 +00:00
Dan Poltawski
1c0a4e23a2 Merge branch 'MDL-48474' of git://github.com/timhunt/moodle 2015-01-15 08:32:44 +00:00
Dan Poltawski
d55a433d6c Merge branch 'MDL-48750_m29' of https://github.com/sbourget/moodle 2015-01-15 08:32:43 +00:00
Dan Poltawski
c81689fa75 Merge branch 'MDL-48729_legacy_log_error' of https://github.com/andyjdavis/moodle 2015-01-15 08:32:43 +00:00
Dan Poltawski
8c9390c5eb Merge branch 'MDL-40326' of git://github.com/jmvedrine/moodle 2015-01-15 08:32:42 +00:00
Dan Poltawski
261b858985 Merge branch 'MDL-14730' of git://github.com/jmvedrine/moodle 2015-01-15 08:32:42 +00:00
Dan Poltawski
98c6b90358 Merge branch 'MDL-45848-master' of git://github.com/gurgus/moodle 2015-01-15 08:32:41 +00:00
Dan Poltawski
7bec688eaa Merge branch 'MDL-48510-master' of git://github.com/ankitagarwal/moodle 2015-01-15 08:32:41 +00:00
Ankit Agarwal
c93e6c5c17 MDL-48510 inbound: use 0 expiration for private files handler 2015-01-15 08:32:40 +00:00
Ankit Agarwal
017de890cb MDL-48510 inbound: Support disabling of expiration changes in UI 2015-01-15 08:32:40 +00:00
Ankit Agarwal
0a4ce3ffb4 MDL-48510 inbound: Use correct value of expiration 2015-01-15 08:32:39 +00:00
Andrew Nicols
2ae73817f4 Merge branch 'MDL-47232_master' of https://github.com/dmonllao/moodle 2015-01-15 08:32:38 +00:00
Andrew Nicols
26a1fbbd15 Merge branch 'MDL-43898-master' of git://github.com/danpoltawski/moodle 2015-01-15 08:32:38 +00:00
Eloy Lafuente (stronk7)
5d98ba68f5 MDL-35155 database: better sql_substr() impl. for mssql/sqlsrv + unit tests 
MSSQL's substring() implementation is somehow silly/strict and unable to
perform implicit casts to integer both for the start and length parameters.

This hits Moodle badly because of another problems (MDL-23997) we decided
to cast to string all bound placeholders long ago.

So this commit just enforces the cast of the start and length parameters to
integer. And includes unit tests for using placeholders on all positions in
the sql_substr() method.
 2015-01-15 08:32:38 +00:00
Eloy Lafuente (stronk7)
933c8f6a25 Merge branch 'MDL-35155-master' of git://github.com/danpoltawski/moodle 2015-01-15 08:32:37 +00:00
Dan Poltawski
6aa08f9442 Merge branch 'MDL-31774' of git://github.com/jmvedrine/moodle 2015-01-15 08:32:35 +00:00
Dan Poltawski
3eda28e937 Merge branch 'MDL-47935-master' of git://github.com/gurgus/moodle 2015-01-15 08:32:34 +00:00
Dan Poltawski
947ab40bf2 MDL-46976 user: trim whitespace from input email address 
Don't complain about invalid email address, we are a computer, we
love the jobs users hate.

ref: https://www.youtube.com/watch?v=5tquSbZEP-g
 2015-01-14 17:13:15 +00:00