mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 20:53:53 +01:00
Code Issues Projects Releases Wiki Activity
60,977 Commits 36 Branches 519 Tags
Commit Graph

60977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
24fa63f415 Merge branch 'w17_MDL-39343_m25_installupgrade' of git://github.com/skodak/moodle 2013-04-30 14:11:34 +01:00
Dan Poltawski
4410509d0b Merge branch 'MDL-35385_chat' of git://github.com/andyjdavis/moodle 2013-04-30 14:07:55 +01:00
Petr Škoda
2cc9fa88f6 MDL-39343 disables MUC caches in phpunit and behat install/drop 2013-04-30 15:05:53 +02:00
Dan Poltawski
0542fdc6b4 Merge branch 'w17_MDL-39343_m25_installupgrade' of git://github.com/skodak/moodle 2013-04-30 13:37:52 +01:00
Dan Poltawski
8926c9fbcd Merge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle 2013-04-30 09:57:29 +01:00
Petr Škoda
e2e35e71f9 MDL-39343 disable all caching in install and upgrades 
This should resolve all problem on developer machines when switching branches or when restoring previous Moodle databases. It also prevents any potential problems during upgrades such as concurrent DB modification and resolves chicken egg problems in future caching upgrades.
 2013-04-30 10:27:34 +02:00
Damyon Wiese
b587727065 MDL-39354 Theme - Keep base and bootstrapbase in-sync 
Add 7px margin-right to checkboxes and radio buttons
 2013-04-30 16:24:14 +08:00
Damyon Wiese
89dc06570d Merge branch 'MDL-39354' of git://github.com/timhunt/moodle 2013-04-30 16:24:07 +08:00
Dan Poltawski
f8a14f7bcc Merge branch 'MDL-39405-master-int' of git://github.com/FMCorz/moodle 2013-04-30 09:16:31 +01:00
Dan Poltawski
0174ada56c Merge branch 'w17_MDL-39292_m25_enrolicons' of git://github.com/skodak/moodle 2013-04-30 08:52:49 +01:00
Damyon Wiese
34e46d7556 Merge branch 'mdl-39335' of git://github.com/vostreltsov/moodle 2013-04-30 15:51:12 +08:00
Dan Poltawski
7a286a0d6d Merge branch 'MDL-39415-master' of git://github.com/damyon/moodle 2013-04-30 08:34:16 +01:00
Dan Poltawski
e0b3f5f235 Merge branch 'w17_MDL-39077_m25_sizes' of git://github.com/skodak/moodle 2013-04-30 08:24:31 +01:00
Damyon Wiese
59d003497c Merge branch 'MDL-39351' of git://github.com/timhunt/moodle 2013-04-30 14:13:25 +08:00
Damyon Wiese
a10c057b8e Merge branch 'MDL-39322-master' of https://github.com/mackensen/moodle 2013-04-30 14:06:42 +08:00
Frederic Massart
7ce746f7cf MDL-39405 wiki: Reformat forms for better usability 2013-04-30 14:05:54 +08:00
Damyon Wiese
767421c36c Merge branch 'MDL-37966' of git://github.com/jonof/moodle 2013-04-30 12:26:47 +08:00
Damyon Wiese
4969053f25 Merge branch 'MDL-39246' of git://github.com/timhunt/moodle 2013-04-30 12:02:36 +08:00
Damyon Wiese
18de52db64 MDL-39415 Assign: Fix error on saving settings 
When alwaysshowdescription checkbox is unchecked the form cant be saved.

This is a regression from when the element was changed from a
selectyesno to a checkbox.
 2013-04-30 11:44:22 +08:00
Damyon Wiese
de079cffbf Merge branch 'wip_MDL_39230_2_5' of http://github.com/jamiepratt/moodle.git 2013-04-30 11:39:56 +08:00
Jamie Pratt
397acdfda2 MDL-39230 Question bank - refactor xml import 
Allow for reuse of code to read xml questions.
 2013-04-30 11:38:26 +08:00
