mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-18 22:50:19 +01:00
Code Issues Projects Releases Wiki Activity
70,112 Commits 36 Branches 527 Tags
Commit Graph

70112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
e90a0396e1 MDL-3714 mod_forum: pre-integration clean up 2014-10-08 09:39:44 +13:00
Sam Hemelryk
82d9aebc7d Merge branch 'MDL-3714-master' of git://github.com/andrewnicols/moodle 2014-10-08 09:39:01 +13:00
Dan Poltawski
99675668b4 Merge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-10-07 16:52:07 +01:00
Jetha Chan
854a647e62 MDL-45893 user_menu: responsive approach; fixed minor issues 2014-10-07 23:31:47 +08:00
Dan Poltawski
409318eeff Merge branch 'MDL-47518' of https://github.com/rlorenzo/moodle 2014-10-07 14:32:48 +01:00
Dan Poltawski
c31f7c58c1 Merge branch '46481-28' of git://github.com/samhemelryk/moodle 2014-10-07 14:25:06 +01:00
Marina Glancy
850ac50a87 Merge branch 'MDL-32870' of git://github.com/jmvedrine/moodle 2014-10-07 17:16:56 +08:00
Dan Poltawski
08abbd61c2 Merge branch 'wip-MDL-35618-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-10-07 09:24:39 +01:00
Damyon Wiese
4a813f3959 Merge branch 'wip-MDL-36014-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2014-10-07 12:34:34 +08:00
Sam Hemelryk
94cdabcdee Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2014-10-07 16:28:50 +13:00
Marina Glancy
8dfd73e04a Merge branch 'MDL-38106-master' of git://github.com/danpoltawski/moodle 2014-10-07 10:25:29 +08:00
Sam Hemelryk
002ee6faab Merge branch 'MDL-36460-master' of git://github.com/andrewnicols/moodle 2014-10-07 15:16:54 +13:00
Marina Glancy
4e45c0319c MDL-31936 workshop: version bump 2014-10-07 10:15:54 +08:00
Marina Glancy
ae66542027 Merge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle 2014-10-07 10:08:48 +08:00
Andrew Nicols
91223df61b MDL-3714 mod_forum: Add an inbound message handler 
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
 2014-10-07 09:58:36 +08:00
Andrew Nicols
77c0a68db9 MDL-46284 core: Add e-mail fetcher from IMAP 
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
 2014-10-07 09:58:35 +08:00
Sam Hemelryk
3ba4e595fb Merge branch 'MDL-46295-master' of git://github.com/damyon/moodle 2014-10-07 10:36:48 +13:00
David Mudrák
16d364b560 MDL-31936 workshop: Improve unit tests for the course reset support 2014-10-06 23:32:32 +02:00
Sam Hemelryk
f46606936a Merge branch 'MDL-46978' of https://github.com/danielneis/moodle 2014-10-07 10:26:05 +13:00
Dan Poltawski
15b57a34df MDL-46576 grade: fix trailing whitespace 2014-10-06 18:11:25 +01:00
Dan Poltawski
f5bacd6539 Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle 
Conflicts:
	lib/upgrade.txt
    lib/db/upgrade.php
	version.php
 2014-10-06 18:06:13 +01:00
Dan Poltawski
fb991204a9 Merge branch 'MDL-46054-master' of git://github.com/jleyva/moodle 2014-10-06 16:01:26 +01:00
Tim Hunt
4d1fcfdf8a MDL-47547 quiz editing: minor fixes following MDL-47547 
* Remove unnecessary skip links.
* Disable shortforms for form in pop-ups.
* Remove some CSS that was hurting display of the add menu.
 2014-10-06 15:44:21 +01:00
