mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-24 09:55:33 +02:00
Code Issues Projects Releases Wiki Activity
74,317 Commits 37 Branches 536 Tags
Commit Graph

74317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
c8d19ebea0 MDL-50690 themes: fix commenting coding style 
(See also CONTRIB-5891)
 2015-09-01 21:11:11 +01:00
Dan Poltawski
20706d0fea Merge branch 'wip_MDL-50690_master' of git://github.com/gjb2048/moodle 2015-09-01 20:59:58 +01:00
Dan Poltawski
75ac8bac26 Merge branch 'MDL-49950_duplicate_string' of https://github.com/andyjdavis/moodle 2015-09-01 16:20:34 +01:00
Dan Poltawski
d1d7d9fd74 Merge branch 'MDL-51236-master' of git://github.com/andrewnicols/moodle 2015-09-01 15:18:31 +01:00
Dan Poltawski
7d8684c552 MDL-38763 fix trailing whitespace 2015-09-01 12:43:23 +01:00
Dan Poltawski
3e5bcbf851 Merge branch 'MDL-38763-master-amd' of git://github.com/mastnym/moodle 2015-09-01 12:17:05 +01:00
David Monllao
85a930f628 Merge branch 'MDL-51234-master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2015-09-01 18:33:40 +08:00
David Monllao
1652309d02 Merge branch 'MDL-51109-master' of git://github.com/danpoltawski/moodle 2015-09-01 18:31:26 +08:00
Dan Poltawski
a6e9c23016 MDL-51109 task: more debug info for failed scheduled tasks 2015-09-01 10:59:55 +01:00
Dan Poltawski
cd7b48a2e7 Merge branch 'wip-MDL-25451-master' of git://github.com/marinaglancy/moodle 2015-09-01 10:36:17 +01:00
Dan Poltawski
522c7fd350 Merge branch 'MDL-45841' of git://github.com/timhunt/moodle 2015-09-01 10:14:45 +01:00
David Monllao
1780c76493 Merge branch 'wip-mdl-50963' of git://github.com/rajeshtaneja/moodle 2015-09-01 16:06:14 +08:00
David Monllao
05e4b8760a MDL-51179 editor_atto: Updating since tag to only 3.0 
This commit should be reverted if we finally backport this solution.
 2015-09-01 16:00:32 +08:00
David Monllao
9f6a55f7ea Merge branch 'MDL-51179-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/upgrade.txt
 2015-09-01 15:57:21 +08:00
rajesh Taneja
a9c9ae52e5 MDL-50963 behat: fixed error string in behat 2015-09-01 14:48:11 +08:00
David Monllao
eb41f5539e Merge branch 'MDL-50999-master' of git://github.com/andrewnicols/moodle 2015-09-01 14:35:18 +08:00
Martin Mastny
2493568970 MDL-38763 core_role: AMD module for managing permissions 2015-09-01 07:31:58 +02:00
David Monllao
45cd3f6033 MDL-51013 themes: Info about new navbar_button function 2015-09-01 12:35:31 +08:00
Kevin Wiliarty
77241abbad MDL-51013 themes: Suppress navbar button when custom menu is empty 2015-09-01 12:35:24 +08:00
Damyon Wiese
988592c556 MDL-51179 Atto: Extend autosave fix to cover text changes 
Added new functions to editor api - set/get_text so the
original form text can be determined from an editor.

When calling use_editor() you should first call set_text() with
the text that will be inserted in the form element.

There is also a new scheduled task for cleaning Atto autosave drafts.
 2015-09-01 12:23:00 +08:00
