mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 08:23:01 +02:00
Code Issues Projects Releases Wiki Activity
79,654 Commits 36 Branches 529 Tags
Commit Graph

79654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
a9b1af901b Merge branch 'MDL-55166-master-blocksettings' of git://github.com/mudrd8mz/moodle 2016-08-03 00:33:58 +02:00
Eloy Lafuente (stronk7)
8c7840df32 Merge branch 'MDL-54941-master' of git://github.com/jleyva/moodle 2016-08-03 00:29:45 +02:00
Eloy Lafuente (stronk7)
dffeff0a4b Merge branch 'MDL-55322-master' of https://github.com/snake/moodle 2016-08-03 00:12:10 +02:00
Eloy Lafuente (stronk7)
5fe1db394b Merge branch 'MDL-54745_master' of https://github.com/snake/moodle 2016-08-02 23:13:25 +02:00
Eloy Lafuente (stronk7)
babfc9886c Merge branch 'MDL-44369_m32v3' of https://github.com/sbourget/moodle 2016-08-02 21:25:24 +02:00
Dan Poltawski
de741b1551 MDL-54847 tests: fix unused var 2016-08-02 20:11:27 +01:00
Dan Poltawski
805f1c8d0b Merge branch 'MDL-54847-master-fix' of git://github.com/cameron1729/moodle 2016-08-02 20:09:45 +01:00
Cameron Ball
c353674f21 MDL-54847 weblib: Test media attributes individually 2016-08-03 02:53:29 +08:00
Eloy Lafuente (stronk7)
f31c65d784 Merge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle 2016-08-02 19:54:00 +02:00
Dan Poltawski
091a1f9290 MDL-55167 npm: add stylelint-checkstyle-formatter 
Useful for automations (like the Moodle prechecker)
 2016-08-02 18:52:41 +01:00
Eloy Lafuente (stronk7)
648bbbbbd0 Merge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle 2016-08-02 18:54:49 +02:00
Eloy Lafuente (stronk7)
e0519d032d Merge branch 'MDL-55314-master' of https://github.com/mrmark/moodle 2016-08-02 17:16:07 +02:00
Eloy Lafuente (stronk7)
8a78cb42da Merge branch 'MDL-55315-master' of https://github.com/mrmark/moodle 2016-08-02 17:07:16 +02:00
Eloy Lafuente (stronk7)
2460f3be57 Merge branch 'MDL-55316-master' of https://github.com/mrmark/moodle 2016-08-02 17:01:46 +02:00
Eloy Lafuente (stronk7)
03961256d1 Merge branch 'MDL-55348-master' of git://github.com/dpalou/moodle 2016-08-02 16:48:26 +02:00
Dan Poltawski
8ea6cc2455 Merge branch 'wip-MDL-33741-master' of git://github.com/marinaglancy/moodle 2016-08-02 12:20:11 +01:00
Dan Poltawski
bf3b8a35d8 Merge branch 'MDL-45734_m32v4' of https://github.com/sbourget/moodle 2016-08-02 12:17:03 +01:00
Dan Poltawski
2961f1075b Merge branch 'MDL-55357_master' of git://github.com/dmonllao/moodle 2016-08-02 10:54:28 +01:00
Dan Poltawski
25054c40e1 Merge branch 'MDL-54847-master' of git://github.com/cameron1729/moodle 2016-08-02 10:54:21 +01:00
Cameron Ball
37c10287be
MDL-54847 MDL-54847 weblib: Support basic HTML media tags 2016-08-02 10:58:48 +08:00
Andrew Nicols
8dc3b7697b Merge branch 'MDL-55355-master' of git://github.com/lameze/moodle 2016-08-02 10:29:30 +08:00
Andrew Nicols
346cf5abb9 Merge branch 'MDL-55352-master-fix' of https://github.com/lameze/moodle 2016-08-02 10:10:38 +08:00
Simey Lameze
30452f23cb MDL-55352 mod_feedback: Change series labels on multi choice rated 2016-08-02 09:23:18 +08:00
Andrew Nicols
b34d7e700b Merge branch 'MDL-54879-master' of git://github.com/junpataleta/moodle 2016-08-02 09:10:19 +08:00
Andrew Nicols
8f33657dae Merge branch 'MDL-55140_m32v2' of https://github.com/sbourget/moodle 2016-08-02 08:48:36 +08:00
Dan Poltawski
6349765c44 Merge branch 'MDL-55360-master-workshopgradepass' of git://github.com/mudrd8mz/moodle 2016-08-01 18:57:00 +01:00
Dan Poltawski
4638a26eca MDL-55376 assign: trailing whitespace 2016-08-01 16:07:43 +01:00
Dan Poltawski
b9fe2f38d4 Merge branch 'MDL-55376-master' of git://github.com/cameron1729/moodle 2016-08-01 16:07:00 +01:00
Dan Poltawski
65a427cc64 Merge branch 'MDL-55367-master' of git://github.com/lameze/moodle 2016-08-01 14:25:38 +01:00
Dan Poltawski
066e31fd74 Merge branch 'MDL-55323-master' of git://github.com/junpataleta/moodle 2016-08-01 13:58:20 +01:00
Dan Poltawski
307e63cb00 Merge branch 'MDL-55374-master' of git://github.com/damyon/moodle 2016-08-01 13:50:37 +01:00
Dan Poltawski
a5cb07477c Merge branch 'MDL-55352-master' of git://github.com/lameze/moodle 2016-08-01 09:30:33 +01:00
Andrew Nicols
1a1771b944 Merge branch 'MDL-53152-master' of git://github.com/junpataleta/moodle 2016-08-01 15:04:17 +08:00
Jun Pataleta
259bf04f8a MDL-53152 theme: Add parentheses to variable calculations 2016-08-01 13:40:38 +08:00
Simey Lameze
c5a90a4a5d MDL-55367 report_log: Prevent invalid time to be passed to Charts API 2016-08-01 12:57:57 +08:00
Jake Dallimore
0cced3ced3 MDL-54745 mod_assign: Remove leftover changegradewarning string and js 2016-08-01 12:48:25 +08:00
Andrew Nicols
5ee6125591 Merge branch 'MDL-55266-master' of git://github.com/jleyva/moodle 2016-08-01 10:49:15 +08:00
Andrew Nicols
f00d967b43 Merge branch 'MDL-50286_m32v3' of https://github.com/sbourget/moodle 2016-08-01 09:54:06 +08:00
Stephen Bourget
3dee255163 MDL-50286 report_log: Allow filtering by event origin. 2016-07-31 21:45:27 -04:00
Jake Dallimore
243ddbcf50 MDL-55322 assignfeedback_editpdf: Prevent scroll when moving comments 
Prevent the default scroll behaviour when using gestures to move
comments on the mobile site.
 2016-08-01 09:43:03 +08:00
