Commit graph

63666 commits

Author SHA1 Message Date
Damyon Wiese
934c70040c Merge branch 'MDL-41253-master' of git://github.com/sammarshallou/moodle 2013-09-10 09:03:42 +08:00
Sam Hemelryk
3eb032d743 NOBUG: fixed whitespace 2013-09-10 13:02:35 +12:00
Adam Olley
910051b798 MDL-41600: qformat_blackboard_six Fix test_import_match fail w/ddmatch
With qtype_ddmatch installed, the unit tests for qformat_blackboard_six
fail as they generate ddmatch questions instead of match ones. This
patch checks for ddmatch and changes the test to expect that instead if
its installed.
2013-09-10 09:16:51 +09:30
Sam Hemelryk
a775f2c96d Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-09-10 11:22:04 +12:00
Sam Hemelryk
bee0a508ef Merge branch 'MDL-41558-master' of git://github.com/ankitagarwal/moodle 2013-09-10 11:16:30 +12:00
Sam Hemelryk
8242ca0c34 MDL-32862 backup: fixed missing global 2013-09-10 10:57:20 +12:00
Sam Hemelryk
68d3e7682a Merge branch 'MDL-41167-master' of git://github.com/sammarshallou/moodle 2013-09-10 10:31:59 +12:00
Sam Hemelryk
12d50d8216 Merge branch 'wip-MDL-32862-master' of git://github.com/abgreeve/moodle 2013-09-10 09:38:46 +12:00
Sam Hemelryk
9b6415dd38 Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle 2013-09-10 09:36:24 +12:00
sam marshall
a7a64d774a MDL-41253 Restore: Mechanism to display progress during UI stages 2013-09-09 12:42:07 +01:00
Dan Poltawski
0df3254212 Merge branch 'MDL-41254-m' of git://github.com/micaherne/moodle 2013-09-09 18:04:05 +08:00
Dan Poltawski
cdf6fc243e Merge branch 'MDL-29069' of https://github.com/bostelm/moodle 2013-09-09 17:37:49 +08:00
Andrew Davis
e5d932cce2 MDL-40734 mod_glossary: cleaned up some headings 2013-09-09 17:30:12 +08:00
David Mudrák
badfeed04c MDL-29378 Fix the recent string modification
But accident, I have modified the string 'collesaintro' in the previous patch.
The correct string to be amended is 'collesapintro'.
2013-09-09 11:19:48 +02:00
Dan Poltawski
8eb80a2c42 Merge branch 'MDL-37804' of github.com:recreate/moodle 2013-09-09 17:13:22 +08:00
Mary Evans
ddfc16c87e MDL-40575 theme_bootstrapbase: Unable to scroll language menu in theme/clean. 2013-09-09 16:11:00 +08:00
Dan Poltawski
867af9c4f3 Merge branch 'MDL-41163-master' of git://github.com/sammarshallou/moodle 2013-09-09 15:29:48 +08:00
Dan Poltawski
8250a11688 MDL-41438 version bump 2013-09-09 14:25:07 +08:00
Dan Poltawski
76c88eaffb Merge branch 'MDL-41438' of git://github.com/rwijaya/moodle 2013-09-09 14:23:41 +08:00
Damyon Wiese
426cdef0bc Merge branch 'wip-MDL-41517-master' of git://github.com/marinaglancy/moodle 2013-09-09 12:43:32 +08:00
Damyon Wiese
437b86f0ad MDL-18275 Calendar types: Add a major version + redirect for ci server fail. 2013-09-09 11:25:02 +08:00
Damyon Wiese
7bb89ae042 Merge branch 'master_MDL-41290' of git://github.com/danmarsden/moodle 2013-09-09 10:46:59 +08:00
Damyon Wiese
1320c3177b Merge branch 'MDL-18375_master' of git://github.com/markn86/moodle 2013-09-09 10:41:12 +08:00
Dan Poltawski
d95e8420df Merge branch 'MDL-41151-master' of git://github.com/sammarshallou/moodle 2013-09-09 10:22:02 +08:00
Rossiani Wijaya
4e5f53e90e MDL-41566 page resource: fix page heading levels.
Also removing printheading options setting.
2013-09-09 10:19:11 +08:00
Rossiani Wijaya
7265e7c784 MDL-41564 folder resource: fix page heading levels 2013-09-09 10:17:28 +08:00
Rossiani Wijaya
5def24cf32 MDL-40736 Survey: improve heading levels and styling 2013-09-09 09:50:42 +08:00
Rossiani Wijaya
846cebe5b3 MDL-40687 Feedback: improve page heading levels and layouts 2013-09-09 09:48:05 +08:00
Rossiani Wijaya
d8a6d49c5f MDL-40686 book: fix heading level and styling 2013-09-09 09:46:27 +08:00
Rossiani Wijaya
3b42864d65 MDL-41438 core renderer: additional patch to remove .main definition from all core themes 2013-09-09 09:39:03 +08:00
Rossiani Wijaya
699e2fd0de MDL-41438 core_renderer: Update the parameters for heading() and heading_with_help().
heading(), change the default value for classes from 'main' to null.
heading_with_help(), add 2 additional parameters for level and classnames. Default value of level is set to 2 and classnames is set to null.

