moodle.git
10 years agoMDL-33098 filemanager now stores the new author field correctly
David Mudrak [Fri, 18 May 2012 13:42:30 +0000 (15:42 +0200)]
MDL-33098 filemanager now stores the new author field correctly

10 years agoMDL-33032 Fixed issues for file integration
Dongsheng Cai [Thu, 17 May 2012 05:55:03 +0000 (13:55 +0800)]
MDL-33032 Fixed issues for file integration

1. Added tracker issue number in comment
2. Fixed stored_file::delete_reference()
3. repository::send_file() will throw exception if not implemented by subclass
4. Fixed renaming unit test, added one unit test for deleting original file
5. Fixed copyright statement for googledoc and picasa repository plugin
6. Implemented stored_file::set_filesize()

10 years agoMDL-28666, Fixed source field when download a file using filepicker
Dongsheng Cai [Thu, 17 May 2012 06:18:13 +0000 (14:18 +0800)]
MDL-28666, Fixed source field when download a file using filepicker

10 years agoMDL-31901 filemanager and filepicker styling
Barbara Ramiro [Thu, 17 May 2012 05:56:21 +0000 (13:56 +0800)]
MDL-31901 filemanager and filepicker styling

- Thumbnail for Private files, Server file and Recent file restyled
- Thumbnail for Context menu made flexible
- Filenames on hover made all text visible
- Drag and drop arrow hidden for unsupported browsers
- Drag and drop styled applied on edit profile
- Yui3 panel focused removed

10 years agoMDL-31901 fixed forgotten overwrite dialogue in filepicker
Marina Glancy [Wed, 16 May 2012 07:05:14 +0000 (15:05 +0800)]
MDL-31901 fixed forgotten overwrite dialogue in filepicker

10 years agoMDL-32867 filemanager and repository
Dongsheng Cai [Wed, 16 May 2012 06:08:37 +0000 (14:08 +0800)]
MDL-32867 filemanager and repository

1. Allowing "." as filename, so filemanager can rename folder
2. Fixed import_external_file method
3. Disallow recent repository to list file references

10 years agoMDL-32867: changed renaming of folders to the new API (function 'rename'), removed...
Marina Glancy [Wed, 16 May 2012 02:07:01 +0000 (10:07 +0800)]
MDL-32867: changed renaming of folders to the new API (function 'rename'), removed unused code

10 years agoMDL-33015 fix invalid PAGE->url in repo instance config pages
Petr Skoda [Wed, 16 May 2012 00:46:43 +0000 (08:46 +0800)]
MDL-33015 fix invalid PAGE->url in repo instance config pages

Conflicts:

admin/repositoryinstance.php

10 years agoMDL-33015 revert form actions to default back to FULLME
Petr Skoda [Tue, 15 May 2012 13:22:31 +0000 (15:22 +0200)]
MDL-33015 revert form actions to default back to FULLME

This is a temporary workaround until we fix all admin pages to set up actual url properly in admin_externalpage_setup().

10 years agoMDL-31901 Implemented lazy loading of thumbnails in filemanager
Marina Glancy [Tue, 15 May 2012 06:20:31 +0000 (14:20 +0800)]
MDL-31901 Implemented lazy loading of thumbnails in filemanager

10 years agoMDL-28666 phpdoc improvements
Dongsheng Cai [Tue, 15 May 2012 03:10:04 +0000 (11:10 +0800)]
MDL-28666 phpdoc improvements

10 years agoMDL-32867 Display a list of references pointing to the file in filemanager
Marina Glancy [Tue, 15 May 2012 02:51:00 +0000 (10:51 +0800)]
MDL-32867 Display a list of references pointing to the file in filemanager

10 years agoMDL-31901 Styled File Manager Icon view, Table view and Tree view
Barbara Ramiro [Mon, 14 May 2012 05:41:07 +0000 (13:41 +0800)]
MDL-31901 Styled File Manager Icon view, Table view and Tree view

10 years agoMDL-28666 file_storage::get_directory_files() supports references
Dongsheng Cai [Mon, 14 May 2012 07:22:26 +0000 (15:22 +0800)]
MDL-28666 file_storage::get_directory_files() supports references

