mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
74,207 Commits 36 Branches 523 Tags
Commit Graph

74207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
5d60665bef Merge branch 'MDL-46078-master' of git://github.com/damyon/moodle 2015-08-19 18:30:36 +02:00
Barry Oosthuizen
4f0c8f307a MDL-41944 block_onlines_users: Add unit tests 2015-08-19 18:30:36 +02:00
Barry Oosthuizen
0964aa33cf MDL-41944 block_onlines_users: Improve performance 2015-08-19 18:30:35 +02:00
Dan Poltawski
d34af71782 Merge branch 'wip-MDL-49746-master' of git://github.com/marinaglancy/moodle 2015-08-19 18:30:34 +02:00
Dan Poltawski
a9334960dd Merge branch 'wip-MDL-30315-master' of git://github.com/abgreeve/moodle 2015-08-19 18:30:33 +02:00
Eloy Lafuente (stronk7)
839b8c3905 Merge branch 'MDL-47449-master' of git://github.com/andrewnicols/moodle 2015-08-19 18:30:33 +02:00
Dan Poltawski
215c5cf5c2 MDL-46387 shifter: missing built changes 2015-08-19 18:30:32 +02:00
Dan Poltawski
bf4253d772 Merge branch 'MDL-46387-master' of https://github.com/dthies/moodle 2015-08-19 18:30:31 +02:00
Dan Poltawski
b1da1e289b Merge branch 'MDL-49841-master' of git://github.com/andrewnicols/moodle 2015-08-19 18:30:31 +02:00
Dan Poltawski
2bd33cfdb0 Merge branch 'MDL-50127-master-squashed' of git://github.com/xow/moodle 2015-08-19 18:30:30 +02:00
Dan Poltawski
c47a48d8f5 Merge branch 'MDL-33365-master-3' of git://github.com/andrewnicols/moodle 2015-08-19 18:30:29 +02:00
Dan Poltawski
cfd9279f3d Merge branch 'MDL-46167-master' of https://github.com/mackensen/moodle 2015-08-19 18:30:28 +02:00
David Monllao
d2999f8085 Merge branch 'MDL-50391-master' of git://github.com/aspark21/moodle 2015-08-19 18:30:28 +02:00
David Monllao
edd6e9ebe2 Merge branch 'MDL-51102-master' of git://github.com/andrewnicols/moodle 2015-08-19 18:30:27 +02:00
Adrian Greeve
9b272cc069 MDL-30315 grades: Fix up function doc block. 
This was annoying me no end so here is a commit
to set it right.
 2015-08-18 17:02:46 +08:00
Adrian Greeve
a9ef9c5e82 MDL-30315 grades: Unit tests for grade import. 2015-08-18 17:02:46 +08:00
Adrian Greeve
0305798c62 MDL-30315 gradebook: Uploading feedback doesn't override grades. 2015-08-18 17:02:45 +08:00
Andrew Nicols
2300a312a4 MDL-33365 core: Move JS output to body 
It turns out that, after all these years, we've been doing it wrong.
The YUI Loader should be loaded at the top of the body, not in the head.

Having it in the head means that the body has not yet loaded, and we see
a number of minor issues for scripts which happen very early in the load
process. One of these is the creation of invalid HTML from the YUI loader
because it is not able to insert in the body as it has not yet been
created.

To be safe, we must move all JS to the same point (because of unknown
dependencies between them). These should be placed as early in the body as
possible.

We also change the way in which the legacy YUI css modules are loaded.
 2015-08-18 15:48:55 +08:00
Marina Glancy
97b1867f0f MDL-50683 user: add default choice 2015-08-18 10:01:11 +08:00
David Monllao
ff5b060c37 Merge branch 'MDL-50990_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/base/style/blocks.css
 2015-08-18 09:47:38 +08:00
Dan Poltawski
0568684bfd Merge branch 'MDL-49891-master-2' of git://github.com/xow/moodle 2015-08-17 15:17:11 +01:00
Dan Poltawski
cfeadc66b0 Merge branch 'MDL-49280-m' of https://github.com/micaherne/moodle 2015-08-17 15:03:59 +01:00
Dan Poltawski
c7d17be417 Merge branch 'MDL-44828-master' of git://github.com/junpataleta/moodle 2015-08-17 14:24:57 +01:00
Dan Poltawski
edc3889618 Merge branch 'MDL-42634-master' of git://github.com/andrewnicols/moodle 2015-08-17 11:44:57 +01:00
David Monllao
2394cf72d6 Merge branch 'wip-MDL-50303-master' of git://github.com/marinaglancy/moodle 2015-08-17 15:06:15 +08:00
David Monllao
f3e77a5ea5 Merge branch 'wip-MDL-50962-master' of git://github.com/abgreeve/moodle 2015-08-17 14:56:14 +08:00
David Monllao
6df0e78849 Merge branch 'MDL-51016-m' of git://github.com/micaherne/moodle 2015-08-17 14:21:00 +08:00
David Monllao
78af7dae54 Merge branch 'MDL-50637' of git://github.com/sk-unikent/moodle 2015-08-17 13:56:18 +08:00
David Monllao
c05c91d0d4 Merge branch 'wip-MDL-51095-master' of git://github.com/marinaglancy/moodle 2015-08-17 12:06:47 +08:00
David Monllao
34e0377fc6 Merge branch 'wip-MDL-50881-master' of git://github.com/marinaglancy/moodle 2015-08-17 12:03:23 +08:00
David Monllao
889a0c840a Merge branch 'MDL-50911_master' of git://github.com/StudiUM/moodle 2015-08-17 11:58:28 +08:00
David Monllao
7d8edf67ae Merge branch 'wip-MDL-50932-master' of git://github.com/marinaglancy/moodle 2015-08-17 11:43:42 +08:00
Bruce Silver
edd99023a6 MDL-50962 user: Profile fields display properly 
The department and idnumber fields were not displaying
properly on the user profile pages.
 2015-08-17 10:33:05 +08:00
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