mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
73,836 Commits 36 Branches 519 Tags
Commit Graph

73836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
David Monllao
489878ad09 Merge branch 'MDL-50708_master' of git://github.com/nadavkav/moodle 2015-06-29 15:57:27 +08: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
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
Rajesh Taneja
f463158b1f MDL-50675 repository_wikimedia: Wikimedia is using https and not http 2015-06-29 09:53:02 +08:00
Nadav Kavalerchik
e51bdc0bcc MDL-50708 SCORM: Right align menu item folder icon, when in RTL mode. 2015-06-27 23:49:11 +03:00
Gareth J Barnard
8576569f14 MDL-50659 themes: Regression: Drag a link makes icons move. 2015-06-26 11:41:16 +01:00
Tyler Bannister
7f7144fd50 MDL-47787 course: Added question delete to cm delete. 2015-06-25 16:35:22 -04:00
Mary Evans
d8d65e76e0 MDL-50497 theme_bootstrapbase: Divider colours look wrong when inverted 2015-06-25 18:18:56 +01:00
Marc Català
90faa6ae9c MDL-50652 workshop: Workshop module allows duplicated ID number 2015-06-25 14:28:10 +02:00
David Monllao
ed0fd1f6ec MDL-43949 groups: Add idnumber to web services 
Thanks to Vitor Martins for his contribution.
 2015-06-25 16:55:14 +08:00
Marina Glancy
fd36588fb6 MDL-49257 grades: apply freeze when restoring with contents deleting 2015-06-25 14:39:15 +08:00
David Monllao
38cb73a47f weekly release 3.0dev 2015-06-25 13:49:57 +08:00
David Monllao
f301aacb6f Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-06-25 13:49:55 +08:00
Marina Glancy
feda17c38e MDL-49257 grades: strings adjustments 2015-06-25 09:56:36 +08:00
David Monllao
94f73fdbcc MDL-50283 gradeform_rubric: No need to escape HTML entities 2015-06-24 11:21:56 +08:00
Eloy Lafuente (stronk7)
870d1aae1e MDL-49022 auth_ldap: keep method visibility unmodified. 2015-06-24 03:07:35 +02:00
Eloy Lafuente (stronk7)
78f312ae75 Merge branch 'wip-mdl-49022' of https://github.com/rajeshtaneja/moodle 2015-06-24 03:02:59 +02:00
Dan Poltawski
b32ba584b2 Merge branch 'MDL-49497' of git://github.com/stronk7/moodle 2015-06-23 16:25:04 +01:00
Eloy Lafuente (stronk7)
9a1adda585 MDL-49497 curl: keep api private and test it using reflection. 
While strictly we should not be testing private APIs, in order
to get this backported to stables without changing visibility
we use reflection to access to such private properties and methods.

Also added one exttest to verify user agent is properly sent.

Finally, fix some wrong whitespace and changed the helper class name
to better alternative.
 2015-06-23 17:20:20 +02:00
Dave Cooper
cbb7c6a905 MDL-49497 curl: Add configurable User-Agent unit tests. 2015-06-23 15:59:59 +02:00