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

67179 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
4176b66597 Merge branch 'MDL-45166_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-04-30 17:23:50 +08:00
Damyon Wiese
68798bec46 Merge branch 'mdl44575-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE 2014-04-30 15:58:07 +08:00
Dan Poltawski
e363a0fb6a Merge branch 'MDL-45256-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-30 15:48:58 +08:00
Frederic Massart
d3f1d516e0 MDL-45256 portfolio: Adding missing global in testcase 2014-04-30 15:31:22 +08:00
Dan Poltawski
8f8f583406 Merge branch 'MDL-45256-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-30 14:58:49 +08:00
Frederic Massart
17753f88b1 MDL-45283 restore: Prevent failure when user course grade exists 
When we restore a course, the grade that a user has for the
grade item of the course cannot be created twice. If we try
to create it when it already exists, a database exception is
raised because of index duplication.

The safest way to proceed is certainly to ignore the grade
information from the backup, otherwise we could potentially
overwrite existing information. Though, this only applies
to restore as merge, and it does not affect the update of
the course grade.
 2014-04-30 12:17:14 +08:00
Simey Lameze
3c0307d623 MDL-42956 auth: Fix hard-coded LIMIT clause on keepalive_client method. 2014-04-30 10:51:52 +08:00
Marina Glancy
067a1bcb4d Merge branch 'MDL-45315-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-04-30 09:54:39 +08:00
Marina Glancy
049c8ed4d1 Merge branch 'MDL-27459-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-04-30 09:54:27 +08:00
Krister
5e3da2f722 MDL-42635 lesson: change from error to user friendly message 2014-04-30 09:52:26 +08:00
Eloy Lafuente (stronk7)
a76fb41a02 MDL-45221 Allow unit tests to pass under any OS 
This commit gets rid of the old lib/tests/other/executable.php
file completely because it was only executable under unix OSs
and moves the check to be performed against some mimetex binaries
that are known to be executable and bundled with every installation.

Note this was discovered because the weekly rolling process changed
the execution permissions of the "fixture" file and, at the end
we decided to get rid of it completely, folowing the plan above.
 2014-04-29 19:32:13 +02:00
Eloy Lafuente (stronk7)
3bd12f7156 weekly release 2.6.2+ 2014-04-29 15:13:57 +02:00
Eloy Lafuente (stronk7)
72ed847d63 NOBUG: Fixed file access permissions 2014-04-29 15:13:56 +02:00
Tim Hunt
fddcf077ab MDL-45273 quiz: Fix codechecker issues. 2014-04-29 11:57:32 +01:00
Tim Hunt
6f9a441023 MDL-45273 only create the quiz settings if necessary. 2014-04-29 11:57:31 +01:00
Tim Hunt
22f09398cd MDL-45273 remove the need for quiz settings.php to include locallib.php. 2014-04-29 11:57:29 +01:00
Tim Hunt
f57d7f3f95 MDL-45273 quiz: move admin settings into classes folder. 2014-04-29 11:57:27 +01:00
Frederic Massart
687e149038 MDL-45256 portfolio: Unit tests for rewrite pluginfile urls 2014-04-29 17:44:10 +08:00
Frederic Massart
b647aa51b1 MDL-45256 portfolio: Do not require strict XML when parsing content 2014-04-29 17:44:10 +08:00
Marina Glancy
cb5260014a Revert "Merge branch 'MDL-45229-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE" 
This reverts commit d6eb354664, reversing
changes made to 93b2d3baca.
 2014-04-29 17:29:01 +08:00
