Commit graph

75230 commits

Author SHA1 Message Date
Damyon Wiese
4359caa22b MDL-50757 upgrade: Unset config value that will never be used again 2015-07-03 16:37:54 +08:00
Davo Smith
0c9d8172b5 MDL-48074 enrol: option to filter by users 'not in any group' 2015-07-03 09:35:57 +01:00
Adrian Greeve
316c560cc5 MDL-50757 gradebook: Update fix for pre 2.8 upgrades.
Moodle installations that updated before the 2.8 grade push
were being flagged for a gradebook freeze. This was resulting in
calculated grades being shown as different to how they were
displayed before the upgrade. This fix retains the original
grade value.
2015-07-03 13:13:12 +08:00
Mark Nielsen
a256eddbc3 MDL-50732 testing: Remove repositories from composer 2015-07-02 09:15:41 -07:00
Dan Poltawski
e5eefbbf01 weekly release 3.0dev 2015-07-02 14:25:56 +01:00
Dan Poltawski
5a559cacf1 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-07-02 14:25:53 +01:00
Juan Leyva
039c81f098 MDL-50489 forum: Handle qanda forums in get_forum_discussions_paginated
I removed the last qanda checks in forum_user_can_see_discussion because they are not necessary and
they make the external function fail.

A user in a qanda forum can always see a discussion (he needs to see the discussion to be able to reply).
What he cannot see are the other user posts unless he has replied to the discussion once and the edition period
(usually 30 minutes) has ended.

