mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 02:22:51 +01:00
Code Issues Projects Releases Wiki Activity
74,224 Commits 36 Branches 527 Tags
Commit Graph

74224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
87aadca845 Merge branch 'MDL-51057-M30' of git://github.com/lazydaisy/moodle 2015-08-17 09:53:21 +08:00
David Monllao
068f1fce33 Merge branch 'MDL-51077-master' of git://github.com/sammarshallou/moodle 2015-08-17 09:44:53 +08:00
David Monllao
5e8a03b429 Merge branch 'MDL-51088-master' of git://github.com/andrewnicols/moodle 2015-08-17 09:24:55 +08:00
David Monllao
81c81527cb Merge branch 'wip-mdl-51106' of git://github.com/rajeshtaneja/moodle 2015-08-17 09:01:45 +08:00
David Monllao
fd76204a8b Merge branch 'MDL-51100-master' of git://github.com/andrewnicols/moodle 2015-08-17 08:50:49 +08:00
Daniel Thies
2f62ae82a1 MDL-46387 editor_atto: Add behat test for sub/sup 2015-08-16 15:10:02 -05:00
sam marshall
89a73b0815 MDL-51077 Availability: Date restriction unit test static not cleared 2015-08-14 10:51:29 +01:00
John Okely
5e9a937bba MDL-49891 theme_bootstrapbase: Add meta data description to frontpage 2015-08-14 16:49:55 +08:00
Frederic Massart
e36b5c0030 MDL-50127 mod_data: RTL styles for the required image 2015-08-14 16:46:58 +08:00
John Okely
c07c5e7bdd MDL-50127 mod_data: Fix required icons in add entry screen 2015-08-14 16:46:58 +08:00
Andrew Nicols
97b1a48204 MDL-47449 completion: Ignore timemodified when comparing 2015-08-14 10:53:20 +08:00
Andrew Nicols
504c97925c MDL-47449 phpunit: Add comparitor for isEqual with exceptions 
We often do isEqual tests but where a field, may have a single exception.
Ordinarily we can handle this easily by breaking the test down, but when
dealing with mocked objects we can only pass an instance of a
PHPUnit_Framework_Constraint, or a single value (which is cast to an
instance of PHPUnit_Framework_Constraint_IsEqual).

To deal with instances of time-based exception, we need to be able to
compare simple objects and classes where one or two values may be
different.
 2015-08-14 10:53:19 +08:00
Andrew Nicols
d78613701c MDL-49841 testing: Correct composer incantation 2015-08-14 10:27:53 +08:00
Jun Pataleta
0c4c3b9aed MDL-44828 filelib: Fix open error for force-downloaded files in mobile 
Allow guessing of file's MIME type by default. Fallback to
application/octet-stream if MIME type cannot be determined.
 2015-08-14 09:54:20 +08:00
Rajesh Taneja
369729cfda MDL-51100 behat: Remove javascript tag from usermenu steps 2015-08-14 08:53:03 +08:00
Andrew Nicols
711b1d6b3e MDL-51100 behat: Remove javascript tag from usermenu steps 
These tests only needed the javascript tag because of the user menu.
Now that issue has been resolved, they do not need it.

Note: Some were also not using the singleselect feature, so would fail
without changes to use this too as they were not handling proper selection
of the singleselect element.
 2015-08-14 08:52:29 +08:00
Andrew Nicols
2e782e5142 MDL-51088 mod_forum: Improve mod_forum behat performance 2015-08-14 07:58:13 +08:00
Andrew Nicols
4569c6966a MDL-51088 completion: Do not require hover to confirm xpath 2015-08-14 07:58:13 +08:00
lazydaisy
054a565806 MDL-50990 theme_base: Fixed errors in CSS mark-up in style/blocks.css 2015-08-14 00:35:04 +01:00
lazydaisy
66cd0e6980 MDL-51057 theme_base: RTL fix adds missing padding to block header h2. 2015-08-14 00:34:05 +01:00
Daniel Thies
dc9ca4acea MDL-46387 editor-atto: Toggle sub/sup tags using rangy 
In order to have a consistant browser behavior and prevent nesting of
subscripts and superscripts, tags are converted to CSS classes and then
the CSS classes in the selection are toggeled using the rangy crossbrowser
selection library already included in Atto without using an execCommand.
 2015-08-13 15:46:29 -05:00