10 years agoMDL-28666 Files API and db changes
Dongsheng Cai [Mon, 14 May 2012 06:17:30 +0000 (14:17 +0800)]
MDL-28666 Files API and db changes

1. Fix db regression
2. Unit tests for is_external_file() and rename exception
3. Searching reference method exclude draft files

10 years agoMDL-31901, MDL-28666 merged files API changes
Marina Glancy [Mon, 14 May 2012 03:53:18 +0000 (11:53 +0800)]
MDL-31901, MDL-28666 merged files API changes

10 years agoMDL-31901 draft files manager supports realthumbnail, realicon and dimensions for...
David Mudrak [Sat, 12 May 2012 14:24:11 +0000 (16:24 +0200)]
MDL-31901 draft files manager supports realthumbnail, realicon and dimensions for images

10 years agoMDL-31901 draftfile.php supports the preview parameter
David Mudrak [Sat, 12 May 2012 14:20:40 +0000 (16:20 +0200)]
MDL-31901 draftfile.php supports the preview parameter

10 years agoMDL-31901 fixed the name of user draft file serving handler
David Mudrak [Thu, 10 May 2012 07:46:44 +0000 (09:46 +0200)]
MDL-31901 fixed the name of user draft file serving handler

Files stored in user context, draft are must be served by draftfile.php,
not the pluginfile.php.

10 years agoMDL-31901 repositories serving images from the filepool now provide preview details
David Mudrak [Thu, 10 May 2012 04:12:24 +0000 (06:12 +0200)]
MDL-31901 repositories serving images from the filepool now provide preview details

10 years agoMDL-31901 file_info_stored now provides access to the wrapped stored_file's get_image...
David Mudrak [Thu, 10 May 2012 02:09:25 +0000 (04:09 +0200)]
MDL-31901 file_info_stored now provides access to the wrapped stored_file's get_imageinfo() method

10 years agoMDL-32914 fixed function get_imageinfo() to get rid of notice messages
Marina Glancy [Fri, 11 May 2012 01:30:23 +0000 (09:30 +0800)]
MDL-32914 fixed function get_imageinfo() to get rid of notice messages

10 years agoMDL-32867 Working with external references in filemanager
Marina Glancy [Thu, 10 May 2012 08:00:46 +0000 (16:00 +0800)]
MDL-32867 Working with external references in filemanager

- Files that are references to external resources have special shortcut icon in filemanager
- When user selects a REF file in filemanager, he can see the 'Original' of the file in the way that original repository wants to show it, it is loaded dynamically via AJAX request
- Files that are themselves the source of references of other files in the system have 'link' icon in filemanager. When user tries to remove/rename/overwrite SRC file he is warned that all ## existing references will be updated/converted to copies.
- Changed confirmation messages for deleting, moving/renaming of the folders
- confirmation dialog in filemanager is using YUI3 now

10 years agoMDL-31901 filepicker interface changes:
Marina Glancy [Thu, 10 May 2012 07:20:09 +0000 (15:20 +0800)]
MDL-31901 filepicker interface changes:

- fixed displaying and dragging of dialog popups;
- fixed error when repository results are filtered;
- added string for image dimensions

10 years agoMDL-31901: moved select-file panel outside of filepicker/filemanager for better UI
Marina Glancy [Wed, 9 May 2012 03:25:14 +0000 (11:25 +0800)]
MDL-31901: moved select-file panel outside of filepicker/filemanager for better UI

10 years agoMDL-31901,MDL-28666: add support for external references in new filepicker design
Marina Glancy [Wed, 9 May 2012 03:03:06 +0000 (11:03 +0800)]
MDL-31901,MDL-28666: add support for external references in new filepicker design

10 years agoMDL-31901: filemanger: fixed bug with switching to treeview in empty folder
Marina Glancy [Mon, 7 May 2012 03:03:23 +0000 (11:03 +0800)]
MDL-31901: filemanger: fixed bug with switching to treeview in empty folder

