3877 Commits

Author SHA1 Message Date
Sam Hemelryk
68a5f9c7ab Merge branch 'MDL-27800-23' of https://github.com/mackensen/moodle 2012-07-10 11:32:09 +12:00
Dan Poltawski
13ce630719 Merge branch 'w28_MDL-34046_m24_stalefiles' of git://github.com/skodak/moodle 2012-07-09 13:50:09 +08:00
Dan Poltawski
cfd5687407 Merge branch 'wip-mdl-33943' of git://github.com/rajeshtaneja/moodle 2012-07-09 11:34:46 +08:00
Petr Škoda
774c42a8d3 MDL-34046 improve mixed files upgrade error
Credit goes to Gordon Bateson.
2012-07-06 08:00:53 +02:00
Sam Hemelryk
78e43b866b Merge branch 'w27_MDL-34115_m24_arrayofarrayssort' of git://github.com/skodak/moodle 2012-07-03 15:15:07 +12:00
Rajesh Taneja
4387f13821 MDL-33943 tool_replace: Hardcoded strings replaced with lang strings 2012-07-02 15:15:58 +08:00
Sam Hemelryk
d75e8e3ac8 MDL-33521 css: Fixed invalid CSS in core CSS and plugin styles.css files 2012-07-02 11:34:44 +12:00
Petr Škoda
c82d309d07 MDL-34115 fix sorting in blocks admin UI
Comparison of arrays is not locale aware.
2012-06-30 08:33:34 +02:00
Charles Fulton
5eeb7c53d9 MDL-27800 admin: make front page restore link consistent 2012-06-29 11:13:51 -04:00
Aparup Banerjee
99c3c503e0 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:41:09 +08:00
Eloy Lafuente (stronk7)
84874400c5 MDL-33984 mysql: take rid of old unicode & mysql 4.1 message on error. 2012-06-25 15:48:24 +02:00
Eloy Lafuente (stronk7)
95bcc6e2d3 MDL-33984 mysql - raise min version to 5.1.33.
Because of http://bugs.mysql.com/bug.php?id=42758 and other benefits.
2012-06-25 12:32:25 +02:00
Aparup Banerjee
01158d86c4 Merge branch 'wip-MDL-33715-m23' of git://github.com/samhemelryk/moodle 2012-06-20 16:57:51 +08:00
Eloy Lafuente (stronk7)
7128d8fca2 MDL-32003 xmldb: Use action error for filemodified check instead of structure one (protected attr). 2012-06-20 02:04:02 +02:00
Eloy Lafuente (stronk7)
cb172822e5 Merge branch 'w25_MDL-32003_m23_dbcleanup' of git://github.com/skodak/moodle 2012-06-20 02:03:47 +02:00
Dan Poltawski
a80b5a0cf0 MDL-32908 - drop $USER->ajax
Its not been respected for some time and is just confusing
2012-06-19 15:07:18 +08:00
Sam Hemelryk
514d31c805 MDL-33715 css_optimiser: enablecssoptimiser setting now triggers theme_reset_all_caches when changed 2012-06-19 10:10:20 +12:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Petr Skoda
d8bf2a14b6 MDL-32003 last db related phpdocs cleanup commit 2012-06-17 22:56:30 +02:00
Petr Skoda
2edc3fecfb MDL-32003 fix broken table ordering and cleanup other xmldb ordering 2012-06-17 22:56:30 +02:00
Petr Skoda
85d6dd382e MDL-32003 fix xmldb editor code indentations, phpdocs and PHP4-isms 2012-06-17 22:56:29 +02:00
Dan Poltawski
eb6afd93b9 Merge branch 'wip-MDL-33597-m23' of git://github.com/samhemelryk/moodle 2012-06-13 15:45:19 +08:00
Rajesh Taneja
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
Sam Hemelryk
8f856cd041 MDL-33597 css_optimiser: Moved the Enable CSS optimiser setting from advanced to experimental settings 2012-06-12 14:23:20 +12:00
Sam Hemelryk
5dc4db1ef2 Merge branch 'MDL-33090-missing-xmldb-strings' of git://github.com/rlorenzo/moodle 2012-06-06 15:37:43 +12:00
Sam Hemelryk
9897974b82 Merge branch 'MDL-33511' of git://github.com/danpoltawski/moodle 2012-06-06 11:43:47 +12:00
Eloy Lafuente (stronk7)
080f585f39 Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle 2012-06-04 21:47:14 +02:00
Dan Poltawski
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
Dan Poltawski
d1546151e3 MDL-33511 admin/repositoryinstance.php: incorrect url 2012-06-04 15:26:21 +08:00
Dan Poltawski
7b61ac39d2 MDL-33507 - oauth2lib: switch 'code' to oauth2code
To avoid param collisions in future.
2012-06-04 11:25:19 +08:00
Dan Poltawski
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
Dan Poltawski
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
Petr Skoda
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
Sam Hemelryk
84ec16a861 Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle 2012-06-01 13:42:01 +12:00
Dan Poltawski
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
Aparup Banerjee
1adb060a87 Merge branch 'MDL-32329-all-plugins-ok' of git://github.com/mudrd8mz/moodle 2012-05-30 16:48:23 +08:00
David Mudrak
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
David Mudrak
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
David Mudrak
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
David Mudrak
f1753a5b10 MDL-32329 CLI install and upgrade scripts display plugins with unsatisfied dependencies 2012-05-30 10:35:28 +02:00
Aparup Banerjee
5eb80ab73d Merge branch 'MDL-33382-cli-install' of git://github.com/mudrd8mz/moodle 2012-05-29 16:43:39 +08:00
Dan Poltawski
038c47f6e7 Merge branch 'wip-mdl-33102' of git://github.com/rajeshtaneja/moodle 2012-05-29 16:10:59 +08:00
David Mudrak
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
Petr Skoda
716b50dc2c MDL-33001 improve error handling in mysql engine conversion tool and add listing of engines 2012-05-28 10:25:58 +02:00
Vadim Dvorovenko
5e963820a5 MDL-29836 webservices: use individual string
To allow accurate transalation
2012-05-25 10:33:02 +08:00
Dan Poltawski
de424071ca MDL-32895 tool_assignmentupgrade: fix trailing whitespace 2012-05-23 11:20:23 +08:00
Dan Poltawski
f310b16d80 Merge branch 'MDL-32895' of git://github.com/netspotau/moodle-mod_assign 2012-05-23 11:13:03 +08:00
Dan Poltawski
afe23ae76a Merge branch 'dev_MDL-33154_sesskey_error' of git://github.com/dongsheng/moodle 2012-05-22 13:57:51 +08:00
Dan Poltawski
d106cf1d7d Merge branch 'w21_MDL-32564_m23_timezonecontext' of git://github.com/skodak/moodle 2012-05-22 13:34:18 +08:00
Dongsheng Cai
7992b93686 MDL-33154 added missing sesskey to navgation nodes 2012-05-22 12:14:59 +08:00