Dan Poltawski
5244995a26 MDL-45315 block_news_items: Add missing depedency 2014-04-29 14:29:18 +08:00
Marina Glancy
a632d590f3 Merge branch 'MDL-45289-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-04-29 12:50:05 +08:00
Damyon Wiese
c814c5f947 Merge branch 'MDL-44916-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE 2014-04-29 10:22:01 +08:00
Dan Poltawski
1f5f345d65 MDL-45289 block_course_summary: Add behat tests 2014-04-29 10:06:50 +08:00
Sam Hemelryk
ff6a130dcd Merge branch 'MDL-45312_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-04-29 10:24:23 +12:00
Sam Hemelryk
d1b900ea92 Merge branch 'MDL-45221-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-04-29 09:10:12 +12:00
Tim Hunt
1be0a4c812 MDL-45312 qtype_missingtype or qbehaviour_missing cannot be uninstalled. 
They are required by the system.
 2014-04-28 21:46:13 +01:00
Sam Hemelryk
d6eb354664 Merge branch 'MDL-45229-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-29 08:40:20 +12:00
Marina Glancy
93b2d3baca Merge branch 'w18_MDL-45287_m26_dbreset' of git://github.com/skodak/moodle into MOODLE_26_STABLE 2014-04-28 20:18:19 +08:00
Marina Glancy
795fb4aea4 Merge branch 'MDL-45266-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-04-28 18:02:36 +08:00
Marina Glancy
7b6bdc91e9 Merge branch 'MDL-45156_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-04-28 18:02:25 +08:00
Petr Skoda
2e123e7120 MDL-45287 fix behat database reset between scenarios 
We cannot find out if DB received any writes because behat
web access runs in different request.

This was affecting only scenarios without generators.
 2014-04-28 17:13:29 +08:00
Damyon Wiese
f91bf9a768 Merge branch 'MDL-45079_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE 2014-04-28 17:08:12 +08:00
Jetha Chan
1a039ee822 MDL-45292 filepicker: fixed border style 
Fixed base style issues on RTL.
 2014-04-28 15:55:27 +08:00
Marina Glancy
14df84f65e Merge branch 'MDL-45288_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-04-28 13:49:02 +08:00
David Monllao
d15809bb81 MDL-45156 behat: Changing html_writer::empty_tag for start_tag 
Credits to Daniele Cordella.
 2014-04-28 12:30:35 +07:00
Marina Glancy
7ca387b3cf Merge branch 'MDL-44614_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-04-28 13:04:08 +08:00
Andrew Nicols
29fe6d8155 MDL-45221 admin: configexecutable admin settings should only accept files 2014-04-28 12:21:42 +08:00
Frederic Massart
0d84ac90bf MDL-45229 event: Validate sectionnum in course_section_updated 2014-04-28 11:40:54 +08:00
Jason Fowler
418cbf32ed MDL-44916 Question: Fixing alignment in bootstrap themes 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-28 11:38:39 +08:00
David Monllao
70cbedd4cf MDL-45288 behat: Restricting click to .logininfo 2014-04-28 10:27:45 +07:00
Marina Glancy
4f214c3b64 Merge branch 'MDL-44004-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-28 11:17:06 +08:00
Damyon Wiese
b7a172cc23 Merge branch 'MDL-45268-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-04-28 10:52:46 +08:00
Marina Glancy
1f2e95e7eb Merge branch 'm26_MDL-45210' of git://github.com/totara/moodle into MOODLE_26_STABLE 2014-04-28 10:46:50 +08:00
Dan Poltawski
1a1cb928dd MDL-45266 behat: tests for login block 2014-04-28 10:45:39 +08:00
Sam Hemelryk
5701d152e5 Merge branch 'MDL-45164_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-04-28 14:09:29 +12:00
Sam Hemelryk
3638582c2f Merge branch 'MDL-45284_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-04-28 14:09:21 +12:00
Sam Hemelryk
2f9955d4cc Merge branch 'wip-MDL-45280-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-04-28 12:22:51 +12:00
Eloy Lafuente (stronk7)
9d3933d4ad MDL-45286 timezones: updated to 2014b 2014-04-28 01:01:56 +02:00
Yuliya Bozhko
40b34dc0e3 MDL-45079 badges: Remove user email address from badge page 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-04-28 10:05:58 +12:00