10 years agoMDL-31901: filemanager: fixed 'Original' label, and small bug in treeview navigation
Marina Glancy [Mon, 7 May 2012 02:32:27 +0000 (10:32 +0800)]
MDL-31901: filemanager: fixed 'Original' label, and small bug in treeview navigation

10 years agoMDL-31901: Filemanager and Filepicker, cleaned up requirements and strings
Marina Glancy [Fri, 4 May 2012 08:46:41 +0000 (16:46 +0800)]
MDL-31901: Filemanager and Filepicker, cleaned up requirements and strings

10 years agoMDL-31901: Highlighting main file in FileManager
Marina Glancy [Fri, 4 May 2012 08:09:26 +0000 (16:09 +0800)]
MDL-31901: Highlighting main file in FileManager

10 years agoMDL-31901: Updating/moving files in FileManager
Marina Glancy [Fri, 4 May 2012 05:26:10 +0000 (13:26 +0800)]
MDL-31901: Updating/moving files in FileManager

- added new functions to the backend (repository/draftfiles_ajax.php) to allow changing of file name, location, license and author in one request
- enabled changing file properties using JS UI (lib/form/filemanager.js)

10 years agoMDL-31901: FileManager uses more YUI3 windows and more renderers
Marina Glancy [Thu, 3 May 2012 08:53:44 +0000 (16:53 +0800)]
MDL-31901: FileManager uses more YUI3 windows and more renderers

- Add folder dialog in FileManager now uses YUI3 and renderer;
- Fixed bug with remembering current folder in Tree view;
- Display error messages in FileManager using YUI3 and not using 'alert'

10 years agoMDL-31901: FileManager, added image for accessing right-click action
Marina Glancy [Thu, 3 May 2012 07:14:59 +0000 (15:14 +0800)]
MDL-31901: FileManager, added image for accessing right-click action

10 years agoMDL-31901: removed accidentally commited testing code
Marina Glancy [Wed, 2 May 2012 08:03:38 +0000 (16:03 +0800)]
MDL-31901: removed accidentally commited testing code

10 years agoMDL-31901: Change the UI in filepicker CSS rendered and images
Barbara Ramiro [Wed, 2 May 2012 07:35:50 +0000 (15:35 +0800)]
MDL-31901: Change the UI in filepicker CSS rendered and images

10 years agoMDL-31901: Allow FileManager to re-use FilePicker JS code for view modes:
Marina Glancy [Wed, 2 May 2012 06:59:09 +0000 (14:59 +0800)]
MDL-31901: Allow FileManager to re-use FilePicker JS code for view modes:

- when loading core_filepicker we extend the Node element with functions necessary to display files list in different view modes;
- repository/filepicker.js is changed to use those functions;
- FileManager now has three different view modes (icon view, tree view and table view), JS code is re-used from FilePicker;
- files in FileManager no longer have context menu, they have one popup Widget with different actions instead;
- Added more templates for JS code to FileManager, use similar CSS class names as FilePicker;
- lib/filelib.php : fixed double slashes in path, return more data about files;
- lib/form/filemanager.php : pass information to FileManager about available licenses and default author;
- repository/draftfiles_ajax.php : return information about directory tree for file moving UI in FileManager, return formatted information;
- repository/lib.php : function repository::prepare_listing() now can work also with draftarea files listing;

10 years agoMDL-31901: moved filepicker html to files/renderer.php, pass templates once per page
Marina Glancy [Thu, 26 Apr 2012 07:28:53 +0000 (15:28 +0800)]
MDL-31901: moved filepicker html to files/renderer.php, pass templates once per page

10 years agoMDL-31901: user renderer for filemanager, decrease html generation in filemanager...
Marina Glancy [Thu, 26 Apr 2012 03:53:52 +0000 (11:53 +0800)]
MDL-31901: user renderer for filemanager, decrease html generation in filemanager.js and dndupload.js

10 years agoMDL-31901: show shorttile instead of title where applicable
Marina Glancy [Tue, 24 Apr 2012 05:17:36 +0000 (13:17 +0800)]
MDL-31901: show shorttile instead of title where applicable