Dan Poltawski
106486c7ad MDL-38106 lesson: don't require intro when upgraded 2014-10-06 14:54:53 +01:00
Dan Poltawski
9c054ebbe3 Merge branch 'MDL-45504' of git://github.com/stronk7/moodle 2014-10-06 14:00:20 +01:00
Dan Poltawski
816d082241 MDL-43089 question: fix shifter build issues 2014-10-06 13:53:26 +01:00
Marina Glancy
b79d2e2c08 Merge branch 'wip_MDL-47538_m28_phpunitseq' of git://github.com/skodak/moodle 2014-10-06 20:40:13 +08:00
Marina Glancy
2891651959 Merge branch 'MDL-46210-master' of git://github.com/danpoltawski/moodle 2014-10-06 20:39:09 +08:00
Marina Glancy
e286185334 Merge branch 'MDL-47221-master' of git://github.com/danpoltawski/moodle 2014-10-06 20:38:29 +08:00
Dan Poltawski
0892a5d65f MDL-43089 question: fix whitespace 2014-10-06 12:56:45 +01:00
Dan Poltawski
84f9d6f3df Merge branch 'MDL-43089-behat-fixup' of https://github.com/timhunt/moodle 2014-10-06 12:49:55 +01:00
Dan Poltawski
2eb24eb85a Merge branch 'MDL-43089' of git://github.com/mkassaei/moodle 2014-10-06 12:11:33 +01:00
Dan Poltawski
d79fd5cd29 Merge branch 'MDL-47426' of git://github.com/timhunt/moodle 2014-10-06 08:54:09 +01:00
Petr Skoda
ddffa9d6d3 MDL-47538 phpunit: fix invalid PHPUNIT_SEQUENCE_START constant 2014-10-06 17:31:15 +13:00
Marina Glancy
9b65d0dd62 MDL-36014 cohorts: specify exact cohort names in unittest 2014-10-06 09:50:29 +08:00
Eloy Lafuente (stronk7)
2b9c1cc5a4 MDL-45504 environment: define 2.8 requirements 
No changes from 2.7, so this is a simple copy of them.

The MyISAM case (MDL-46064) will be considered for 2.9.
 2014-10-06 01:11:41 +02:00
Sam Hemelryk
7b08f6e888 Merge branch 'master_MDL-47316' of git://git.catalyst.net.nz/moodle-r2 2014-10-06 11:15:44 +13:00
Sam Hemelryk
79eefed3c8 Merge branch 'MDL-43472-master' of git://github.com/danpoltawski/moodle 2014-10-06 11:10:19 +13:00
Tim Hunt
2dee2330aa MDL-43089 behat: fix core_question tests that use quiz. 
Unfortunately, using the quiz is the only way to test this, so no way to break the dependency.
 2014-10-05 22:47:52 +01:00
Sam Hemelryk
127ef54082 Merge branch 'MDL-45374' of git://github.com/jleyva/moodle 2014-10-06 10:44:30 +13:00
Dan Poltawski
49bee6dc67 MDL-46210 langimport: behat tests 
Behat tests for lang import. To run these tests you must define the
TOOL_LANGIMPORT_REMOTE_TESTS constant - because they rely on the
download.moodle.org infrastructure.
 2014-10-05 14:40:47 +01:00
Dan Poltawski
ed914e31c5 MDL-46210 langimport: logging for install/update/remove 
Now that we have sceduled tasks updating the langpacks, its useful
to log which actions have occured.
 2014-10-05 14:34:38 +01:00
Dan Poltawski
16078807f8 MDL-47221 task: allow 'random' time definitions 
When working against external services it can be advantageous to not
have automated tasks all hit the service at the exact same time from
many different installations.

This change allows the use of 'R' in hour/minute fields of the scheduled
task definition so a task will be installed with a 'random' hour/minute
value for these sort of occasions.

Note that the task will be installed in the database with a defined
time, this simply randomises the time chosen when loading from the
definiton.
 2014-10-05 14:27:04 +01:00
Dan Poltawski
1028f6fab8 MDL-46210 langimport: task for updating langpacks 
Now langpacks will be updated by scheduled task every day rather
than updating manually.
 2014-10-05 14:25:45 +01:00
Dan Poltawski
816b3e0176 MDL-46210 langimport: Rearrange code 
Factoring code into a controller class so that the update
can be put into a scheduled task (and be a bit tider).
 2014-10-05 14:25:45 +01:00
Dan Poltawski
516ea6cf8b MDL-47221 task: allow 'random' time definitions 
When working against external services it can be advantageous to not
have automated tasks all hit the service at the exact same time from
many different installations.

This change allows the use of 'R' in hour/minute fields of the scheduled
task definition so a task will be installed with a 'random' hour/minute
value for these sort of occasions.

Note that the task will be installed in the database with a defined
time, this simply randomises the time chosen when loading from the
definiton.
 2014-10-05 14:25:44 +01:00
Dan Poltawski
5b17d81dce MDL-38106 lesson: behat now sets introduction 2014-10-05 14:12:59 +01:00
Sam Hemelryk
3973b67f61 MDL-46481 backup: removed collapsing and better lang string 
Thanks Rex for the peer-review!
 2014-10-05 16:21:38 +13:00
Jean-Michel Vedrine
0abc18cf4d MDL-32870 Lesson: No HTML editor for questions answers and responses 2014-10-04 15:13:01 +02:00
Dan Poltawski
06b5e81bcd MDL-43472 course: behat tests for searching courses 2014-10-04 08:40:32 +01:00