mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 15:40:17 +01:00
Code Issues Projects Releases Wiki Activity
74,247 Commits 36 Branches 527 Tags
Commit Graph

74247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
bcf9c54c20 Merge branch 'MDL-50714-master' of git://github.com/andrewnicols/moodle 2015-08-25 00:06:01 +02:00
Dan Poltawski
ee9b9ffd51 Merge branch 'MDL-49701' of git://github.com/jmvedrine/moodle 2015-08-24 15:14:15 +01:00
Dan Poltawski
eee9e47d28 MDL-50723 upgrade.txt: Note dropped unused table 
Just in case..
 2015-08-24 14:52:26 +01:00
Dan Poltawski
482ebc1786 Merge branch 'MDL-50723-master' of git://github.com/andrewnicols/moodle 2015-08-24 14:47:25 +01:00
Dan Poltawski
030806a4ba Merge branch 'MDL-40179-master' of git://github.com/lameze/moodle 2015-08-24 13:40:15 +01:00
Dan Poltawski
fcd8119eda Merge branch 'wip-MDL-27859-master' of https://github.com/marinaglancy/moodle 2015-08-24 10:55:03 +01:00
Dan Poltawski
7ee1695850 Merge branch 'MDL-49826_grade_single_view' of git://github.com/davosmith/moodle 2015-08-24 10:39:06 +01:00
Dan Poltawski
4d9845426e Merge branch 'MDL-47450-master' of git://github.com/FMCorz/moodle 2015-08-24 10:25:32 +01:00
David Monllao
1e5b562ac9 Merge branch 'MDL-50958-master' of git://github.com/lameze/moodle 2015-08-24 15:40:10 +08:00
David Monllao
259bd67ce9 Merge branch 'MDL-51184-master' of git://github.com/marinaglancy/moodle 2015-08-24 15:29:58 +08:00
Marina Glancy
ba2ad4316e MDL-51184 themes: correctly check $CFG->svgicons 
Thanks to Ralf Wiederhold for pointing out the bug
 2015-08-24 11:06:24 +08:00
Damyon Wiese
e0d08bfa5d MDL-51116 Mustache: Caching issue exists with mustache templates 
The first ajax load fetches the template and puts it in localstorage + a js var

The second load gets it from local storage, but does not put it in the js var.

The pix_icon helper expects it to be in the js var always.
 2015-08-24 10:50:40 +08:00
Bruce Silver
88a26baec0 MDL-50958 block_messages: declare missing stdClass object 2015-08-24 10:47:24 +08:00
David Monllao
8d2a44b554 Merge branch 'wip-MDL-51087-master' of git://github.com/marinaglancy/moodle 2015-08-24 10:18:14 +08:00
Marina Glancy
46f708ea17 MDL-27859 tags: unit test for tag cleanup 2015-08-21 21:14:10 +08:00
Marina Glancy
a196f37088 MDL-27859 tags: unit test for correlated tags 2015-08-21 21:14:06 +08:00
Andrew Nicols
bff7570e87 MDL-50714 mod_forum: Add tests for all groupmodes 2015-08-21 08:19:29 +08:00
Andrew Nicols
344e126378 MDL-50714 mod_forum: Correct use of movedicussions cap when posting 
The ability to view the group dropdown was too closely related to the
movediscussions capability when posting, or editing a forum post.

The movedicussions capability should only be considered for some parts of
this logic. Users should be able to select the group to post to when
writing message, as long as they have access to that group.
 2015-08-21 08:18:46 +08:00
Davo Smith
4021aa45ce MDL-49826 gradereport_singleview: fix permission check 
Users with capability 'moodle/grade:edit' should be able to edit grade values
- 'moodle/grade:manage' is not needed, as grade items are not being changed.
 2015-08-20 14:55:56 +01:00
Dan Poltawski
6d392b3027 weekly release 3.0dev 2015-08-20 14:24:28 +01:00
David Monllao
cf9fe42f6e Merge branch 'wip-mdl-42634' of git://github.com/rajeshtaneja/moodle 2015-08-20 15:41:07 +08:00
Andrew Nicols
9ed97f19ad Merge branch 'MDL-50801_master-unexisting-caption' of git://github.com/dmonllao/moodle 2015-08-20 15:37:13 +08:00
David Monllao
bcd58d9ff7 MDL-50801 atto_table: Caption node might not be present 
Users may not use atto table (which always adds a caption) to set
HTML tables, this patch addresses that case.
 2015-08-20 15:25:44 +08:00
Andrew Nicols
cf86d4f5bc MDL-42634 theme: Increase margin on activity instance to not cover controls 2015-08-20 15:18:14 +08:00
David Monllao
9502083292 MDL-49280 auth: Rewording duplicate emails setting 
From allowuserstoshareemailaddresses to allowaccountssameemail, also
changing lang strings.
 2015-08-20 12:56:11 +08:00
Damyon Wiese
85fa6a9305 MDL-50150 Mustache: Update to 2.9.0 version of mustache.php 
And enable the BLOCKS pragma (we need it for reusable templates).
 2015-08-20 11:44:56 +08:00
Damyon Wiese
841e689a1c MDL-50150 Mustache: Add "BLOCKS" feature to javascript mustache engine. 
Pull request: https://github.com/janl/mustache.js/pull/473
 2015-08-20 11:44:49 +08:00
David Monllao
3ac1350598 Merge branch 'MDL-50880-master' of git://github.com/marinaglancy/moodle 2015-08-20 10:31:20 +08:00
David Monllao
7046798f56 MDL-50391 mod_lti: Fixing indentation 2015-08-20 09:49:22 +08:00
Eloy Lafuente (stronk7)
05f97c615c Merge branch 'MDL-50801_master' of git://github.com/dmonllao/moodle 2015-08-19 19:14:00 +02:00
Andrew Nicols
933183e52a MDL-42634 theme: Increase margin on sectionname to not cover controls 2015-08-19 18:30:38 +02:00
Eloy Lafuente (stronk7)
edd94e24b0 Merge branch 'MDL-49085_master' of git://github.com/dmonllao/moodle 2015-08-19 18:30:37 +02:00
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
Marina Glancy
40e501284c MDL-50880 message: correctly compare with empty string 
Thanks to David Herney Bernal for providing a fix
 2015-08-19 16:01:42 +08:00
Simey Lameze
e450eb32d9 MDL-40179 auth_cas: change is_proxybypass parameter to use server url 2015-08-19 10:43:03 +08:00
David Monllao
556decf159 MDL-50801 atto_table: Allow caption position to be set 2015-08-19 09:02:45 +08: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