Petr Škoda
4549385e04
MDL-36457 remove GPL incompatible JSMin.php
...
Credit goes to Hubert Chathi, thanks!
2012-11-09 13:30:32 +01:00
Dan Poltawski
ae8e5057f4
weekly release 2.4dev
2012-11-09 17:56:42 +08:00
Dan Poltawski
cd1a9d05e8
Revert "MDL-35556 completion: Improve user completion data permission checking"
...
This reverts commit f493d528c2
.
2012-11-09 16:50:09 +08:00
Dan Poltawski
d2dc4c4551
Merge branch 'w45_MDL-36468_m24_tinymce' of git://github.com/skodak/moodle
2012-11-09 15:54:46 +08:00
Petr Škoda
657e6b8199
MDL-36468 fix remaining zIndexes and some { weirdness
...
I had to reimport all files and search&replace the zIndexes, it is better to not use editor for this.
2012-11-09 08:39:14 +01:00
Sam Hemelryk
db0a71d699
MDL-34342 cache: fixed issue within string cache key
2012-11-09 10:48:39 +08:00
David Mudrák
0daa642894
MDL-35238 Inform the admin if the update can not be deployed due to write permissions
2012-11-09 00:20:18 +01:00
David Mudrák
d80f80f386
MDL-35238 Do not check for write permissions when enabling the auto-deploy feature
...
It seems to be better to check for required permission later, when the
button to install the update is actually being displayed. Credit goes to
Dan Poltawski for suggesting this.
2012-11-08 22:46:48 +01:00
David Mudrák
56c05088e5
MDL-35238 Accept $CFG->alternativeupdateproviderurl from config.php file only
...
There was a potential security risk that someone with access to the Moodle
database could update mdl_config table and use it as a vector to
install malicious code on the server.
Credit goes to Dan Poltawski for raising this.
2012-11-08 22:33:08 +01:00
David Mudrák
dc11af1903
MDL-35238 Add support for explicit singleton reset
...
This may be needed during PHPUnit testing.
2012-11-08 22:33:08 +01:00
David Mudrák
6b75106a75
MDL-35238 Compare the ZIP package content hash with the expected value
...
The expected value is returned as a part of available update info
(requires API version 1.1).
2012-11-08 22:33:07 +01:00
David Mudrák
85d7516313
MDL-35238 Fetch available updates using the 1.1 version of the API
...
If the stored response has still 1.0 version (which is expected during
the upgrade to 2.4), a debugging message is displayed. Added a string to
explain what's going on and how to recover from the state.
2012-11-08 22:33:07 +01:00
David Mudrák
08c3bc006d
MDL-35238 Warn the admin if they are about to overwrite a SCM checkout
2012-11-08 22:33:07 +01:00
David Mudrák
23137c4ac4
MDL-35238 Unzip the downloaded package and redirect to the upgrade page
2012-11-08 22:33:07 +01:00
David Mudrák
4c72f55516
MDL-35238 Fetch the package and store it in a temporary location
2012-11-08 22:33:07 +01:00
David Mudrák
3daedb5c5a
MDL-35238 Implement deployment authorization
...
The caller of the mdeploy.php utility is expected to create a file in
the data directory. The name of such file and the passphrase in it are
then sent to mdeploy.php as a part of the request. The submitted and
stored values are then compared.
2012-11-08 22:33:07 +01:00
David Mudrák
7683e550ac
MDL-35238 Introduce available_update_deployer class
...
This class represents the communication bridge from Moodle UI to the
(standalone) mdeploy.php utility. It consists of various helper methods
useful when dealing with user interface, update confirmation etc.
The class is implemented as a singleton. This allows us easily
transfer required data from top level scripts (like /admin/index.php)
into the rendering methods deep in the stack without the need to change
the API of many methods on the way.
2012-11-08 22:33:06 +01:00
David Mudrák
02fd7f47a9
MDL-35238 Add a new admin setting to enable updates deployment
2012-11-08 22:33:06 +01:00
Dan Poltawski
a56dc90320
Merge branch 'MDL-33766-master' of git://github.com/FMCorz/moodle
...
Conflicts:
version.php
2012-11-08 18:10:26 +08:00
Dan Poltawski
1b4d837a75
Merge branch 'MDL-35556c' of git://github.com/srynot4sale/moodle
2012-11-08 15:07:17 +08:00
Dan Poltawski
ee943e7311
MDL-36119 - fix trailing whitespace
2012-11-08 10:18:06 +08:00
Dan Poltawski
809c1bee49
Merge branch 'wip_master_mdl-36119_ldap_paged_results' of git://github.com/iarenaza/moodle
2012-11-08 09:48:36 +08:00
Dan Poltawski
650e6c7339
Merge branch 'MDL-36290-master' of git://github.com/FMCorz/moodle
2012-11-08 09:26:08 +08:00
Dan Poltawski
7164d2f68a
Merge branch 'w45_MDL-36194_m24_editoruninstall' of git://github.com/skodak/moodle
2012-11-08 08:52:25 +08:00
Mark Nelson
3774324174
MDL-33791 Portfolio: Fixed security issue with passing file paths.
2012-11-08 00:26:13 +01:00
Iñaki Arenaza
c090d7c90e
MDL-36119: auth_{ldap,cas}: LDAP Sync - implement paged results
...
Thanks to Jerome Charaoui for the original patch.
2012-11-07 19:13:10 +01:00
Petr Škoda
4f66c75f20
MDL-36194 add support for editor uninstallation
2012-11-07 13:02:21 +01:00
Frederic Massart
0f817d0d90
MDL-36290 usability: CSS post processing does not cancel SVG use
2012-11-07 17:29:20 +08:00
Dan Poltawski
4b5a6b1327
Merge branch 'wip-MDL-36317-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
course/format/lib.php
2012-11-07 16:41:53 +08:00
Dan Poltawski
64f7d154db
Merge branch 'wip-MDL-36113-master' of git://github.com/abgreeve/moodle
...
Conflicts:
lib/tests/csvclass_test.php
2012-11-07 15:40:06 +08:00
Adrian Greeve
13041f2125
MDL-36113 - lib: Unit tests for importing csv files with empty lines in the middle of the file.
2012-11-07 15:34:36 +08:00
Adrian Greeve
415a6ffcc8
MDL-36113 - lib: Importing csv entries with empty lines in the middle doesn't throw errors.
2012-11-07 15:34:29 +08:00
Dan Poltawski
53b6a75a99
Merge branch 'wip-MDL-35279-master' of git://github.com/marinaglancy/moodle
2012-11-07 14:44:26 +08:00
Dan Poltawski
8f3020558d
Merge branch 'wip-MDL-33017-m24-r2' of git://github.com/samhemelryk/moodle
2012-11-07 14:17:11 +08:00
Dan Poltawski
1383b1f29a
Merge branch 'wip-MDL-36365-master' of git://github.com/abgreeve/moodle
2012-11-07 14:09:25 +08:00
Adrian Greeve
1222dc52e1
MDL-36365 - lib: The csv class now reads tab separated files with tabs at the end of the file.
2012-11-07 14:02:39 +08:00
Dan Poltawski
e9641de10d
Merge branch 'w43_MDL-35771_m24_zindex' of git://github.com/skodak/moodle
2012-11-07 11:22:26 +08:00
Dan Poltawski
e830d6f98e
Merge branch 'wip-MDL-30921-m24' of git://github.com/samhemelryk/moodle
2012-11-07 10:51:06 +08:00
Dan Poltawski
1191881888
Merge branch 'wip-MDL-36120-m24' of git://github.com/samhemelryk/moodle
2012-11-07 10:49:28 +08:00
Dan Poltawski
a8ccdd28e0
Merge branch 'wip-MDL-36386-m24' of git://github.com/samhemelryk/moodle
...
Conflicts:
version.php
2012-11-07 09:33:47 +08:00
Sam Hemelryk
75af47ee1e
MDL-36386 cache: upgrades now trigger definitions to be updated
2012-11-07 10:42:20 +13:00
Sam Hemelryk
47834bcd41
MDL-36120 cache: now uses sha1 and has an option for simple keys
2012-11-07 10:03:32 +13:00
Sam Hemelryk
b9c87ef86a
MDL-33017 navigation: Tidied up after peer-review
2012-11-07 09:52:47 +13:00
Eloy Lafuente (stronk7)
086f5f9ea8
MDL-35762 whitespace fix
2012-11-06 17:03:57 +01:00
Eloy Lafuente (stronk7)
278714a012
MDL-35762 fix deprecated use of get_fast_modinfo() reset.
2012-11-06 16:37:43 +01:00
Eloy Lafuente (stronk7)
cd59310d1b
Merge branch 'MDL-35762_fix' of git://github.com/andyjdavis/moodle
2012-11-06 16:13:47 +01:00
Andrew Robert Nicols
a3b6da6dfc
MDL-36022 AJAX Remove shim on chooser dialogues
2012-11-06 13:48:01 +00:00
Dan Poltawski
87b210d98f
Merge branch 'w43_MDL-34915_m24_simpleyui' of git://github.com/skodak/moodle
2012-11-06 16:03:40 +08:00
Sam Hemelryk
468cc57297
MDL-34342 cache: Added missing include and fixed old lang manager setting
2012-11-06 17:24:20 +13:00
Dan Poltawski
cdf9b0c86f
Merge branch 'MDL-36266-notification-subject' of git://github.com/mudrd8mz/moodle
2012-11-06 11:59:24 +08:00