Andrew Davis
dc514c1a0b MDL-35385 mod_chat: made sure no message popups display within the chat window 2013-04-30 09:01:00 +08:00
Sam Hemelryk
d36cc73edb Merge branch 'w17_MDL-39386_m25_enroldocs' of git://github.com/skodak/moodle 2013-04-30 11:00:06 +12:00
Sam Hemelryk
2a03b6dafe Merge branch 'MDL-39366-master-int' of git://github.com/FMCorz/moodle 2013-04-30 10:38:38 +12:00
Sam Hemelryk
0f540591df Merge branch 'MDL-39303_master' of https://github.com/markn86/moodle 2013-04-30 10:08:20 +12:00
Sam Hemelryk
3e9406bc17 Merge branch 'MDL-38896_master' of git://github.com/lazydaisy/moodle 2013-04-30 09:57:00 +12:00
Sam Hemelryk
e76a515f31 Merge branch 'MDL-39377' of git://github.com/colchambers/moodle 2013-04-30 09:48:18 +12:00
Sam Hemelryk
a91f5ccb86 Merge branch 'MDL-39365-master' of git://github.com/ankitagarwal/moodle 2013-04-30 09:36:50 +12:00
Sam Hemelryk
8e8a39aea0 Merge branch 'MDL-39398-master' of git://github.com/FMCorz/moodle 2013-04-30 09:31:54 +12:00
Tim Hunt
42d8287083 MDL-39354 put back a bit of margin on checkboxes. 2013-04-29 19:13:13 +01:00
Dan Poltawski
a10393e19f Merge branch 'MDL-39378' of git://github.com/timhunt/moodle 2013-04-29 17:00:53 +01:00
Dan Poltawski
d727e9d66a Revert "MDL-39278 - test change to less which is ungenerated" 
This reverts commit 0da03bf4e268e38cbb2be8254270ca38538b86e9.
 2013-04-29 14:33:07 +01:00
Dan Poltawski
0da03bf4e2 MDL-39278 - test change to less which is ungenerated 
My sincere apologies for polluting the history this way, but this
is the best way we can be sure.

TO BE CLEAR: this commit will shorlty be reverted.
 2013-04-29 14:23:51 +01:00
Dan Poltawski
4eaa353245 Merge branch 'MDL-39158-master' of git://github.com/damyon/moodle 2013-04-29 14:20:39 +01:00
Dan Poltawski
e947caf4a1 Merge branch 'MDL-39389' of git://github.com/stronk7/moodle 2013-04-29 14:15:23 +01:00
Dan Poltawski
1f65889ab3 Merge branch 'MDL-39390' of git://github.com/stronk7/moodle 2013-04-29 14:12:37 +01:00
Frederic Massart
99433e4d6d MDL-39398 message: Prevent notice when sending Jabber messages 
Not tracking the presence prevents a notice to be displayed during disconnect(),
where the the jabber server attempts to subscribe to $CFG->jabberusername presence.
As the server name does not include a resource identifier (stillwit@jabber.org/resource),
an explode('/') fails.
 2013-04-29 19:14:12 +08:00
Dan Poltawski
fcb6d4aac8 Merge branch 'MDL-27071' of git://github.com/stronk7/moodle 2013-04-29 10:27:29 +01:00
Damyon Wiese
883e6a77ce Merge branch 'w17_MDL-39356_m25_cacert' of git://github.com/skodak/moodle 2013-04-29 16:05:08 +08:00
Damyon Wiese
9b77b2011d Merge branch 'MDL-39342' of git://github.com/timhunt/moodle 2013-04-29 15:35:40 +08:00
Petr Škoda
51a230af6a MDL-39402 add missing theme dependencies 2013-04-29 09:20:57 +02:00
Damyon Wiese
b38218cfb0 Merge branch 'w17_MDL-39371_m25_cleandep' of git://github.com/skodak/moodle 2013-04-29 14:52:40 +08:00
Mark Nelson
34e2987118 MDL-39303 mod_forum: prevent user from submitting when post threshold reached 2013-04-29 14:44:04 +08:00
Damyon Wiese
b7098909c1 Merge branch 'MDL-38807-master' of git://github.com/danpoltawski/moodle 2013-04-29 14:17:53 +08:00
Damyon Wiese
ea03f1149e Merge branch 'MDL-30940-master' of git://github.com/FMCorz/moodle 2013-04-29 14:03:34 +08:00
Ankit Agarwal
325c730ba1 MDL-39365 scorm reports: Return correct track count 2013-04-29 13:26:09 +08:00
Damyon Wiese
bc5775b0ea Merge branch 'MDL-39362' of git://github.com/rwijaya/moodle 2013-04-29 13:00:19 +08:00
Damyon Wiese
c59a99df30 Merge branch 'w17_MDL-39174_m25_themedocs' of git://github.com/skodak/moodle 2013-04-29 12:22:23 +08:00
Rossiani Wijaya
c71d9297a6 MDL-39362 Admin: fixed setType() error for networking 2013-04-29 11:59:48 +08:00
Damyon Wiese
dd1ab4ae9a Merge branch 'MDL-37845' of git://github.com/timhunt/moodle 2013-04-29 11:45:05 +08:00