Dan Poltawski [Mon, 28 May 2012 07:43:33 +0000 (15:43 +0800)]
Merge branch 'wip-MDL-33338-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 28 May 2012 07:37:31 +0000 (15:37 +0800)]
Merge branch 'wip-MDL-33356-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 28 May 2012 07:23:01 +0000 (15:23 +0800)]
Merge branch 'MDL-31393' of git://github.com/timhunt/moodle
Marina Glancy [Mon, 28 May 2012 07:19:41 +0000 (15:19 +0800)]
MDL-33338 recognising the mimetype for uploaded files
- when file is uploaded in php, the tmpname does not have initial extension and mimetype recognition by extension fails
- another issue is that import form for questions fails with fatal error when it should just say that field is required
Dan Poltawski [Mon, 28 May 2012 07:18:51 +0000 (15:18 +0800)]
Merge branch 'wip-MDL-32199-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 28 May 2012 06:58:56 +0000 (14:58 +0800)]
Merge branch 'MDL-33194-master' of https://github.com/mackensen/moodle
Dan Poltawski [Mon, 28 May 2012 06:56:48 +0000 (14:56 +0800)]
Merge branch 'MDL-32860_user_iterator' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 28 May 2012 06:54:23 +0000 (14:54 +0800)]
Merge branch 'MDL-33110_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 28 May 2012 06:32:16 +0000 (14:32 +0800)]
Merge branch 'master_MDL-27368' of git://github.com/danmarsden/moodle
Conflicts:
version.php
lib/db/upgrade.php
Marina Glancy [Mon, 28 May 2012 05:52:32 +0000 (13:52 +0800)]
MDL-33356 fixed a regression after function form_filemanager_redner() was deleted
Adrian Greeve [Mon, 14 May 2012 03:47:20 +0000 (11:47 +0800)]
Alteration to the code to hide the body of the post / discussion
Andrew Robert Nicols [Tue, 27 Mar 2012 10:57:46 +0000 (11:57 +0100)]
MDL-32199 Ensure that forum RSS feeds don't leak posts and discussions
Sam Hemelryk [Mon, 28 May 2012 05:05:10 +0000 (17:05 +1200)]
Merge branch 'w21_MDL-32972_m23_avatargifs' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 28 May 2012 05:01:44 +0000 (13:01 +0800)]
Merge branch 'wip-mdl-33347' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 28 May 2012 04:52:53 +0000 (16:52 +1200)]
MDL-18763 Fixed up typo in comments of new pic size
Sam Hemelryk [Mon, 28 May 2012 04:50:46 +0000 (16:50 +1200)]
Merge branch 'w21_MDL-18763_m23_avatar512' of git://github.com/skodak/moodle
Rossiani Wijaya [Mon, 28 May 2012 03:58:37 +0000 (11:58 +0800)]
MDL-32766: course view section log: fixed typo for course_sections table
Conflicts:
version.php
Dan Poltawski [Mon, 28 May 2012 04:37:50 +0000 (12:37 +0800)]
Revert "MDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath.class.php"
Breaking unit tests.
This reverts commit
4be0947bbe63f32f38aa1698d4bbb9068d7a9dc9.
Dan Poltawski [Mon, 28 May 2012 04:16:12 +0000 (12:16 +0800)]
Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 28 May 2012 03:47:22 +0000 (11:47 +0800)]
Merge branch 'MDL-33192-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 28 May 2012 02:56:06 +0000 (14:56 +1200)]
Merge branch 'MDL-32752-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 28 May 2012 02:52:47 +0000 (14:52 +1200)]
Merge branch 'MDL-33331-master' of git://github.com/micaherne/moodle
Sam Hemelryk [Mon, 28 May 2012 02:49:12 +0000 (14:49 +1200)]
Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle
Conflicts:
theme/magazine/config.php
Sam Hemelryk [Mon, 28 May 2012 02:07:59 +0000 (14:07 +1200)]
Merge branch 'MDL-33084_strict_calc' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 28 May 2012 02:03:20 +0000 (14:03 +1200)]
Merge branch 'MDL-32380_master' of git://github.com/kordan/moodle
Rajesh Taneja [Fri, 25 May 2012 08:19:08 +0000 (16:19 +0800)]
MDL-33347 course: section move is visible without ajax
Sam Hemelryk [Mon, 28 May 2012 01:51:22 +0000 (13:51 +1200)]
Merge branch 'MDL-33364' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 28 May 2012 01:38:36 +0000 (13:38 +1200)]
MDL-27675 mod_feedback: Tidy up of phpdocs and scope within feedback mod
Sam Hemelryk [Mon, 28 May 2012 01:37:59 +0000 (13:37 +1200)]
Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle
Eloy Lafuente (stronk7) [Mon, 28 May 2012 00:44:24 +0000 (02:44 +0200)]
MDL-33364 automated backup: return and log each course result correctly
Sam Hemelryk [Sun, 27 May 2012 23:22:12 +0000 (11:22 +1200)]
Merge branch 'MDL-33191' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Sun, 27 May 2012 23:19:06 +0000 (11:19 +1200)]
Merge branch 'MDL-32766' of git://github.com/rwijaya/moodle
Conflicts:
version.php
Sam Hemelryk [Sun, 27 May 2012 23:12:36 +0000 (11:12 +1200)]
Merge branch 'MDL-33120' of git://github.com/stronk7/moodle
Sam Hemelryk [Sun, 27 May 2012 23:04:43 +0000 (11:04 +1200)]
Merge branch 'dev_MDL-33147_transaction' of git://github.com/dongsheng/moodle
Sam Hemelryk [Sun, 27 May 2012 22:52:24 +0000 (10:52 +1200)]
Merge branch 'MDL-33325-master' of git://github.com/ankitagarwal/moodle
eLeDia GmbH (Andreas Grabs) [Wed, 9 May 2012 14:52:26 +0000 (16:52 +0200)]
MDL-27675 - Feedback module abuses data_submitted
Andreas Grabs [Fri, 15 Jul 2011 00:03:21 +0000 (02:03 +0200)]
MDL-27675 - Feedback module abuses data_submitted
Dan Marsden [Mon, 19 Mar 2012 01:50:59 +0000 (14:50 +1300)]
MDL-27368 Clean up invalid course completion records
keep oldest timestamps from all records
Eloy Lafuente (stronk7) [Sun, 27 May 2012 15:40:50 +0000 (17:40 +0200)]
MDL-33120 book: changes in code based on amended strings
- Replace numberingoptions_help by numberingoptions_desc.
- Delete the faq code and related styles.
- Bump version to force lang/style refresh.
Helen Foster [Sun, 27 May 2012 15:28:43 +0000 (17:28 +0200)]
MDL-33120 book: Amend module strings
Al the changes are fixes but numberingoptions_help
that is one change of string key too, hence we instruct AMOS to move it.
AMOS BEGIN
MOV [numberingoptions_help,mod_book],[numberingoptions_desc,mod_book]
AMOS END
Ruslan Kabalin [Tue, 22 May 2012 16:07:22 +0000 (17:07 +0100)]
MDL-33192: Prevent global DDM conflicting with others drag-drop instances.
Dan Poltawski [Fri, 25 May 2012 10:07:10 +0000 (18:07 +0800)]
on-demand release 2.3dev
Dan Poltawski [Fri, 25 May 2012 10:04:43 +0000 (18:04 +0800)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Dan Poltawski [Fri, 25 May 2012 07:25:30 +0000 (15:25 +0800)]
Merge branch 'w21_MDL-33075_m23_phpunitclassreflex' of git://github.com/skodak/moodle
Aparup Banerjee [Fri, 25 May 2012 06:13:21 +0000 (14:13 +0800)]
Merge branch 'MDL-33196' of git://github.com/rwijaya/moodle
Aparup Banerjee [Fri, 25 May 2012 04:08:03 +0000 (12:08 +0800)]
Merge branch 'MDL-33307' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Fri, 25 May 2012 03:44:04 +0000 (11:44 +0800)]
MDL-33324 Filepicker : fixed syntax.
Aparup Banerjee [Fri, 25 May 2012 03:25:57 +0000 (11:25 +0800)]
MDL-33324 Filepicker : removed redundant parantheses.
Aparup Banerjee [Fri, 25 May 2012 03:25:25 +0000 (11:25 +0800)]
Merge branch 'wip-MDL-33324-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Fri, 25 May 2012 03:14:22 +0000 (11:14 +0800)]
Merge branch 'MDL-29924-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 25 May 2012 03:08:14 +0000 (11:08 +0800)]
MDL-28557 - calendar: fix trivial whitespace issue
Dan Poltawski [Fri, 25 May 2012 03:07:14 +0000 (11:07 +0800)]
Merge branch 'MDL-28557' of git://github.com/bostelm/moodle
Dan Poltawski [Fri, 25 May 2012 03:00:53 +0000 (11:00 +0800)]
Merge branch 'w22_MDL-33114_m23_tinymce3511' of git://github.com/skodak/moodle
Dan Poltawski [Fri, 25 May 2012 02:55:49 +0000 (10:55 +0800)]
Merge branch 'MDL-33135-master-3' of git://git.luns.net.uk/moodle
Dan Poltawski [Fri, 25 May 2012 02:44:47 +0000 (10:44 +0800)]
Merge branch 'w21_MDL-27575_m23_skype' of git://github.com/skodak/moodle
Dan Poltawski [Fri, 25 May 2012 02:37:48 +0000 (10:37 +0800)]
Merge branch 'w21_MDL-33034_m23_roletests' of git://github.com/skodak/moodle
Dan Poltawski [Fri, 25 May 2012 02:36:43 +0000 (10:36 +0800)]
MDL-29836 webservice: version bump to pickup new string
Vadim Dvorovenko [Wed, 16 May 2012 11:03:09 +0000 (18:03 +0700)]
MDL-29836 webservices: use individual string
To allow accurate transalation
Dan Poltawski [Fri, 25 May 2012 02:22:35 +0000 (10:22 +0800)]
Merge branch 'MDL-33028' of git://github.com/mouneyrac/moodle
Dan Poltawski [Fri, 25 May 2012 02:16:12 +0000 (10:16 +0800)]
Merge branch 'MDL-33060' of git://github.com/mouneyrac/moodle
Dan Poltawski [Fri, 25 May 2012 02:14:17 +0000 (10:14 +0800)]
Merge branch 'MDL-33020' of git://github.com/timhunt/moodle
Dan Poltawski [Fri, 25 May 2012 02:13:19 +0000 (10:13 +0800)]
Merge branch 'MDL-32339-css-updates' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Fri, 25 May 2012 02:09:09 +0000 (10:09 +0800)]
MDL-33139 mod_forum: fix minor whitespace problem
Dan Poltawski [Fri, 25 May 2012 02:08:33 +0000 (10:08 +0800)]
Merge branch 'MDL-33139-master' of https://github.com/mackensen/moodle
Dan Poltawski [Fri, 25 May 2012 02:03:33 +0000 (10:03 +0800)]
MDL-33173 files: correct @package name
Dan Poltawski [Fri, 25 May 2012 01:57:35 +0000 (09:57 +0800)]
Merge branch 'MDL-33173-master' of git://github.com/FMCorz/moodle
Frederic Massart [Thu, 24 May 2012 08:05:30 +0000 (16:05 +0800)]
MDL-33173 Filepicker: renamed private files edit page to main page
AMOS bot [Fri, 25 May 2012 00:31:16 +0000 (00:31 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Thu, 24 May 2012 23:37:07 +0000 (11:37 +1200)]
MDL-33172: Fixed whitespace
Dan Poltawski [Thu, 24 May 2012 05:35:13 +0000 (01:35 -0400)]
MDL-33172 - filestorage: Fix oracle incompatibilites
Fixes the following problems:
* When we select from two tables with the same named fields (id)
and ask to sort by that field, Oracle doesn't know which table to
sort frm unless that field is named in the SELECT. Here we do that
by explicitly naming the fields. This keeps compatibility with before
the reference table was added.
* Text comparisong without sql_compare_text
Dan Poltawski [Wed, 23 May 2012 05:19:10 +0000 (13:19 +0800)]
MDL-33172 - filestorage: Add unit test for breaking oracle functions
Petr Skoda [Thu, 24 May 2012 21:15:52 +0000 (23:15 +0200)]
MDL-33114 import TinyMCE 3.5.1.1 and fix preview
Dan Poltawski [Thu, 24 May 2012 15:30:23 +0000 (23:30 +0800)]
Merge branch 'wip-MDL-33329-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 24 May 2012 14:51:53 +0000 (22:51 +0800)]
MDL-33307 format_weeks - sort out week date display
* Introduce function format_weeks_get_section_dates which is used
as the consistent place to calculate the current section start and
end date
* Rework callback_weeks_get_section_name to not use the above function
rather than do crazy needless looping through all sections to work
out the current week title.
* Change the just introduced is_current renderer function to share
the format_weeks_get_section_dates function to ensure both the title
and 'current week' are using the same dates to do their job
Dan Poltawski [Thu, 24 May 2012 14:24:30 +0000 (22:24 +0800)]
MDL-33307 format_weeks - highlight current week
Charles Fulton [Mon, 21 May 2012 12:39:27 +0000 (05:39 -0700)]
MDL-33139 forum: indicate which user's post was edited
Dan Poltawski [Thu, 24 May 2012 12:42:58 +0000 (20:42 +0800)]
Revert "MDL-33063 course: Reuse get_all_sections()"
This reverts commit
66b494771ffc731472a374bef1b5cd12befd53b2.
Dan Poltawski [Thu, 24 May 2012 12:32:31 +0000 (20:32 +0800)]
Merge branch 'MDL-33063' of git://github.com/srynot4sale/moodle
Michael Aherne [Thu, 24 May 2012 12:04:21 +0000 (13:04 +0100)]
MDL-33331 Strict warning in Shibboleth auth
David Mudrak [Thu, 24 May 2012 09:49:36 +0000 (11:49 +0200)]
MDL-32339 improving the layout for narrow screens
Dan Poltawski [Thu, 24 May 2012 08:49:28 +0000 (16:49 +0800)]
Merge branch 'MDL-33315_blog_rss' of git://github.com/andyjdavis/moodle
Dan Poltawski [Thu, 24 May 2012 08:34:32 +0000 (16:34 +0800)]
Merge branch 'dev_MDL-33127_draft_storing' of git://github.com/dongsheng/moodle
Dan Poltawski [Thu, 24 May 2012 08:32:32 +0000 (16:32 +0800)]
Merge branch 'wip-MDL-33144-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 24 May 2012 08:14:02 +0000 (16:14 +0800)]
MDL-33329 Filepicker form element can not link by reference. Also better handling of maxbytes
Dan Poltawski [Thu, 24 May 2012 08:12:15 +0000 (16:12 +0800)]
MDL-33162 filepicker: fix trailingw hitespace
Dan Poltawski [Thu, 24 May 2012 08:10:06 +0000 (16:10 +0800)]
Merge branch 'wip-MDL-33162-master' of git://github.com/barbararamiro/moodle
Dan Poltawski [Thu, 24 May 2012 08:05:25 +0000 (16:05 +0800)]
Merge branch 'wip-MDL-33146-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Thu, 24 May 2012 07:53:39 +0000 (15:53 +0800)]
Merge branch 'MDL-33186-master-1' of git://git.luns.net.uk/moodle
Aparup Banerjee [Thu, 24 May 2012 07:40:06 +0000 (15:40 +0800)]
MDL-33318 lib : code style fix
Ankit Agarwal [Thu, 24 May 2012 07:13:22 +0000 (15:13 +0800)]
MDL-33325 folder: 'set as main file' option removed, from filepicker when editing a file in a folder resource
Barbara Ramiro [Thu, 24 May 2012 07:02:52 +0000 (15:02 +0800)]
MDL-33162, MDL-33183, MDL-33150 Adjusted styles filemanager, file picker and file picker form element
- MDL-33162 Vertical align text to the middle of 24px icon for table view and tree view both on filemanager and filepicker
- MDL-33183 Layout file picker on form element on edit profile for drag and drop with dashed border and animated arrow consistent with filemanager (outputrenderers.php)
- MDL-33150 Added more space in between tool buttons both for file manager and filepicker
Aparup Banerjee [Thu, 24 May 2012 06:46:38 +0000 (14:46 +0800)]
Merge branch 'master_MDL-33318' of git://github.com/danmarsden/moodle
Dan Poltawski [Thu, 24 May 2012 06:39:58 +0000 (14:39 +0800)]
Merge branch 'wip-MDL-33152-master' of git://github.com/abgreeve/moodle
Marina Glancy [Thu, 24 May 2012 05:43:01 +0000 (13:43 +0800)]
MDL-33324 fixed bugs with icons in filepicker/filemanager treeview
- in treeview the icons for parent folders did not appear
- in treeview after refreshing (expanding subtrees) the image previews were replaced back to filetype icons
- also fixed a mistype in icon url in repository_local
Rossiani Wijaya [Thu, 24 May 2012 05:43:01 +0000 (13:43 +0800)]
MDL-33196 filepicker: fixed link output error
Dan Poltawski [Thu, 24 May 2012 03:26:35 +0000 (11:26 +0800)]
Merge branch 'w22_MDL-33293_m23_revisions' of git://github.com/skodak/moodle
Andrew Davis [Thu, 24 May 2012 02:40:59 +0000 (09:40 +0700)]
MDL-33315 blog: fixed up the navigation for when youre viewing another users blog
Dan Marsden [Thu, 24 May 2012 02:08:01 +0000 (14:08 +1200)]
MDL-33318 use $CFG->admin in path correctly - thanks to Clarence Prudhoe for report/fix
AMOS bot [Thu, 24 May 2012 00:31:26 +0000 (00:31 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Wed, 23 May 2012 23:42:39 +0000 (11:42 +1200)]
Merge branch 'MDL-32203c' of git://github.com/srynot4sale/moodle