Commit graph

14829 commits

Author SHA1 Message Date
Tyler Bannister
dcb28e6e7f MDL-30643 - Fixed timezone problems in test cases.
resolved integration time changes conflict.
Conflicts:
	lib/tests/statslib_test.php
2012-11-13 13:58:31 +08:00
Dan Poltawski
b0ba493cd0 Merge branch 'MDL-30545' of git://github.com/timhunt/moodle 2012-11-13 13:21:50 +08:00
Tyler Bannister
67690cfa92 MDL-30643 - Fixed timezone problems in test cases. 2012-11-12 22:47:09 -05:00
Tyler Bannister
aa600c472c MDL-30643 - Added fifth table to speed up enrolment look ups. 2012-11-12 22:47:00 -05:00
Aparup Banerjee
9540a7d0b8 MDL-30643 statslib test - remove using $CFG->timezone=99 for unit test as it clashes with test data in other tz 2012-11-13 00:49:21 +08:00
Aparup Banerjee
7d2705568e MDL-30643 added tables to upgrade script 2012-11-12 15:50:19 +08:00
Aparup Banerjee
6b1a2e4a0d MDL-30643 fixed statslib test start timestamp 2012-11-12 14:46:23 +08:00
Aparup Banerjee
79fc5f5294 Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle 2012-11-12 14:29:45 +08:00
Matt Switlik
0a757cf033 MDL-36061 gradebook: grade_item->refresh_grades doesn't propagate $userid 2012-11-12 11:19:20 +08:00
Dan Poltawski
3c9b489820 Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle 2012-11-12 11:04:23 +08:00
Dan Poltawski
2d910d0464 Merge branch 'w46_MDL-36487_m24_ieheaders' of git://github.com/skodak/moodle 2012-11-12 10:30:36 +08:00
Iñaki Arenaza
b98dd3ff31 MDL-25736 TinyMce Spellchecker French issues
GoogleSpell checker already returns data un UTF8, so there's no need
to use utf8_encode (in fact, using it completely mangles the string).

All credit goes to David Quintal for finding the issue and proposing
the fix.
2012-11-10 19:41:48 +01:00
Petr Škoda
791922735f MDL-36487 do not use IE=edge header on pages that have custom X-UA-Compatible
Thanks Dan Poltawski for spotting this regression!
2012-11-10 11:47:09 +01:00
Marina Glancy
fdd4b9a50a MDL-36048 Allow course formats to add course headers and footers
- Added functions in class format_base
- Added global functions in course/lib.php
- Added calling of course header/footer functions to the base theme
- output renderer checks if theme calls the coures content header/footer functions, if not calls them explicitly and displays a development warning
2012-11-10 15:39:01 +08:00
Marina Glancy
3776335ce2 MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled 2012-11-10 15:34:29 +08:00
Tyler Bannister
63e0fe85b5 RFC-30643 - Added fifth table to speed up enrolment look ups. 2012-11-09 16:33:19 -05:00
Tyler Bannister
c0f00c5fba MDL-30643 - Added statslib test file.
- Tests daily stats and daily stats related functions.
2012-11-09 16:27:25 -05:00
Tyler Bannister
4614b02905 MDL-30643 - Added definition for new temporary table to install.xml.
- Added code to generate tempoary tables from existing standard tables where possible.
2012-11-09 16:27:23 -05:00
Tyler Bannister
0934f5c304 MDL-30643 - Added temporary tables to store the stats results until generation is complete. 2012-11-09 15:34:01 -05:00
Tyler Bannister
9c1600f10f MDL-30643 - Improved stats generation SQL queries.
- Added temporary log tables to reduce log search times.
          - Added additional output to weekly and monthly stat generation
2012-11-09 15:33:48 -05:00
Petr Škoda
398862b92b MDL-36487 send IE standards compatibility http headers 2012-11-09 17:27:29 +01:00
Petr Škoda
3c1405a1ee MDL-36481 improve IE version sniffing 2012-11-09 15:23:22 +01:00
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