10 years agoMDL-32473,MDL-32471: Lazy loading of next page and image thumbnails when scrolling
Marina Glancy [Tue, 24 Apr 2012 03:09:18 +0000 (11:09 +0800)]
MDL-32473,MDL-32471: Lazy loading of next page and image thumbnails when scrolling

10 years agoMDL-31901: Simple loading of the next page, migrating to YUI 3.5.0
Marina Glancy [Mon, 23 Apr 2012 06:41:00 +0000 (14:41 +0800)]
MDL-31901: Simple loading of the next page, migrating to YUI 3.5.0

- instead of using paging bar and navigating between pages, there is a link 'more' in the bottom of the list that loads the files from the next page and adds them to the bottom of the list;
- DataTable is updated to YUI 3.5.0, sorting is done properly

10 years agoMDL-31901: Changing interface of file picker, use renderers:
Marina Glancy [Thu, 19 Apr 2012 02:40:21 +0000 (10:40 +0800)]
MDL-31901: Changing interface of file picker, use renderers:

- Filepicker window is now resizable and draggable;
- filepicker&renderer: removed id substitution from renderer, replaced it with classes (better readability);
- filepicker: allowed tree and table view for search results;
- filepicker: fixed small bug with displaying external link checkbox
- filepicker: display additional information about file in select window, repository returns more formatted information

10 years agoMDL-14636: Support table view in Filepicker, provide more info about files
Marina Glancy [Tue, 17 Apr 2012 06:20:20 +0000 (14:20 +0800)]
MDL-14636: Support table view in Filepicker, provide more info about files

- Added table view in Filepicker where for each file we show Name, Last modified, Size and Type. Sortable by column
- Preprocess list of files returned from repositories to include formatted size, dates, type and also add filetype icon
- Make sure that local repositories (coursefiles, filesystem, local, recent, user) return information about file size, datemodified, datecreated, author, license

10 years agoMDL-32083: Filepicker tree view should display folders starting from top
Marina Glancy [Thu, 12 Apr 2012 07:16:57 +0000 (15:16 +0800)]
MDL-32083: Filepicker tree view should display folders starting from top

 - path bar is not displayed in tree view mode
 - display (and load) hierarchy of folders above the current - take it from path and load siblings
 - make sure the current folder is remembered when navigating between folders in tree view so it remains when switching to other view mode
 - fix couple of small bugs caused by previous changes in MDL-31901

10 years agoMDL-31901: Modifying filepicker to use renderers
Marina Glancy [Wed, 11 Apr 2012 02:05:25 +0000 (10:05 +0800)]
MDL-31901: Modifying filepicker to use renderers

- fixed some small errors and made cosmetic changes to the code
- added 'loading' icon when selecting a file
- finished population of login form, added support for radio elements there

10 years agoMDL-31901: Filepicker: Moved HTML for loginform into renderer
Marina Glancy [Fri, 30 Mar 2012 06:38:45 +0000 (14:38 +0800)]
MDL-31901: Filepicker: Moved HTML for loginform into renderer

10 years agoMDL-31901: Introducing renderers for filepicker:
Marina Glancy [Fri, 30 Mar 2012 02:11:43 +0000 (10:11 +0800)]
MDL-31901: Introducing renderers for filepicker:

- create repository renderer, implement functions for returning HTML templates used in filepicker
- let filepicker use HTML from templates
- move CSS for filemanager and filepicker to the separate css file in base theme
- use only YUI3 in filepicker (get rid of YUI2)
- add button for 'View details' in filepicker (though this view mode is still not ready)

10 years agoMDL-31901: brushing the filepicker code
Marina Glancy [Mon, 26 Mar 2012 03:19:36 +0000 (11:19 +0800)]
MDL-31901: brushing the filepicker code

- use the same function for displaying request result for list/search/login/logout commands since sometimes we can not predict what kind of result is going to be returned
- prevent default behaviour for links, so ### does not appear in URL
- use flag issearchresult as received in the response from repository because we can't guess it right sometimes
- do not make excessive AJAX request when user switches to list view

