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

61113 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
98b2443961 Merge branch 'wip-MDL-39482-master' of git://github.com/marinaglancy/moodle 2013-05-07 12:43:50 +08:00
Sam Hemelryk
d5cdfbc288 Merge branch 'MDL-39364_clean' of git://github.com/lazydaisy/moodle 2013-05-07 16:13:06 +12:00
Damyon Wiese
a135128390 Merge branch 'wip-MDL-39130-master' of git://github.com/ds125v/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-07 11:25:35 +08:00
Damyon Wiese
e0fc61f993 Merge branch 'MDL-39162' of git://github.com/totara/openbadges 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-07 10:41:44 +08:00
Eloy Lafuente (stronk7)
4d71661e2b Merge branch 'wip-MDL-37500-m25' of git://github.com/samhemelryk/moodle 2013-05-07 03:00:02 +02:00
Sam Hemelryk
5f5776c1e6 MDL-37500 cache: integration review touchups. 
Issues:
1. Fix setType calls
2. Changing from default to all and editing again, default is still selected.
3. Uncheck all options causes error.
4. Doesn't seem to be restricting based upon option.
5. Picked all and got coding error with the database thing.
6. Bad title: https://github.com/samhemelryk/moodle/commit/wip-MDL-37500-m25#L1R157
7. Amend comments - should only be removed once 2.5 is the minimum version for an upgrade.
8. Document the defaultsharing option.

Outcomes:
1. Fixed - copy paste error.
2. Fixed - mforms was applying the default value despite a value being provided. A quirk of elements with array names.
3. Fixed - validation now requires at least one option to be selected.
4. Fixed - issue rose from definitions not being re-parsed. cache/admin.php now reparses the first time a user visits the page.
5. Fixed - better purging of definitions when working with them anonymously. Unit test added.
6. Fixed - new string added and used.
7. Fixed - comments amended.

New issue to address parsing of definitions during upgrade.
New issue to add debugging notice if definition sets only one possible sharing option and that option is user input.
 2013-05-07 12:49:12 +12:00
Sam Hemelryk
46e17f04c7 MDL-37500 cache: implemented sharing options and gui 2013-05-07 11:57:37 +12:00
Damyon Wiese
69a0e65c56 MDL-38315 Fix unit tests for module completion 2013-05-06 23:27:40 +08:00
Dan Poltawski
8a414a7950 Merge branch 'MDL-39435-master-int' of git://github.com/FMCorz/moodle 2013-05-06 16:12:28 +01:00
Dan Poltawski
e8dfed6b81 MDL-38238 icons: convert to make ie9 compatible 2013-05-06 16:07:51 +01:00
Dan Poltawski
90f44f5cd3 Merge branch 'MDL-38238-master' of git://github.com/barbararamiro/moodle 2013-05-06 16:04:45 +01:00
Eloy Lafuente (stronk7)
fc17f75684 Merge branch 'MDL-38041_master-fix' of git://github.com/dmonllao/moodle 2013-05-06 16:50:30 +02:00
Maria Torres
f2dc4d24f9 MDL-39169: Now the question's tags are added in backup/restore options 2013-05-06 15:41:56 +01:00
Damyon Wiese
14cd6479de Merge branch 'MDL-38315-master' of git://github.com/sammarshallou/moodle 2013-05-06 22:27:41 +08:00
Damyon Wiese
da97cfe35e Merge branch 'MDL-38480_m' of git://github.com/andreabix/moodle 2013-05-06 21:57:19 +08:00
Dan Poltawski
c892205617 Merge branch 'MDL-39446' of git://github.com/timhunt/moodle 2013-05-06 14:47:58 +01:00
Dan Poltawski
2da94da7b5 Merge branch 'MDL-39473-master' of git://github.com/sammarshallou/moodle 2013-05-06 14:32:33 +01:00
Dan Poltawski
cbd77ed9bb Merge branch 'wip-MDL-39065-master' of git://github.com/marinaglancy/moodle 2013-05-06 13:25:51 +01:00
Dan Poltawski
b92830664d Merge branch 'MDL-39491-workshop-media' of git://github.com/mudrd8mz/moodle 2013-05-06 13:11:46 +01:00
Dan Poltawski
845fccfcb6 Merge branch 'MDL-39470_master' of https://github.com/markn86/moodle 2013-05-06 12:39:53 +01:00
Damyon Wiese
76640b273d MDL-38443 Assignment: Missing permissions check on downloadall submissions 2013-05-06 10:19:23 +01:00
Dan Poltawski
4736236959 Merge branch 'MDL-39442-copy-addon' of git://github.com/mudrd8mz/moodle 
Conflicts:
	admin/tool/installaddon/version.php
 2013-05-06 10:00:23 +01:00