With the changes for heading_with_help(), icon image vertical alignment needs to be adjusted, so it display in the middle of the heading.

Also added some notes in theme/upgrade.txt file.
2013-09-09 09:39:03 +08:00
Paul Nicholls
59de735095 MDL-41451 - formslib: use create_function instead of inline function
As per MDL-39432, closure-style inline functions can result in fatal
errors when using eAccelerator and thus should be avoided.
2013-09-09 11:21:33 +12:00
Sam Hemelryk
33909ed001 Merge branch 'MDL-38794' of https://github.com/prateeksachan/moodle 2013-09-09 11:12:56 +12:00
Sam Hemelryk
771080ba7d Merge branch 'MDL-41417_master' of https://github.com/markn86/moodle 2013-09-09 10:54:11 +12:00
Sam Hemelryk
fb76f7492e Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle 2013-09-09 10:48:13 +12:00
Sam Hemelryk
58cc269d0c Merge branch 'w37_MDL-28094_m26_subdirs' of https://github.com/skodak/moodle 2013-09-09 10:19:00 +12:00
Sam Hemelryk
0b7a2b7bec Merge branch 'MDL-41460-master' of https://github.com/FMCorz/moodle 2013-09-09 08:58:44 +12:00
Sam Hemelryk
c0739778f3 MDL-41189 fixed overflow issue with filepicker thumbnail 2013-09-09 08:24:31 +12:00
kordan
8d773a885e MDL-41658 theme_formal_white: text in input select is now never centered (fixed at central level) 2013-09-08 21:01:18 +02:00
Marina Glancy
7f250174df MDL-40347 Corrections to upgrade text 2013-09-08 23:17:34 +10:00
Mary Evans
4e2b37db07 MDL-40347 grade/report/grader: cleaned up grade/report/grader/styles.css. 2013-09-08 23:17:29 +10:00
Mary Evans
edb7d5ad84 MDL-40347 grade/report/grader: Fixes: Grade report does not highlight some cells properly.
Squashed commit of the following:

commit 2c2164a7e27bd2b81102251420892386e39edecc
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Aug 20 12:59:47 2013 +0100

    MDL-40347 theme: Modified upgrade.txt and created bootstrapbase/upgrade.txt.

commit 4449975a0f9249785ed152f63786bf7974c1776e
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Aug 13 18:42:20 2013 +0100

    MDL-40347 grade/report/grader: added RTL css previously in bootstrapbase/less/moodle/grade.less to styles.css

commit b0af8f05a411b3dbb1d9c162a0d65c7f9c069c0f
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Aug 13 12:42:02 2013 +0100

    MDL-40347_M26 grade/report/grader: cleaned up grade/report/grader/styles.css.

commit 52627137dc662d47cbfdf023d056baf102f29d8a
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Jul 6 17:15:12 2013 +0100

    MDL-40347 grade/report/grader: Grade report does not highlight some cells properly.

    Merged/squashed original commit by Marina Glancy who:
    - added class 'i123' to each cell in the column
    - changed JS to highlight the cells with this class instead that cells with the column number
    - changed grade report css so the .vmarked and .hmarked classes have higher priority for all rows
    - made cells in 'average range' row td instead of th
    - little corrections to css: removed background image for some cells with .header css class
    - MyMobile theme disabled cells highlighting, make sure it disables it in all cases

    Merged/squashed original commit Mary Evans who:
    - removed theme/bootstrapbase/less/moodle/grade.less
    - removed @import "moodle/grade"; from bootstrapbase/less/moodle.less
    - removed reference to plugins_exclude_sheets for grader in both bootstrapbase/config.php and clean themes/config.php
    - commented out .hidden from bootstrapbase/less/bootstrap/responsive_utilities.less
    - made minor changes to grader/style.css
2013-09-08 23:16:47 +10:00
Eloy Lafuente (stronk7)
f09119e1e5 weekly release 2.6dev 2013-09-07 14:20:07 +02:00
Eloy Lafuente (stronk7)
5cfcc6a981 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-09-07 14:13:55 +02:00
Petr Škoda
f9beaf4472 MDL-28094 fix subdirs support in module intro editor 2013-09-07 11:30:19 +02:00
Petr Škoda
5e95223e86 MDL-28094 keep subdirs in content upgraded from 1.x 2013-09-07 11:30:19 +02:00
Petr Škoda
4db9d48253 MDL-28094 add function that detects if subdirs used and fix subdirs option in form editor 2013-09-07 11:30:18 +02:00
Petr Škoda
17ccd3aa1b MDL-41408 redirect after incorrect login attempts 2013-09-07 11:29:14 +02:00
Dan Poltawski
4925b9e8c5 MDL-41623 rss: clean output rss content 2013-09-07 10:41:25 +08:00
Eloy Lafuente (stronk7)
d037dba81c MDL-41623 ensure all rss links are valid urls. 2013-09-07 04:04:54 +02:00