Commit graph

66038 commits

Author SHA1 Message Date
Tim Lock
579f849928 MDL-33971: When viewing course log entries for Quiz View Summary a number is displayed not the quiz name 2013-11-27 08:14:40 +10:30
Eloy Lafuente (stronk7)
51e9d69af2 Merge branch 'master_MDL-43045' of git://github.com/totara/moodle 2013-11-26 21:27:35 +01:00
Ruslan Kabalin
749700e4a7 MDL-43071 assign: Fix offline grades import for scale grading. 2013-11-26 16:36:37 +00:00
Damyon Wiese
e359857e41 Merge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle 2013-11-26 16:56:20 +08:00
Adrian Greeve
b404b1f41c MDL-43008 calendar: Allow calendar plugins to display setting pages. 2013-11-26 15:44:57 +08:00
Mark Nelson
bb32a499e1 MDL-42932 core_calendar: introduced calendar type system setting 2013-11-25 23:11:17 -08:00
Dan Poltawski
bb29677965 Merge branch 'MDL-43000' of git://github.com/timhunt/moodle 2013-11-26 15:05:42 +08:00
Dan Poltawski
2bc34d6528 Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle 2013-11-26 14:52:21 +08:00
Dan Poltawski
fb9c770d8d Merge branch 'MDL-42851' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-26 14:48:21 +08:00
Damyon Wiese
3a5c3b3cbf MDL-42919 Assign: Remove no-label form hacks 2013-11-26 13:30:36 +08:00
Damyon Wiese
4d4b345392 MDL-42919 Question: Remove   from empty labels
This allows the form elements with empty labels to "fold" properly.
2013-11-26 13:30:36 +08:00
Damyon Wiese
e6b1d132cb MDL-41919 Forms: Add a class to form elements with an empty label
This means they can be styled properly when the form is folded with
the labels above the form fields.
2013-11-26 13:28:51 +08:00
Dan Poltawski
6ac888c5f2 Merge branch 'wip-MDL-43006-master' of git://github.com/marinaglancy/moodle 2013-11-26 13:24:02 +08:00
David Monllao
39386f271f MDL-42738 behat: Updating composer.json to point to the new moodle-behat-extension master 2013-11-26 12:49:33 +08:00
rwijaya
e94d023225 MDL-42918: fixed fullscreen width for multichoice answers editor 2013-11-26 12:21:51 +08:00
Dan Poltawski
c9ed9e5662 Merge branch 'MDL-42733_master' of git://github.com/dmonllao/moodle 2013-11-26 12:09:45 +08:00
David Monllao
5df9e40cec MDL-40741 behat: Changing xpaths for clean theme
Keeps compatibility with standard theme.
2013-11-26 11:41:13 +08:00
Jerome Mouneyrac
2a974bb79c MDL-42969 Main Menu Block loses ability to move resource or activity up or down (add back exact same behavior than in 2.5) 2013-11-26 11:38:56 +08:00
Marina Glancy
4fd2a16e35 MDL-40191 navigation: do not throw an error if activity is not visible
navigationlib is not the place to check it, let the page itself decide what to do in this case
2013-11-26 13:54:19 +11:00
Damyon Wiese
46b9d1bec6 Merge branch 'master-mdl42998' of https://github.com/tlock/moodle 2013-11-26 10:49:32 +08:00
David Monllao
e2d7379682 MDL-42842 behat: Adding a new formatter
Based on ProgressFormatter, the site info
will be displayed when the suite begins.
2013-11-26 10:48:58 +08:00
David Monllao
7514c2f282 MDL-42842 testing: Generalization of the site info 2013-11-26 10:48:29 +08:00
Dan Poltawski
01db5af468 Merge branch 'MDL-43050_master' of git://github.com/dmonllao/moodle 2013-11-26 10:42:04 +08:00
David Monllao
d949882691 MDL-43050 behat: Fixing moodlehq/behat-extension version 2013-11-26 10:36:08 +08:00
Dan Poltawski
4bf3517bc7 Merge branch 'wip-mdl-41635' of git://github.com/rajeshtaneja/moodle 2013-11-26 10:24:59 +08:00
Damyon Wiese
18962add08 Merge branch 'wip-MDL-40850-master' of git://github.com/marinaglancy/moodle 2013-11-26 09:29:44 +08:00
Sam Hemelryk
f9cb086dfc Merge branch 'MDL-43005-master' of git://github.com/ankitagarwal/moodle 2013-11-26 08:42:25 +13:00
Sam Hemelryk
657b29e7bc Merge branch 'MDL-43037_master' of https://github.com/markn86/moodle 2013-11-26 08:36:36 +13:00
Simon Coggins
b92709db40 MDL-43045 report: Fix missing role name in security overview report 2013-11-26 08:14:10 +13:00
Simon Coggins
529b85b06f MDL-43049 accesslib: Fix typo in memory optimization code 2013-11-26 08:01:28 +13:00
Tomasz Muras
399889c11a MDL-42563 Correct version of GPL license to GPL 2+ for AlgParser.pm 2013-11-25 11:53:18 +01:00
Dan Poltawski
25da2fe065 Merge branch 'wip-MDL-42925-master' of git://github.com/marinaglancy/moodle 2013-11-25 15:43:44 +08:00
rwijaya
a13b9929a2 MDL-42858 Course Management: Update phpunit test for core_course_management_helper_test 2013-11-25 15:39:22 +08:00
Damyon Wiese
a184b3d712 Merge branch 'MDL-42985-master' of git://github.com/FMCorz/moodle 2013-11-25 14:52:26 +08:00
Damyon Wiese
fdeb639eb8 Merge branch 'MDL-41257-Calendar-Day-and-Upcoming-Events-View-not-processed-through-text-filters' of git://github.com/michael-milette/moodle 2013-11-25 14:04:05 +08:00
Dan Poltawski
b7e6b82155 Merge branch 'w48_MDL-37016_m27_sloppymysql' of https://github.com/skodak/moodle 2013-11-25 13:40:54 +08:00
Marina Glancy
b884e46d5d MDL-43028 navigation: correct capability check 2013-11-25 13:27:01 +08:00
Damyon Wiese
aacd01f28e Merge branch 'wip-mdl-42924' of https://github.com/rajeshtaneja/moodle 2013-11-25 13:16:04 +08:00
Damyon Wiese
dc4c0310ee Merge branch 'MDL-42913a' of https://github.com/srynot4sale/moodle 2013-11-25 13:11:24 +08:00
Tim Lock
16c25753a8 MDL-43020: Fix lesson scale warnings when deleting user attempts 2013-11-25 15:08:19 +10:30
Dan Poltawski
e7f52df8f6 Merge branch '43016-27' of git://github.com/samhemelryk/moodle 2013-11-25 12:21:20 +08:00
Rajesh Taneja
823c593fc5 MDL-43028 Navigation: Setting proper page properties on admin pages 2013-11-25 12:12:38 +08:00
Marina Glancy
8a3a584da5 MDL-43006 behat: adding javascript tag because of behat bug
behat without JS does not submit the empty textarea field causing notice in the form processing
2013-11-25 14:59:28 +11:00
Dan Poltawski
83a97ce6c7 Merge branch 'master_MDL-42992' of git://github.com/danmarsden/moodle 2013-11-25 11:17:47 +08:00
Dan Poltawski
43e72c1f6a Merge branch 'wip-MDL-43024-master' of git://github.com/marinaglancy/moodle 2013-11-25 11:06:39 +08:00
Dan Poltawski
f5bc16cbd1 Merge branch 'MDL-42858' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-25 10:48:33 +08:00
James Pratt
a9e2f21125 MDL-42957 quiz statistics : Hardcoded sql LIMIT clause 2013-11-25 10:43:18 +08:00
Dan Poltawski
a136e16c8e Merge branch 'MDL-42547_master' of https://github.com/markn86/moodle 2013-11-25 10:37:33 +08:00
Rajesh Taneja
95cf93b9f4 MDL-42904 self_enrol: Set customint1 if it's null 2013-11-25 10:01:00 +08:00
Tim Lock
74dd3bd6c7 MDL-43020: Fix calculation of lesson scale value warning 2013-11-25 09:31:56 +10:30