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

72092 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Nicols
1cb5f61213 Revert "Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle" 
This reverts commit e08f58288a, reversing
changes made to 782ea98c59.
 2015-01-22 12:13:35 +08:00
Frederic Massart
18247eb090 MDL-48383 task: Indicate when a task will not run if plugin is disabled 2015-01-22 11:07:52 +08:00
Andrew Nicols
7cd4a0f6d5 MDL-41851 mod_forum: Use noreply user when sending forum notifications 2015-01-22 09:42:12 +08:00
Stephen Bourget
7ce40bcb97 MDL-46755 format_social: behat test 2015-01-21 11:08:43 -05:00
Stephen Bourget
0d67ac8ea2 MDL-46755 format_social: Make discussion count configurable 2015-01-21 11:08:01 -05:00
Eloy Lafuente (stronk7)
a82d1fc4be Merge branch 'MDL-48823_master' of git://github.com/dmonllao/moodle 2015-01-21 12:32:19 +01:00
Andrew Nicols
5f9997ae95 MDL-48720 mod_forum: Tidy up whitespace to comply with coding style 2015-01-21 12:15:12 +08:00
Andrew Nicols
9ddb376645 MDL-48720 mod_forum: Only copy discussion preferences when moving posts 
Rather than adding discussion preferences to a user based upon their
subscription to the source forum, only respect any actively selected
preference. That is to say that:
* if a user has opted into a discussion and following a move would be
  unsubscribed, re-subscribe them;
* if a user has opted out of a discussion and following a move would be
  subscribed once more, unsubscribe them; and
* if a user has not made an active choice, follow the discussion preference
  for the target forum.
 2015-01-21 12:15:12 +08:00
Andrew Nicols
e2a036b4a9 Merge branch 'MDL-348' of https://github.com/bostelm/moodle 2015-01-21 11:46:22 +08:00
Frederic Massart
cd5e627de8 MDL-48921 admin: Keep the search string in the URL after form submission 2015-01-21 11:33:03 +08:00
David Monllao
8babb9606b MDL-48823 admin: Just one admin tree reload after settings changes 2015-01-21 10:41:23 +08:00
Andrew Nicols
81a9b9cee3 Merge branch 'wip-mdl-48761' of https://github.com/rajeshtaneja/moodle 2015-01-21 10:21:24 +08:00
Rajesh Taneja
d58b0ad6f1 MDL-48761 behat: Added new step for debugging scenarios 2015-01-21 10:16:22 +08:00
David Monllao
59da38ef8a Merge branch 'MDL-28513-master' of git://github.com/andrewnicols/moodle 2015-01-21 09:52:55 +08:00
Andrew Nicols
da992717f4 MDL-28513 install: Add adminemail to the CLI installers 2015-01-21 09:42:51 +08:00
Wesley Situ
7be4cf1873 MDL-48916 atto_undo: Clarify text for "Undo/Redo" 2015-01-20 16:21:35 -08:00
Eloy Lafuente (stronk7)
6d33cf76cd Merge branch 'wip-MDL-48847-master' of git://github.com/marinaglancy/moodle 2015-01-21 00:28:30 +01:00
Eloy Lafuente (stronk7)
2d78593650 Merge branch 'MDL-48830-m' of https://github.com/micaherne/moodle 2015-01-21 00:03:56 +01:00
Brian Barnes
f48d5209c9 MDL-48907 grades: fixed display of grade tabs 2015-01-21 10:42:32 +13:00
Eric Merrill
3f874a9d24 MDL-48711 gradebook: Properly compute extra-redit status for cat grades 
When seeing if a grade item for a category is computed for extra-credit
status, we need to use the *grandparent* of the item.
 2015-01-20 16:06:38 -05:00