Damyon Wiese
373a40c5db Merge branch 'MDL-39484-master-int' of git://github.com/FMCorz/moodle 2013-05-06 15:38:24 +08:00
Damyon Wiese
881a90c0bb MDL-39143: Version bump and svgfix for ie9 2013-05-06 15:32:48 +08:00
Damyon Wiese
3b8841dda2 Merge branch 'MDL-39143-master' of git://github.com/barbararamiro/moodle 2013-05-06 15:31:05 +08:00
Damyon Wiese
4017ea2fce Merge branch 'MDL-39445' of git://github.com/timhunt/moodle 2013-05-06 15:15:02 +08:00
Barbara Ramiro
a129cc06e8 MDL-39143 usability: New badge icon - monochrome, bigger, clearer 2013-05-06 14:37:04 +08:00
David Monllao
1d9ec4cbc2 MDL-38041 behat: Respect error_reporting() values overwritten by moodle code 2013-05-06 14:12:41 +08:00
Mark Nelson
33bea465bd MDL-39470 cache: added missing component to get_string call 2013-05-06 13:51:00 +08:00
Damyon Wiese
9fbf1dfb6e Merge branch 'MDL-39412' of git://github.com/timhunt/moodle 2013-05-06 12:27:19 +08:00
Yuliya Bozhko
f8ba185ac5 MDL-39162: Add badges CSS to bootstrap theme 2013-05-06 16:20:02 +12:00
Damyon Wiese
b67eb16a16 MDL-39399: Version bump for css 2013-05-06 12:17:44 +08:00
Damyon Wiese
4c2a46e507 Merge branch 'MDL-39399-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-06 12:13:27 +08:00
Damyon Wiese
80b9793b87 Merge branch 'MDL-39480_badge' of git://github.com/andyjdavis/moodle 2013-05-06 12:00:34 +08:00
Damyon Wiese
516b8c9029 Merge branch 'wip-MDL-38594-master' of git://github.com/marinaglancy/moodle 2013-05-06 11:43:37 +08:00
Frederic Massart
cf4cef7d76 MDL-39484 core: Undefined ostype during installation process 2013-05-06 10:06:09 +08:00
Eloy Lafuente (stronk7)
081bfdc5ff Merge branch 'MDL-39348_master' of git://github.com/dmonllao/moodle 2013-05-06 01:49:51 +02:00
Eloy Lafuente (stronk7)
07c9a6db96 Merge branch 'MDL-38041_master' of git://github.com/dmonllao/moodle 2013-05-06 01:23:49 +02:00
Dan Poltawski
8f9ae1d5e8 Merge branch 'brokencalc' of git://github.com/andyjdavis/moodle 2013-05-05 11:29:11 +01:00
Andrew Davis
36388ba832 MDL-39480 core_badge: prevented a php notice 2013-05-04 11:58:01 +08:00
Mary Evans
3a61956f66 MDL-39364 theme_clean: remove all references to the Simple theme from Clean theme. 2013-05-04 02:34:44 +01:00
Dan Poltawski
1fc7079857 Merge branch 'MDL-39476-master' of git://github.com/damyon/moodle 2013-05-03 16:05:41 +01:00
David Scotson
ed88a6f32a MDL-30130 bootstrapbase: Bring back Quiz answer feedback 2013-05-03 15:47:15 +01:00
David Mudrák
55c6c6f153 MDL-39491 Fix order of Workshop submission text processing 
The order of format_text() and file_rewrite_pluginfile_urls() is
important to make filters work correctly.
 2013-05-03 11:56:44 +02:00
Barbara Ramiro
9c554f7797 MDL-38238 usability: Revised t/lock and t/unlocked icons 2013-05-03 17:11:36 +08:00
Damyon Wiese
e1cd72ec72 Merge branch 'MDL-38714_tmp' of git://github.com/rwijaya/moodle 2013-05-03 15:37:57 +08:00
Damyon Wiese
4a4f590eab MDL-39476 Assign: Cleanup old bad data before adding new index 2013-05-03 14:03:29 +08:00
Marina Glancy
cf230d98a8 MDL-39482 avoid using get_category_or_system_context() because file might not be included 2013-05-03 14:45:23 +10:00
David Monllao
28abad1ab2 MDL-39348 behat: Compatibility with Safari and IE 
Also changing from SeleniumDriver checking
to GoutteDriver as is less probably to change
goutte than to change selenium.
 2013-05-03 10:43:06 +08:00
David Monllao
c59e52f561 MDL-39348 behat: Switching to wait which does not conflict with IE 
Also solving bug with DOM ready, timeout
was set to self::TIMEOUT miliseconds not
seconds.
 2013-05-03 10:16:44 +08:00