mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-01 22:42:35 +02:00
Code Issues Projects Releases Wiki Activity
72,023 Commits 36 Branches 528 Tags
Commit Graph

72023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Rajesh Taneja
cb8c8a2fba MDL-48624 behat: Added extended timeout in workshop step 
i_allocate_submissions_in_workshop_as step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
 2015-01-19 10:15:47 +08:00
Rajesh Taneja
e41aa29bca MDL-48624 behat: Added extended timeout to ensure step pass 
following_should_download_between_and_bytes step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
Also, not calling force download while running behat site
 2015-01-19 10:15:47 +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
AMOS bot
b2b31a8218 Automatically generated installer lang files 2015-01-18 00:03:56 +08:00
Gilles-Philippe Leblanc
699001c79b MDL-48873 auth_cas: Wrong redirection with bad multiauth login 2015-01-16 11:54:09 -05: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
Ray Bon
914cad8793 MDL-48837 phpunit: Restore system default timezone 2015-01-16 12:46:26 +08: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
Rajesh Taneja
a7960c06c2 MDL-48831 behat: Added behat test for label activity 
Thanks to Neill Magill, for providing test feature.
 2015-01-16 10:38:34 +08:00
Rajesh Taneja
fe4992854f MDL-48831 behat: Fixed activity show hide for label 
Labels are not links and have dimmed_text class
So updated find query for show/hide activity check
 2015-01-16 10:38:34 +08:00
Vadim Dvorovenko
28d20df9ba MDL-48779 MNet: multibyte substr in certificate generation 
Using core_text::substr instead of substr for trimming certificate
data. Is needed for sites with long unicode sitename to prevent
breaking line between unicode pair.
 2015-01-16 09:37:19 +07:00
Vadim Dvorovenko
f64828f23a MDL-48798 Statistics: Adding lang string for user activity. 
New lang string for 'Activity' (meaning count of user actions) in stats
reports to disambiguate it with 'Activity' (meaning course module).

AMOS BEGIN
 CPY [activity,core],[useractivity,core]
AMOS END
 2015-01-16 09:30:24 +07:00
Vadim Dvorovenko
2fbd261d45 MDL-42172 Authentification: Adding alternate names to "Lock user fields" 
Adding alternate name fields (firstnamephonetic, lastnamephonetic,
middlename, alternatename) to "Lock user fields" for all
authentification plugins. This is needed to sync alternate name fields
with external data sources and to lock them for editing.
 2015-01-16 09:23:51 +07:00