Eric Merrill
4b4e41342a MDL-35765 availability: Use category total full names 2015-01-20 15:37:13 -05:00
Eloy Lafuente (stronk7)
298c45f2e3 Merge branch 'MDL-48873_master' of https://github.com/StudiUM/moodle 2015-01-20 19:23:05 +01:00
Eloy Lafuente (stronk7)
fac7cff3e2 Merge branch 'MDL-48813_m29' of git://github.com/sbourget/moodle 2015-01-20 19:20:26 +01:00
Eloy Lafuente (stronk7)
cb502499da Merge branch 'wip-mdl-48837' of https://github.com/rajeshtaneja/moodle 2015-01-20 18:52:00 +01:00
Dan Poltawski
75a67b0650 Merge branch 'MDL-48798-29' of https://github.com/vadimonus/moodle 2015-01-20 17:50:19 +00:00
Eloy Lafuente (stronk7)
ee263a454b Merge branch 'MDL-48477' of git://github.com/timhunt/moodle 2015-01-20 18:44:08 +01:00
Eloy Lafuente (stronk7)
b10b88a70b Merge branch 'MDL-48779-29' of https://github.com/vadimonus/moodle 2015-01-20 18:40:59 +01:00
Eloy Lafuente (stronk7)
d9b565e7b8 Merge branch 'MDL-47792_master' of git://github.com/dmonllao/moodle 2015-01-20 18:35:15 +01:00
Dan Poltawski
9f0c24120f Merge branch 'wip-mdl-48831' of https://github.com/rajeshtaneja/moodle 2015-01-20 17:20:58 +00:00
Narissa Bayler
1e65cb2557 MDL-48616 editor_atto: add macrons to atto charmap 2015-01-21 01:12:22 +08:00
Dan Poltawski
cde9fece2f Merge branch 'MDL-48829' of git://github.com/timhunt/moodle 2015-01-20 17:07:52 +00:00
Eloy Lafuente (stronk7)
e08f58288a Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle 2015-01-20 17:07:34 +01:00
Eloy Lafuente (stronk7)
782ea98c59 Merge branch 'MDL-47166-master' of git://github.com/andrewnicols/moodle 2015-01-20 16:14:26 +01:00
David Monllao
53aa8423bd Merge branch 'MDL-48765-master' of git://github.com/mackensen/moodle 2015-01-20 17:08:21 +08:00
David Monllao
97b2e747ac Merge branch 'wip-MDL-20053-master' of git://github.com/abgreeve/moodle 2015-01-20 16:43:24 +08:00
David Monllao
a2574f3d46 Merge branch 'MDL-48776-master' of git://github.com/gurgus/moodle 2015-01-20 16:07:34 +08:00
Andrew Nicols
de049d9d26 Merge branch 'MDL-42172-29' of https://github.com/vadimonus/moodle 2015-01-20 15:42:11 +08:00
Andrew Nicols
e50bac7ac1 Merge branch 'MDL-35486-master' of git://github.com/danpoltawski/moodle 2015-01-20 14:00:41 +08:00
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
Aaron Barnes
301bc0f249 MDL-47792 javascript: Fix for cropped headers and horizontal align 2015-01-20 11:34:47 +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
Jetha Chan
22893d6f47 MDL-48542 user_menu: add proper divider support 
Added divider support to the user menu; hardened the custom user menu against invalid input.
 2015-01-19 23:58:11 +08:00
Jetha Chan
c589b7be4e MDL-48542 user_menu: add custom user menu unit test 2015-01-19 23:58:10 +08:00
Adrian Greeve
14fb7662cc MDL-20053 mod_data: Update to fix unit tests. 2015-01-19 15:24:47 +08:00
Adrian Greeve
c1d222fcf8 MDL-20053 mod_data: Update to behat tests 
A bulk delete of entries has been added to
the behat tests.
 2015-01-19 15:24:47 +08:00
Adrian Greeve
c910cf308c MDL-20053 mod_data: Removal of individual DB call. 
The main functions for retrieving records have been
updated to include user picture information.
 2015-01-19 15:24:47 +08:00
Dave Cooper
59d5228465 MDL-48776 core_message: Fixed userid check. 
Thanks to Oleg Demeshev for providing the patch.
 2015-01-19 15:20:15 +08:00