Dan Poltawski [Sun, 13 May 2012 16:42:24 +0000 (00:42 +0800)]
MDL-29857 - google apis: Convert to OAuth 2.0
Updated the various plugins to use OAuth 2.0 for authentication
against google apis. Google are phasing out AuthSub and pushing OAuth as
the replacement.
This changes repository_googledocs, repository_picasa,
portfolio_googledocs and portfolio_picasa
The token for requests is now stored in session rather than a user
prefence and it persists less but doesn't bother the user more than
necessary.
The google docs portfolio plugin is converted to use resumable upload
API as this appears to be what Google have replaced this with.
Unfortunately unlike authsub OAuth will require some setup by admins,
this is linked as a docs page.
Dan Poltawski [Sun, 13 May 2012 16:39:00 +0000 (00:39 +0800)]
MDL-29857 - lib: Add an OAuth 2.0 client
A generic OAuth 2.0 for the web application flow, tested against
microsoft and google apis.
Added a callback endpoint for requests so that clients can use a single
endpoint (without GET params). I put this in /admin/ as I expect some
sites will have .htaccess denying access to /lib/.
Dan Poltawski [Sun, 13 May 2012 04:57:41 +0000 (12:57 +0800)]
MDL-32221 - googledocs: Add support for all file types.
Now google supports 'file' as well as converted formats.
Dan Poltawski [Sun, 13 May 2012 07:33:02 +0000 (15:33 +0800)]
MDL-29857 - portfolio: Fix E_STRICT errors
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
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
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
Sam Hemelryk [Wed, 23 May 2012 23:11:13 +0000 (11:11 +1200)]
Merge branch 'MDL-33189-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 23 May 2012 23:00:09 +0000 (11:00 +1200)]
Merge branch 'MDL-26562-23' of git://github.com/vadimonus/moodle
Petr Skoda [Wed, 23 May 2012 09:28:10 +0000 (11:28 +0200)]
MDL-33293 init JS and theme revisions to timestamps in install to match new reset code
Petr Skoda [Wed, 23 May 2012 09:11:13 +0000 (11:11 +0200)]
MDL-33293 use time() instead of counter for theme and JS revisions
This should help on sites that reset database, reinstall or switch databases.
Aparup Banerjee [Wed, 23 May 2012 08:44:00 +0000 (16:44 +0800)]
Merge branch 'wip-mdl-33143' of git://github.com/rajeshtaneja/moodle
Adrian Greeve [Wed, 23 May 2012 08:13:32 +0000 (16:13 +0800)]
MDL-33146 - course - Changed weekdates to sectionname to fix a JavaScript error
Marina Glancy [Wed, 23 May 2012 06:51:55 +0000 (14:51 +0800)]
MDL-33144 display filetype icon and mimetype based on extension
- use finfo to determine mimetype of a file only when it is unknown from file extension
- display filetype icon and mimetype in filemanager based on file extension
- fixed a small issue with specifying extension instead of group in file_get_typegroup()
- allow only web-compartible image types when embedding into editor or using in database field
- created new groups web_video and web_audio to use in resource module
Damyon Wiese [Wed, 23 May 2012 06:05:35 +0000 (14:05 +0800)]
MDL-31414: Add sendlatenotifications support to the mod_assign upgrade tool
Prevents an SQL error on upgrade from mod_assignment to mod_assign
Dan Poltawski [Wed, 23 May 2012 05:28:01 +0000 (13:28 +0800)]
Merge branch 'wip-mdl-32155' of git://github.com/rajeshtaneja/moodle
Rajesh Taneja [Fri, 18 May 2012 06:55:32 +0000 (14:55 +0800)]
MDL-32155 blocks: User can't access file, if block is hidden or doesn't have block:view capability
Rajesh Taneja [Tue, 22 May 2012 05:11:23 +0000 (13:11 +0800)]
MDL-33143 wiki-2.0 : wiki edit form will have mform1 as id for JS to work
Sam Hemelryk [Wed, 23 May 2012 04:23:53 +0000 (16:23 +1200)]
MDL-31414 mod_assign: Fixed issue with assign cron when there was nothing to process
Dan Poltawski [Wed, 23 May 2012 03:27:54 +0000 (11:27 +0800)]
Merge branch 'MDL-32338' of git://github.com/nebgor/moodle
Dan Poltawski [Wed, 23 May 2012 03:13:37 +0000 (11:13 +0800)]
MDL-32895 tool_assignmentupgrade: fix trailing whitespace
Dan Poltawski [Wed, 23 May 2012 03:13:03 +0000 (11:13 +0800)]
Merge branch 'MDL-32895' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Wed, 23 May 2012 02:39:16 +0000 (10:39 +0800)]
Merge branch 'wip-MDL-31414-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Wed, 23 May 2012 02:26:40 +0000 (10:26 +0800)]
Merge branch 'MDL-33074_groupmode_button' of git://github.com/davosmith/moodle
Sam Hemelryk [Tue, 22 May 2012 21:34:23 +0000 (09:34 +1200)]
MDL-31414 mod_assign: Code cleanup for notification improvements
* No need to manually call update of providers that happens automatically.
* Added upgrade code for the new sendlatenotifications field.
* Added AMOS syntax for the two renamed strings
* Refactored assign::cron to use half as many DB queries
* Cleaned up unused vars and globals, coding style and phpdocs.
* Removed string notifications added previously but never used.
AMOS BEGIN
MOV [emailgradermail,mod_assign],[gradersubmissionupdatedtext,mod_assign]
MOV [emailgradermailhtml,mod_assign],[gradersubmissionupdatedhtml,mod_assign]
AMOS END
Damyon Wiese [Mon, 7 May 2012 05:01:50 +0000 (13:01 +0800)]
MDL-31414: Separate settings to control notifications for submissions, late submissions and submission receipts
This adds separate controls for the sending of notifications from the mod_assign.
The separate notifications are: student submission receipt (for students), feedback available (for students)
and submission updated (for graders). The grader notifications can be enabled for all submissions or just late ones.
Added code to reset the message providers on upgrade (only applies for a 2.3 dev version)
Eloy Lafuente (stronk7) [Tue, 22 May 2012 16:07:42 +0000 (18:07 +0200)]
on-demand release 2.3dev
Eloy Lafuente (stronk7) [Tue, 22 May 2012 16:06:52 +0000 (18:06 +0200)]
Fix permissions
Ruslan Kabalin [Tue, 22 May 2012 13:26:09 +0000 (14:26 +0100)]
MDL-33189: Make checkboxcontroller functionable
Andrew Robert Nicols [Tue, 22 May 2012 10:24:24 +0000 (11:24 +0100)]
MDL-33186 Ensure that the comment textarea exists before toggling it
Dan Poltawski [Tue, 22 May 2012 09:14:43 +0000 (17:14 +0800)]
Merge branch 'dev_MDL-33177_restore_warning' of git://github.com/dongsheng/moodle
Dan Poltawski [Tue, 22 May 2012 08:51:33 +0000 (16:51 +0800)]
Merge branch 'dev_MDL-33149_stored_file_access' of git://github.com/dongsheng/moodle
Dongsheng Cai [Tue, 22 May 2012 07:00:49 +0000 (15:00 +0800)]
MDL-33149 stored_file::repository should be private
Dongsheng Cai [Tue, 22 May 2012 06:50:47 +0000 (14:50 +0800)]
MDL-33127 Fixed the problem when storing draft files
Dongsheng Cai [Tue, 22 May 2012 06:43:06 +0000 (14:43 +0800)]
MDL-33177 Fixed restore warning when backup has external contents
Dan Poltawski [Tue, 22 May 2012 06:32:35 +0000 (14:32 +0800)]
Merge branch 'wip-files23-fixes' of git://github.com/marinaglancy/moodle
Barbara Ramiro [Tue, 22 May 2012 06:25:23 +0000 (14:25 +0800)]
MDL-33160 new filetype icons
Marina Glancy [Tue, 22 May 2012 06:24:11 +0000 (14:24 +0800)]
MDL-33158 fixed bugs with restricting file typs in filepicker
- extension was returned without leading dot which resulted in improper validation
- fixed human-readable mime type in error message
- fixed youtube repository to support video files and pass filetype validation
Marina Glancy [Tue, 22 May 2012 06:18:06 +0000 (14:18 +0800)]
MDL-33160 fixed some icons and groups for file types
Dan Poltawski [Tue, 22 May 2012 05:57:51 +0000 (13:57 +0800)]
Merge branch 'dev_MDL-33154_sesskey_error' of git://github.com/dongsheng/moodle
Dan Poltawski [Tue, 22 May 2012 05:34:18 +0000 (13:34 +0800)]
Merge branch 'w21_MDL-32564_m23_timezonecontext' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 22 May 2012 05:05:28 +0000 (13:05 +0800)]
Merge branch 'w21_MDL-32379_m23_forumcron' of git://github.com/skodak/moodle
Adrian Greeve [Tue, 22 May 2012 04:51:48 +0000 (12:51 +0800)]
MDL-33152 - themes - Moved the action buttons more to the right, inline with the rest of the form.
Dan Poltawski [Tue, 22 May 2012 04:51:45 +0000 (12:51 +0800)]
Merge branch 'MDL-33116-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 22 May 2012 04:28:37 +0000 (12:28 +0800)]
Merge branch 'MDL-32744-master-3' of git://git.luns.net.uk/moodle
Dongsheng Cai [Tue, 22 May 2012 04:14:59 +0000 (12:14 +0800)]
MDL-33154 added missing sesskey to navgation nodes