Simey Lameze
2356c4f6f2 MDL-55355 core: Change chart link text when status change 2016-08-01 09:13:59 +08:00
Marina Glancy
07d4777816 MDL-33741 file_info: show courses in hidden categories 
This also has a couple of bugfixes:
- file_info_context_system::get_children() was looking for courses with parent=0, it is impossible, block removed;
- file_info_context_coursecat::get_area_coursecat_description() was checking the wrong capability to view files in description
 2016-08-01 09:12:36 +08:00
Marina Glancy
b195a5b331 MDL-33741 file_info: check capability when serving file in coursecat description 2016-08-01 09:12:18 +08:00
Andrew Nicols
78c19679d6 Merge branch 'MDL-55289-master-exsubmission' of git://github.com/mudrd8mz/moodle 2016-08-01 08:46:54 +08:00
Dan Poltawski
b4fe4e25b2 MDL-55167 stylelint: disable some rules in grunt 
These will be fixed in a later issue
 2016-07-30 13:07:54 +01:00
Dan Poltawski
3bd777652e MDL-55167 less: Add some stylelint exceptions to deal with later 
1) Use of REM units in course.less
2) CSS hacks (MDL-55142)
 2016-07-30 13:07:54 +01:00
Dan Poltawski
16fed4663b MDL-55167 less: fix line over length 2016-07-30 13:07:54 +01:00
Dan Poltawski
c73de4d5f1 MDL-55167 less: remove empty blocks 2016-07-30 13:07:54 +01:00
Dan Poltawski
75b68df3ee MDL-55167 less: reformat one line statemets into multiple lines 2016-07-30 13:07:53 +01:00
Dan Poltawski
c2d3fe21ef MDL-55167 less: add missing linebreak seperators 
Detected by
http://stylelint.io/user-guide/rules/at-rule-empty-line-before/
 2016-07-30 13:07:53 +01:00