10 years agoMDL-28666 Extends repository to support references
Dongsheng Cai [Fri, 11 May 2012 20:14:53 +0000 (04:14 +0800)]
MDL-28666 Extends repository to support references

1. Allow repository to create references to external contents
2. Extends files API to handle file references
3. Generic file caching
4. Backup/restore file references
5. Download external contents if repository uninstalled
6. Allow filepicker to display iframe
7. PHPUnit test suits

10 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Sat, 19 May 2012 10:24:31 +0000 (12:24 +0200)]
weekly release 2.3dev

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Sat, 19 May 2012 10:17:09 +0000 (12:17 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years agoAutomatically generated installer lang files
AMOS bot [Sat, 19 May 2012 00:31:42 +0000 (00:31 +0000)]
Automatically generated installer lang files

10 years agoMDL-32005 Avoid some notices restoring old backup files without idnumber
Eloy Lafuente (stronk7) [Fri, 18 May 2012 11:02:30 +0000 (13:02 +0200)]
MDL-32005 Avoid some notices restoring old backup files without idnumber

10 years agoMerge branch 'MDL-30617-master-patches' of git://git.luns.net.uk/moodle
Dan Poltawski [Fri, 18 May 2012 09:40:33 +0000 (17:40 +0800)]
Merge branch 'MDL-30617-master-patches' of git://git.luns.net.uk/moodle

10 years agoMDL-32126 replaced _order with sortorder to make sorting work in oracle
Adrian Greeve [Fri, 18 May 2012 08:39:53 +0000 (16:39 +0800)]
MDL-32126 replaced _order with sortorder to make sorting work in oracle

10 years agoMDL-30617 Center dialogue title
Andrew Robert Nicols [Fri, 18 May 2012 09:28:53 +0000 (10:28 +0100)]
MDL-30617 Center dialogue title

10 years agoMDL-30617 Adjustments to styling of module chooser
Andrew Robert Nicols [Fri, 18 May 2012 08:55:04 +0000 (09:55 +0100)]
MDL-30617 Adjustments to styling of module chooser

These changes fix several points and suggested changes:
* increase the size of the help popup to 800x600
* fix issues with centering of the dialogue
* swap next/cancel buttons
* convert next button to use string for 'Add'
* convert add text to 'Add an activity or resource'

10 years agoMDL-32727 - quiz: fix incorrect variable name in upgrade
Dan Poltawski [Fri, 18 May 2012 07:08:07 +0000 (15:08 +0800)]
MDL-32727 - quiz: fix incorrect variable name in upgrade

10 years agoMDL-24419 section availability: display availability info to teachers
Dan Poltawski [Fri, 18 May 2012 06:56:00 +0000 (14:56 +0800)]
MDL-24419 section availability: display availability info to teachers

10 years agoMDL-30617 lang: improve mod chooser strings
Dan Poltawski [Fri, 18 May 2012 04:46:13 +0000 (12:46 +0800)]
MDL-30617 lang: improve mod chooser strings

10 years agoMerge branch 'MDL-33048' of git://github.com/timhunt/moodle
Dan Poltawski [Fri, 18 May 2012 04:12:51 +0000 (12:12 +0800)]
Merge branch 'MDL-33048' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-32727' of git://github.com/timhunt/moodle
Sam Hemelryk [Fri, 18 May 2012 04:07:20 +0000 (16:07 +1200)]
Merge branch 'MDL-32727' of git://github.com/timhunt/moodle

Conflicts:
mod/quiz/db/upgrade.php

10 years agoMerge branch 'MDL-32933' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Fri, 18 May 2012 03:23:47 +0000 (11:23 +0800)]
Merge branch 'MDL-32933' of git://github.com/netspotau/moodle-mod_assign

