eb6afd93b9
Merge branch 'wip-MDL-33597-m23' of git://github.com/samhemelryk/moodle
2012-06-13 15:45:19 +08:00
b0fc12189b
MDL-33664 Hub: required renderer is passed to backup->display and huburl is initalised before use.
2012-06-13 09:21:13 +08:00
8f856cd041
MDL-33597 css_optimiser: Moved the Enable CSS optimiser setting from advanced to experimental settings
2012-06-12 14:23:20 +12:00
5dc4db1ef2
Merge branch 'MDL-33090-missing-xmldb-strings' of git://github.com/rlorenzo/moodle
2012-06-06 15:37:43 +12:00
9897974b82
Merge branch 'MDL-33511' of git://github.com/danpoltawski/moodle
2012-06-06 11:43:47 +12:00
080f585f39
Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle
2012-06-04 21:47:14 +02:00
b3245b758c
Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle
...
Conflicts:
admin/index.php
admin/renderer.php
version.php
2012-06-04 19:25:58 +08:00
d1546151e3
MDL-33511 admin/repositoryinstance.php: incorrect url
2012-06-04 15:26:21 +08:00
7b61ac39d2
MDL-33507 - oauth2lib: switch 'code' to oauth2code
...
To avoid param collisions in future.
2012-06-04 11:25:19 +08:00
5df1b73748
MDL-33501 - oauth2lib: enforce sesskey in oauth2callback.php
...
The sesskey needs to be embeded in the local url returned as this is the
only parameter we have control of.
2012-06-04 11:11:38 +08:00
db7602af7c
MDL-33501 - oauth2lib: improve redirect url handling
...
Only accept PARAM_LOCALURL for state params and enforce
use of moodle_url param in oauthlib to facilitate that.
2012-06-04 10:57:39 +08:00
0aff15c2c9
MDL-33007 add workaround for broken iconv //IGNORE
...
This patch adds mbstring utf-8 cleanup fallback and admin warning if no utf-8 cleanup possible in user submitted data.
2012-06-01 12:23:09 +02:00
84ec16a861
Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle
2012-06-01 13:42:01 +12:00
469fb5d672
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/.
2012-05-31 00:00:23 +08:00
1adb060a87
Merge branch 'MDL-32329-all-plugins-ok' of git://github.com/mudrd8mz/moodle
2012-05-30 16:48:23 +08:00
e937c5456e
MDL-32329 fixed missing phpdoc and improved coding style
...
Credit goes to Aparup Banerjee for spotting this during the integration
review.
2012-05-30 10:35:28 +02:00
ead8ba3b63
MDL-32329 improved plugin dependencies check on upgrade
...
Previously, it was the renderer method that actually called
all_plugins_ok(). I believe that renderer methods should not be
responsible for such an important step in the install/upgrade code flow.
So dependencies are now checked by admin/index.php on upgrade, too.
2012-05-30 10:35:28 +02:00
39f15cc712
MDL-32329 check for plugin dependencies during the pre-install checking
...
This follows the same path as we have in CLI installers. Plugin
dependencies are checked right after the environment checks and the
install can't continue unless all dependencies are fixed.
2012-05-30 10:35:28 +02:00
f1753a5b10
MDL-32329 CLI install and upgrade scripts display plugins with unsatisfied dependencies
2012-05-30 10:35:28 +02:00
5eb80ab73d
Merge branch 'MDL-33382-cli-install' of git://github.com/mudrd8mz/moodle
2012-05-29 16:43:39 +08:00
038c47f6e7
Merge branch 'wip-mdl-33102' of git://github.com/rajeshtaneja/moodle
2012-05-29 16:10:59 +08:00
2da7fbc0c2
MDL-33382 CLI install and upgrade scripts display hint on --allow-unstable in non-interactive mode
2012-05-28 10:59:22 +02:00
716b50dc2c
MDL-33001 improve error handling in mysql engine conversion tool and add listing of engines
2012-05-28 10:25:58 +02:00
5e963820a5
MDL-29836 webservices: use individual string
...
To allow accurate transalation
2012-05-25 10:33:02 +08:00
de424071ca
MDL-32895 tool_assignmentupgrade: fix trailing whitespace
2012-05-23 11:20:23 +08:00
f310b16d80
Merge branch 'MDL-32895' of git://github.com/netspotau/moodle-mod_assign
2012-05-23 11:13:03 +08:00
afe23ae76a
Merge branch 'dev_MDL-33154_sesskey_error' of git://github.com/dongsheng/moodle
2012-05-22 13:57:51 +08:00
d106cf1d7d
Merge branch 'w21_MDL-32564_m23_timezonecontext' of git://github.com/skodak/moodle
2012-05-22 13:34:18 +08:00
7992b93686
MDL-33154 added missing sesskey to navgation nodes
2012-05-22 12:14:59 +08:00
2b1b897271
MDL-33102 blogs: userid will be added during blog visibility upgrade
2012-05-22 09:49:27 +08:00
49957d3858
MDL-28666 admin/repository: use PARAM_BOOL for booleans.
2012-05-21 18:21:25 +08:00
2b4f1cbc32
Merge branch 'wip-files23' of git://github.com/marinaglancy/moodle
2012-05-21 18:19:32 +08:00
5c50d45b79
Merge branch 'MDL-22504_drag_and_drop_upload_integration' of git://github.com/davosmith/moodle
2012-05-21 17:22:13 +08:00
1ddc3d1f4c
MDL-22504 Course drag and drop upload - experimental setting is now a checkbox
2012-05-21 10:03:55 +01:00
559276b153
MDL-32247,MDL-32831,MDL-32900 Use correct url building of file type icons
...
- function get_mimetypes_array() now contains also information about filetype groups and language strings
- use 'smart' human-readable mimetype description
- never determine filetype group based on filetype icon image! remove function mimeinfo_from_icon()
- get rid of class filetype_parser and file lib/filestorage/file_types.mm, replaced with functions file_get_typegroup(), file_extension_in_typegroup() and file_mimetype_in_typegroup()
- support multiple icon sizes, not only 16 and 32
- retrieve filetype icon only using proper functions file_..._icon() from lib/filelib.php throughout the code
- increase size of repository thumbnails to 90 and icons to 24 (will take effect when new icons exist)
2012-05-21 16:01:04 +08:00
f684250bda
MDL-22504 Course drag and drop upload - removed browser specific content hacks, made 'text and link' dragging an experimental feature
2012-05-21 08:34:50 +01:00
9bd553b7b8
MDL-33015 fix invalid PAGE->url in repo instance config pages
...
Conflicts:
admin/repositoryinstance.php
2012-05-21 11:57:55 +08:00
6723372514
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
2012-05-21 11:57:51 +08:00
ae11631886
MDL-33090 - Missing strings in XMLDB editor - added in missing strings
2012-05-19 21:27:38 -07:00
fb1ec806c5
MDL-32564 fix admin/timezone.php page setup
2012-05-19 18:52:58 +02:00
754c2deab6
Merge branch 'MDL-32941' of git://github.com/mouneyrac/moodle
...
Conflicts:
course/externallib.php
lib/db/services.php
version.php
2012-05-17 22:35:57 +02:00
331a8feecf
Merge branch 'w20_MDL-29054_m23_sqlsrvdbt' of git://github.com/skodak/moodle
2012-05-17 14:33:42 +08:00
2bdafb867a
Merge branch 'MDL-32337-uptodate' of git://github.com/mudrd8mz/moodle
2012-05-17 14:55:21 +12:00
d6ebe011b6
Fix codecheck/moodlechecker errors
2012-05-17 10:35:05 +08:00
f2229c6895
MDL-32941 Implement core_course_update_categories, add webform and unittests
...
Conflicts:
admin/webservice/testclient_forms.php
course/externallib.php
lib/db/services.php
2012-05-17 10:34:59 +08:00
2f951d866a
MDL-32941 Added service definition and implementation for core_course_delete_categories()
...
Included is a bug correction to categories_delete_move() which does not
respect showfeedback parameter, printing feedback even when not wanted
(this breaks the webservice output)
Conflicts:
admin/webservice/testclient_forms.php
lib/db/services.php
2012-05-17 10:34:03 +08:00
be05180890
MDL-32941 complete unit tests and webform
2012-05-17 10:33:56 +08:00
1220843c02
Merge branch 'MDL-32610-hide-updates' of git://github.com/mudrd8mz/moodle
2012-05-17 12:30:44 +12:00
ba94f1d503
Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle
2012-05-16 13:09:32 +12:00
cb1c329186
MDL-32337 admin notifications page checks for the recent updates fetch timestamp
...
Now the message 'Your Moodle code is up-to-date!' is displayed only if
the fetch was done within the last hour. Otherwise, just the button
'Check for available updates' is displayed.
2012-05-15 16:59:45 +02:00
Dan Poltawski