Note also that forum_user_can_see_discussion was originally only used when displaying forums in blog format
in order to display the button show more or not, this is the reason this wasn't detected before.
2015-07-02 10:55:40 +02:00
Marina Glancy
6e4b8381bf MDL-48239 grades: corrected docs url for calculation changes 2015-07-02 15:49:48 +08:00
Marina Glancy
f677ece516 MDL-48239 grades: fix notification class 2015-07-02 15:49:46 +08:00
Adrian Greeve
3f8a714f36 MDL-48239 gradebook: Oracle fix for string compare.
Update to upgradelib.php where string comparisions cause
phpunit failures in Oracle.
2015-07-02 12:30:26 +08:00
Eloy Lafuente (stronk7)
3950aa134f Merge branch 'wip-MDL-48239-master' of git://github.com/abgreeve/moodle 2015-07-02 05:42:08 +02:00
Adrian Greeve
6a7c8feb10 MDL-48239 gradebook: Change to calculated grade item min and max.
Regardless of the setting 'Min and max grades used in calculation'
Calculated grade items will always update the min and max raw grade.
2015-07-02 11:13:26 +08:00
Adrian Greeve
716c081049 MDL-48239 gradebook: Unit test for upgrade function. 2015-07-02 11:13:25 +08:00
Adrian Greeve
f44ffb724a MDL-48239 gradebook: Behat tests for calculated grade items. 2015-07-02 11:13:25 +08:00
Adrian Greeve
4d4dcc2718 MDL-48239 gradebook: Calculated grades maxgrade now able to be set. 2015-07-02 11:13:25 +08:00
Andrew Hancox
fef51794a0 MDL-48970 groups: Fix hover description on groups overview page
If a course exists within multiple groupings then the description
should display when you mouseover any instance of it on the overview
page.
2015-07-01 21:26:48 +01:00
Dan Poltawski
559c0f09bd MDL-39319 langimport: fix language file ordering and trailing whitespace 2015-07-01 11:06:33 +02:00
Dan Poltawski
56420e3664 Merge branch 'MDL-39319-master' of git://github.com/mastnym/moodle 2015-07-01 11:04:37 +02:00
Rajesh Taneja
bc7a59536b MDL-50481 behat: SingleSelect can be urlselect and should support id/name 2015-07-01 10:52:21 +08:00
David Monllao
b4d7038a88 Merge branch 'MDL-50497-M30' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2015-07-01 08:54:28 +08:00
Eloy Lafuente (stronk7)
e96e66aa16 MDL-50130 todo: Conditional code to be changed to API by MDL-50728 2015-06-30 19:56:48 +02:00
Juan Leyva
f804c73055 MDL-50130 users: Filter profile fields data in external functions 2015-06-30 19:52:19 +02:00
AMOS bot
7fd8762479 Automatically generated installer lang files 2015-07-01 00:04:55 +08:00
Dan Poltawski
0b45c56da1 Merge branch 'wip-mdl-50481' of https://github.com/rajeshtaneja/moodle 2015-06-30 12:25:52 +02:00
Dan Poltawski
2606aecc3b Merge branch 'MDL-33765_master_offset' of git://github.com/markn86/moodle 2015-06-30 11:32:47 +02:00
Dan Poltawski
8ce68b0723 Merge branch 'MDL-43949_master' of git://github.com/dmonllao/moodle 2015-06-30 10:34:08 +02:00
Dan Poltawski
1b80849856 Merge branch 'MDL-47787-master' of https://github.com/tbannister/moodle 2015-06-30 09:52:52 +02:00
David Monllao
35af60da7e MDL-50569 backup: Missing get_target call 2015-06-30 10:26:18 +08:00
Dan Marsden
476e97f280 MDL-50614 mod_scorm: Improve validation on currentorg 2015-06-30 10:12:51 +08:00
David Monllao
c6a1425ffb Merge branch 'MDL-50569-master' of git://github.com/FMCorz/moodle 2015-06-30 09:30:57 +08:00
Mark Nelson
eabbc98c78 MDL-50220 mod_forum: added missing capability check 2015-06-29 18:43:09 +02:00
Eloy Lafuente (stronk7)
154d468dbb Merge branch 'wip-mdl-50675' of https://github.com/rajeshtaneja/moodle 2015-06-29 18:25:55 +02:00
Eloy Lafuente (stronk7)
0339f2c4c1 MDL-50688 lib: small cleanup + http/https coverage. 2015-06-29 17:12:55 +02:00
Petr Skoda
5c1f41f058 MDL-50688 lib: fix local url validation bug
Change-Id: I350bb8c9ace5cc0403f083f728c100097be7aa7e
Reviewed-on: https://review.totaralms.com/8101
Tested-by: Jenkins Automation <jenkins@totaralms.com>
Reviewed-by: Sam Hemelryk <sam.hemelryk@totaralms.com>
Reviewed-by: Alastair Munro <alastair.munro@totaralms.com>
2015-06-29 16:44:03 +02:00
Ankit Agarwal
2149326b8c MDL-50049 deprecation: Remove usage of deprecated api and cleanup 2015-06-29 17:15:50 +05:30
Skylar Kelty
56af0fbda8 MDL-50663 blocks: Fix /my/ page when in non-user context 2015-06-29 11:37:10 +01:00
David Monllao
489878ad09 Merge branch 'MDL-50708_master' of git://github.com/nadavkav/moodle 2015-06-29 15:57:27 +08:00
Michael Aherne
8daf8d87f2 MDL-50466 tasks: Specific minute values for log cleanup 2015-06-29 08:45:04 +01:00
Frederic Massart
eff864e7eb MDL-50569 grades: Restore as merge always ignores minmaxtouse 2015-06-29 14:24:13 +08:00
Frederic Massart
cd4061ecd4 MDL-50569 grades: Handle minmaxtouse in backup/restore 2015-06-29 14:24:12 +08:00
Ankit Agarwal
8322ed4a66 MDL-50049 deprecation: Rearrange deprecated apis for better future management 2015-06-29 11:36:36 +05:30
Ankit Agarwal
33c46db574 MDL-50049 deprecation: Group together long term deprecated apis 2015-06-29 11:36:36 +05:30
Ankit Agarwal
1ac1d29b6d MDL-50049 deprecation: Final deprecation of old apis 2015-06-29 11:36:36 +05:30
David Monllao
21a0a68196 Merge branch 'MDL-50646-master-preflang' of git://github.com/mudrd8mz/moodle 2015-06-29 13:35:44 +08:00
David Monllao
e3e7c90528 Merge branch 'MDL-50652_master' of git://github.com/reskit/moodle 2015-06-29 13:01:51 +08:00
Mark Nelson
8e7774fa8c MDL-33765 filter_glossary: fixed jshint warning 2015-06-28 21:44:11 -07:00
Martin Mastny
a42f94a38d MDL-33765 filter_glossary: Stacking JS windows with offset 2015-06-28 21:44:11 -07:00
Martin Mastny
57a1f4fc65 MDL-33765 mod_glossary: Concept in ajax request not linking to itself 2015-06-28 21:44:11 -07:00
David Monllao
5324a7202a Merge branch 'wip_MDL-50659_master' of git://github.com/gjb2048/moodle 2015-06-29 11:45:02 +08:00
Rajesh Taneja
139dcb1879 MDL-50675 repository_wikimedia: Fixed title varaible 2015-06-29 09:53:45 +08:00