10 years agoMerge branch 'w20_MDL-32868_m23_iplookup' of git://github.com/skodak/moodle
Dan Poltawski [Fri, 18 May 2012 03:05:28 +0000 (11:05 +0800)]
Merge branch 'w20_MDL-32868_m23_iplookup' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Fri, 18 May 2012 02:30:22 +0000 (10:30 +0800)]
Merge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-32535-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Fri, 18 May 2012 02:28:19 +0000 (10:28 +0800)]
Merge branch 'MDL-32535-master' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-32909' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Fri, 18 May 2012 02:05:32 +0000 (10:05 +0800)]
Merge branch 'MDL-32909' of git://github.com/netspotau/moodle-mod_assign

10 years agoAutomatically generated installer lang files
AMOS bot [Fri, 18 May 2012 00:31:47 +0000 (00:31 +0000)]
Automatically generated installer lang files

10 years agoMerge branch 'MDL-33069' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Thu, 17 May 2012 22:48:23 +0000 (10:48 +1200)]
Merge branch 'MDL-33069' of git://github.com/danpoltawski/moodle

10 years agoMDL-32941 Add transaction support to delete_categories
Eloy Lafuente (stronk7) [Thu, 17 May 2012 22:06:42 +0000 (00:06 +0200)]
MDL-32941 Add transaction support to delete_categories

10 years agoMDL-32941 Reorganise functions a bit
Eloy Lafuente (stronk7) [Thu, 17 May 2012 20:13:28 +0000 (22:13 +0200)]
MDL-32941 Reorganise functions a bit

10 years agoMerge branch 'MDL-32941' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Thu, 17 May 2012 20:35:57 +0000 (22:35 +0200)]
Merge branch 'MDL-32941' of git://github.com/mouneyrac/moodle

Conflicts:
course/externallib.php
lib/db/services.php
version.php

10 years agoMDL-30617 modchoser: minor tweaks
Dan Poltawski [Thu, 17 May 2012 15:35:14 +0000 (23:35 +0800)]
MDL-30617 modchoser: minor tweaks

* Change markup way from 'activity module style' to its own markup
* Remove 'a new' from the 'add an activity' string
* Remove the 'personalisation' from the nohelp lang string

10 years agoMDL-30617 Add a javascript interface for adding modules to a course
Andrew Robert Nicols [Fri, 25 Nov 2011 10:20:34 +0000 (10:20 +0000)]
MDL-30617 Add a javascript interface for adding modules to a course

This interface allows for additional metadata, such as the module's help
and icon, to be displayed.

10 years agoMDL-32925 lang: Add extended help texts for all modules
Helen Foster [Mon, 14 May 2012 15:56:09 +0000 (16:56 +0100)]
MDL-32925 lang: Add extended help texts for all modules

Thanks to Mary Cooch & Martin Dougiamas who contributed to this
rewording.

AMOS BEGIN
   REM These module help texts are going to be displayed more prominently in the Moodle interface
AMOS END

10 years agoMDL-33048 quiz / my moodle: fatal error due to missing include.
Tim Hunt [Thu, 17 May 2012 09:58:29 +0000 (10:58 +0100)]
MDL-33048 quiz / my moodle: fatal error due to missing include.

10 years agoMerge branch 'MDL-33025-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Thu, 17 May 2012 13:19:37 +0000 (21:19 +0800)]
Merge branch 'MDL-33025-master-1' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-33073-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Thu, 17 May 2012 13:04:30 +0000 (21:04 +0800)]
Merge branch 'MDL-33073-master-1' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-24419' of git://github.com/danpoltawski/moodle
Dan Poltawski [Thu, 17 May 2012 12:46:21 +0000 (20:46 +0800)]
Merge branch 'MDL-24419' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Thu, 17 May 2012 12:45:37 +0000 (20:45 +0800)]
Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle

10 years agoMDL-24419 Fix bug with section creation for new courses
sam marshall [Thu, 17 May 2012 12:37:33 +0000 (13:37 +0100)]
MDL-24419 Fix bug with section creation for new courses

10 years agoMDL-33073 Fix application of toolbox JS for drag/dropped content
Andrew Robert Nicols [Thu, 17 May 2012 10:49:53 +0000 (11:49 +0100)]
MDL-33073 Fix application of toolbox JS for drag/dropped content