Eloy Lafuente (stronk7)
0df465d10a Merge branch 'wip-MDL-50791-master' of git://github.com/marinaglancy/moodle 2015-09-01 01:52:10 +02:00
Eloy Lafuente (stronk7)
c5f05ff551 Merge branch 'mdl-50963' of https://github.com/cdsmith-umn/moodle 2015-09-01 01:42:06 +02:00
Eloy Lafuente (stronk7)
07db0bbd8f Merge branch 'MDL-49536-master' of git://github.com/ryanwyllie/moodle 2015-08-31 20:48:18 +02:00
Eloy Lafuente (stronk7)
315918f187 Merge branch 'MDL-50677-master' of git://github.com/FMCorz/moodle 2015-08-31 20:31:26 +02:00
Marina Glancy
7a4ff165cb MDL-25451 roles: check if user can assign foles in block 2015-08-31 16:03:27 +08:00
David Monllao
d0efe9a080 Merge branch 'MDL-51131-master' of git://github.com/marinaglancy/moodle 2015-08-31 14:07:49 +08:00
David Monllao
5d98022e81 Merge branch 'MDL-51084-master' of git://github.com/marinaglancy/moodle 2015-08-31 12:54:49 +08:00
David Monllao
5e567834dd Merge branch 'MDL-51181-m' of git://github.com/micaherne/moodle 2015-08-31 10:55:08 +08:00
David Monllao
abbf64e363 Merge branch 'MDL-51215-master' of git://github.com/marinaglancy/moodle 2015-08-31 10:45:19 +08:00
lazydaisy
37cbded0c3 MDL-51234 theme_bootstrapbase: hover hardly visible on invert/collapse 2015-08-30 19:59:28 +01:00
Kevin Wiliarty
f75afe9b90 MDL-51229 theme: display docked block on top of fixed navbar 2015-08-30 09:37:44 -04:00
Marina Glancy
bdead9b5c7 MDL-51084 tool_customlang: return to the same page after submit 2015-08-28 16:20:03 +08:00
Dan Poltawski
e28004e614 weekly release 3.0dev 2015-08-28 07:38:07 +01:00
Andrew Nicols
4463f996c4 MDL-51236 phpunit: Prevent testsuite name conflicts 
The testsuite name is fed straight into a class_exists() in
PHPUnit_Framework_TestSuite. In some cases, e.g. cachestore_static, the
class does exist, it's then fed into a ReflectionClass, and the test fails.

The testsuite needs to not conflict with any classes which could be
autoloaded in Moodle core.
 2015-08-28 14:22:07 +08:00
Damyon Wiese
6f0dfdd969 MDL-51179 Atto: Add a behat test for autosave 2015-08-28 12:09:34 +08:00
Ryan Wyllie
6ceea3fe12 MDL-49536 theme_clean: logo only on front and login 
The logo for the clean and more themes will only be
displayed on the front page and login page as it was
replacing the header information on other pages within
Moodle, causing users to lose information on the page.
 2015-08-28 02:42:30 +00:00
Gareth J Barnard
01410430e7 MDL-50690 themes: Theme cache SVG images are not created. 2015-08-27 15:35:23 +01:00
Dan Poltawski
4ae71e93a8 MDL-49826 grade: hide singleview links when no permissions 
Singleview only supports grade editors not viewers at this time.
 2015-08-27 13:16:44 +02:00
Eloy Lafuente (stronk7)
1b5034025b Merge branch 'MDL-51148-master-enfix' of git://github.com/mudrd8mz/moodle 2015-08-27 12:46:11 +02:00
Frederic Massart
2b7848050d MDL-50677 user: Prefix custom fields node name in profile tree 2015-08-27 17:28:02 +08:00
Marina Glancy
efbd56960c MDL-51215 course: redirect to manage appropriate category 2015-08-27 11:13:06 +08:00
David Mudrák
f729af1609 MDL-51148 tool_langimport: Use the amended string in Behat test 2015-08-26 17:03:36 +02:00
Helen Foster
ce2c0f3a74 MDL-51148 lang: Merge English strings from the en_fix language pack 2015-08-26 16:46:43 +02:00
Damyon Wiese
572e00928a MDL-51179 Atto: When a resume is aborted - create a fresh draft for future saves. 2015-08-26 14:15:53 +08:00
David Monllao
6ddfb278d2 Merge branch 'wip_MDL-50869_master' of git://github.com/gjb2048/moodle 2015-08-26 09:44:21 +08:00
Marina Glancy
55a8e86807 MDL-50923 themes: content-only class added before region-only 2015-08-26 03:40:37 +02:00
Andrew Davis
d1cb06fb1b MDL-49950 removed a duplicate string definition 2015-08-26 05:40:31 +08:00
Eloy Lafuente (stronk7)
4738193225 Merge branch 'wip-MDL-50923-master' of git://github.com/marinaglancy/moodle 2015-08-25 11:34:33 +02:00
Dan Poltawski
f1352da1ba Merge branch 'wip-MDL-27177-master' of git://github.com/abgreeve/moodle 2015-08-25 09:55:00 +01:00
Damyon Wiese
2e96b001c4 MDL-51179 Atto: Abort autosave if there are more recent changes to the files 
If the files in the draft area have been modified more recently than the timestamp
of the draft - do not restore the files, or you will delete any newer files. We
cannot really guess here - merging the 2 lists of files will be wrong.
 2015-08-25 16:09:57 +08:00