63575 Commits

Author SHA1 Message Date
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
5def24cf32 MDL-40736 Survey: improve heading levels and styling 2013-09-09 09:50:42 +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
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
AMOS bot
42a98b25e1 Automatically generated installer lang files 2013-09-07 00:43:06 +00:00
Mark Nelson
c3bf6181aa MDL-41417 course: allow the use of duplicated idnumbers if they existed before fix 2013-09-06 15:18:23 +08:00
Adrian Greeve
a3b2df62a2 MDL-32862 - Backup: Rewriting resource_old links on backup. 2013-09-06 14:53:39 +08:00
Francis Devine
5536a5617c MDL-41417 course: prevent duplicate idnumbers being used when updating a course 2013-09-06 11:34:04 +08:00
Paul Nicholls
85b82a9c2f MDL-41451 - Large forms are truncated by max_input_vars
By parsing php://input in chunks, we can bypass max_input_vars for
forms which do not use the "multipart/form-data" enctype.  This can
be (and is) safely skipped if there are fewer than max_input_vars
fields submitted as part of $_POST.
2013-09-06 14:16:20 +12:00
AMOS bot
de890145ee Automatically generated installer lang files 2013-09-06 00:47:46 +00:00
AMOS bot
88d4c218e9 Merge branch 'master' into install_master 2013-09-06 00:47:45 +00:00
Jean-Philippe Gaudreau
7eb3c3cb6a MDL-41626 cas auth: Setting the right url for the multi-authentication page 2013-09-05 16:45:59 -04:00
sam marshall
6b5a7ce833 MDL-41167 Restore: Large course times out on Review page 2013-09-05 17:32:34 +01:00
sam marshall
347e663814 MDL-41147 Restore: Large course fails due to time limit when unzipping 2013-09-05 17:22:30 +01:00
sam marshall
7b4dbf0fa2 MDL-41163 Restore: Large course restore timeout on schema page 2013-09-05 17:06:59 +01:00
sam marshall
71ab7e512b MDL-41151 Files: Zip packer should have way to indicate progress 2013-09-05 16:41:57 +01:00
Mark Nelson
5ca04d0ef1 MDL-18375 calendar: fixed issue when resaving the year in the datetime field causing the year to decrease
For example, a user may create a date/time profile field and set the 'Start year'
field to '2012'. Another user, using the Hijri calendar, may edit the name of
this field. They visit the settings page and in this case the date '1/1/2012'
is converted to '7/2/1433' in Hijri. So, the year '1433' is then displayed.
The user then changes the name of this field and saves the form. This is where
the issue occurs, as the date '1/1/1433' is converted into Gregorian, which
converts to the year '26/09/2011', so the year '2011' is saved in the DB, not
'2012'.
2013-09-05 18:32:16 +08:00
Mark Nelson
deed22ea39 MDL-18375 calendar: removed usage of the calendar type in the usergetdate function
The usergetdate function is not only used to display dates, it is also passed
to the function make_timestamp. This means users using another calendar type
other than Gregorian will generate incorrect timestamps which may be saved in
the DB or used to populate the date_selector and date_time_selector elements.
For example, when creating an assignment using another calendar type other
than Gregorian, the mod_form.php file calls $this->apply_admin_defaults()
which uses the function usergetmidnight to set the "Allow submissions from"
date to today's date and the "Due date" field to 7 days in the future. The
usergetmidnight function calls usergetdate which is then passed to
make_timestamp. Since the usergetdate function was using the calendar
type's timestamp_to_date_array function the date being passed to
make_timestamp was not in Gregorian. So, when using the hijri calendar the
year 1434 was being passed which was generating a large negative number as
the timestamp which was then used to populate the date fields.
2013-09-05 18:32:16 +08:00
Mark Nelson
6eafa4ddba MDL-18375 calendar: changed the name of the function factory to be more descriptive 2013-09-05 18:32:16 +08:00
Mark Nelson
2aefba53a5 MDL-18375 calendar: added condition to ensure calendar type exists before loading 2013-09-05 18:32:16 +08:00