Alistair Spark
8b40604ab9 MDL-50391 format_singleactivity: fix LTI Tool opens in existing window 2015-08-13 14:13:02 +01:00
Marina Glancy
3bacf558d1 MDL-50391 format_singleactivity: fix activity_has_subtypes() 2015-08-13 14:13:02 +01:00
Dan Poltawski
5f92c736e3 MDL-51110 badges: prevent duplicate award of badges 
Previously duplicate users could be returned when they had
done duplicate badge criteria - this would lead to a duplicate
constraint being hit as they were attempted to be awarded twice.
 2015-08-13 13:21:03 +01:00
Eloy Lafuente (stronk7)
dda862abb5 weekly release 3.0dev 2015-08-13 12:16:31 +02:00
Eloy Lafuente (stronk7)
2e446e9443 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-08-13 12:16:24 +02:00
Andrew Nicols
d245f6757d MDL-51102 behat: Add a non-JS version of wait 2015-08-13 15:56:22 +08:00
Rajesh Taneja
3d3d2ae529 MDL-51106 behat: Fixed misuse of javascript tag 2015-08-13 13:23:15 +08:00
Andrew Nicols
ff89d94a6f MDL-51100 behat: Remove javascript tag where not required 
These tests only needed the javascript tag because of the user menu.
Now that issue has been resolved, they do not need it.

Note: Some were also not using the singleselect feature, so would fail
without changes to use this too as they were not handling proper selection
of the singleselect element.
 2015-08-13 13:12:28 +08:00
Marina Glancy
1165cab2b3 MDL-51095 enrol_meta: add missing include 
Thanks to Shaun Meyer for providing a patch
 2015-08-13 12:29:24 +08:00
Marina Glancy
a039418383 MDL-50303 cache: removed unused cache definition 2015-08-13 11:56:53 +08:00
Andrew Nicols
317fd6fe56 MDL-51100 behat: Correct javascript requirement of user menu step 2015-08-13 08:35:17 +08:00
Eloy Lafuente (stronk7)
28a614a83f Merge branch 'MDL-50371' of https://github.com/danielneis/moodle 2015-08-13 00:38:41 +02:00
AMOS bot
0cbc507b6d Automatically generated installer lang files 2015-08-13 00:04:21 +08:00
AMOS bot
61331bd1ee Automatically generated installer lang files 2015-08-13 00:04:21 +08:00
David Monllao
01fdb048cf Merge branch 'MDL-46860-master' of git://github.com/ryanwyllie/moodle 2015-08-12 10:45:29 +08:00
David Monllao
6413794018 Merge branch 'MDL-37864-master' of git://github.com/xow/moodle 2015-08-12 09:35:46 +08:00
David Monllao
819ab257f7 Merge branch 'MDL-46321-master' of git://github.com/tonyjbutler/moodle 2015-08-12 08:49:14 +08:00
David Monllao
c68b32067e MDL-50839 user: realuseravatar should also read avatarsize 2015-08-12 08:39:07 +08:00
David Monllao
f2e50523d1 Merge branch 'MDL-50839-master' of git://github.com/Dave-B/moodle 2015-08-12 08:32:11 +08:00
David Monllao
3718d2cd17 Merge branch 'MDL-50947_master' of git://github.com/moodlerooms/moodle 2015-08-12 08:30:03 +08:00
David Monllao
fb41850a3c Merge branch 'MDL-50720' of git://github.com/bostelm/moodle 2015-08-12 08:27:09 +08:00
David Monllao
ede96605ac Merge branch 'MDL-51053-master' of git://github.com/sammarshallou/moodle 2015-08-12 08:23:29 +08:00
Eloy Lafuente (stronk7)
20c50b0d5c Merge branch 'MDL-50062-master' of git://github.com/FMCorz/moodle 2015-08-12 01:52:04 +02:00
Eloy Lafuente (stronk7)
4da133199f Merge branch 'MDL-50430' of https://github.com/danielneis/moodle 2015-08-12 00:48:07 +02:00
Eloy Lafuente (stronk7)
1dce5c99c8 Merge branch 'MDL-50446-master' of git://github.com/ryanwyllie/moodle 2015-08-12 00:11:42 +02:00
Eloy Lafuente (stronk7)
b7759a1889 Merge branch 'MDL-50307-master-3' of git://github.com/xow/moodle 2015-08-11 23:44:50 +02:00
Eloy Lafuente (stronk7)
789d40a803 Merge branch 'MDL-49293-master' of git://github.com/andrewnicols/moodle 2015-08-11 22:58:09 +02:00
Eloy Lafuente (stronk7)
30deee105c Merge branch 'MDL-50642' of https://github.com/ecampbell/moodle 2015-08-11 22:32:11 +02:00
Sam Chaffee
5222ab7f4b MDL-50947 mod_lti Add removed grade.php to upgrade_stale_php_files_present 2015-08-11 10:42:08 -06:00