10 years agoMDL-33069 assignment: change pluralname to (2.2)
Dan Poltawski [Thu, 17 May 2012 09:26:50 +0000 (17:26 +0800)]
MDL-33069 assignment: change pluralname to (2.2)

10 years agoMerge branch 'MDL-32087' of git://github.com/timhunt/moodle
Aparup Banerjee [Thu, 17 May 2012 09:17:37 +0000 (17:17 +0800)]
Merge branch 'MDL-32087' of git://github.com/timhunt/moodle

10 years agoMerge branch 'w20_MDL-33016_m23_hubperf' of git://github.com/skodak/moodle
Aparup Banerjee [Thu, 17 May 2012 08:57:01 +0000 (16:57 +0800)]
Merge branch 'w20_MDL-33016_m23_hubperf' of git://github.com/skodak/moodle

10 years agoMerge branch 'wip-mdl-32866' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Thu, 17 May 2012 08:48:07 +0000 (16:48 +0800)]
Merge branch 'wip-mdl-32866' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'w20_MDL-32907_m23_like' of git://github.com/skodak/moodle
Aparup Banerjee [Thu, 17 May 2012 06:47:44 +0000 (14:47 +0800)]
Merge branch 'w20_MDL-32907_m23_like' of git://github.com/skodak/moodle

10 years agoMerge branch 'w20_MDL-29054_m23_sqlsrvdbt' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 06:33:42 +0000 (14:33 +0800)]
Merge branch 'w20_MDL-29054_m23_sqlsrvdbt' of git://github.com/skodak/moodle

10 years agoMerge branch 'w20_MDL-32967_m23_sqlsrvstrings' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 06:30:30 +0000 (14:30 +0800)]
Merge branch 'w20_MDL-32967_m23_sqlsrvstrings' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-31814' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 17 May 2012 06:11:14 +0000 (14:11 +0800)]
Merge branch 'MDL-31814' of git://github.com/timhunt/moodle

10 years agoMDL-32941 fix criteriaerror exception code + wrong phpdoc scope
Jerome Mouneyrac [Thu, 17 May 2012 05:36:40 +0000 (13:36 +0800)]
MDL-32941 fix criteriaerror exception code + wrong phpdoc scope

10 years agoMerge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 04:35:45 +0000 (12:35 +0800)]
Merge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle

10 years agoMDL-24419: redirect_if_major_upgrade_required version update
Dan Poltawski [Thu, 17 May 2012 03:57:12 +0000 (11:57 +0800)]
MDL-24419: redirect_if_major_upgrade_required version update

The conditional topics changes need users to go to /admin/index.php

10 years agoMerge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 03:29:04 +0000 (11:29 +0800)]
Merge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-24419' of git://github.com/stronk7/moodle
Dan Poltawski [Thu, 17 May 2012 03:19:02 +0000 (11:19 +0800)]
Merge branch 'MDL-24419' of git://github.com/stronk7/moodle

10 years agoMerge branch 'MDL-32337-uptodate' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Thu, 17 May 2012 02:55:21 +0000 (14:55 +1200)]
Merge branch 'MDL-32337-uptodate' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-31850-master' of https://github.com/mackensen/moodle
Sam Hemelryk [Thu, 17 May 2012 02:49:03 +0000 (14:49 +1200)]
Merge branch 'MDL-31850-master' of https://github.com/mackensen/moodle

10 years agoFix codecheck/moodlechecker errors
Jerome Mouneyrac [Fri, 11 May 2012 06:37:59 +0000 (14:37 +0800)]
Fix codecheck/moodlechecker errors

10 years agoMDL-32941 change category name limit from 30 to 255
Jerome Mouneyrac [Fri, 11 May 2012 04:33:17 +0000 (12:33 +0800)]
MDL-32941 change category name limit from 30 to 255

10 years agoMDL-32941 Implement core_course_update_categories, add webform and unittests
Fábio Souto [Wed, 11 Apr 2012 14:28:07 +0000 (15:28 +0100)]
MDL-32941 Implement core_course_update_categories, add webform and unittests

Conflicts:

admin/webservice/testclient_forms.php
course/externallib.php
lib/db/services.php