Commit graph

57366 commits

Author SHA1 Message Date
Dan Poltawski
59d332ea71 Merge branch 'MDL-36494-invalid-update-debugging' of git://github.com/mudrd8mz/moodle 2012-11-14 08:31:29 +08:00
Dan Poltawski
5f7b0f2bdc MDL-30545 messaging - remove DISTINCT from union statement 2012-11-13 22:34:36 +08:00
David Mudrák
a22de4ce99 MDL-36494 Do not display a debugging message about invalid update info
It turned out that this well-meant debugging message just caused a lot
of false alarm with no good reason. It seems to be better just ignore it
at the moment.
2012-11-13 11:24:55 +01:00
Dan Poltawski
5c4685f0ad MDL-30545 - messagelib: use $DB->sql_concat() 2012-11-13 15:11:14 +08:00
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
4f64267994 Merge branch 'w46_MDL-36169_m24_enrolsort' of git://github.com/skodak/moodle 2012-11-13 13:40:18 +08:00
Dan Poltawski
b0ba493cd0 Merge branch 'MDL-30545' of git://github.com/timhunt/moodle 2012-11-13 13:21:50 +08:00
Dan Poltawski
47e126569d Merge branch 'MDL-36509' of git://github.com/netspotau/moodle-mod_assign 2012-11-13 13:04:14 +08:00
Dan Poltawski
0da9003a45 Merge branch 'wip-MDL-36398-master' of git://github.com/barbararamiro/moodle 2012-11-13 12:57:30 +08:00
Damyon Wiese
61cf325300 MDL-36509: Assignment grading table rownum offset is wrong by one. 2012-11-13 09:58:08 +08: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
Dan Poltawski
8eb1180269 MDL-35260 - fix trailing whitespace 2012-11-12 11:07:19 +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
05f2bdea31 Merge branch 'MDL-35422-workshop-submit-button' of git://github.com/mudrd8mz/moodle 2012-11-12 10:36:16 +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
Dan Poltawski
62471f8256 Merge branch 'wip-MDL-36111-m24' of git://github.com/samhemelryk/moodle 2012-11-12 10:26:29 +08:00
Dan Poltawski
9cb2b61621 Merge branch 'w46_MDL-36481_m24_intranetie' of git://github.com/skodak/moodle 2012-11-12 10:17:34 +08:00
Dan Poltawski
529af38e0e Merge branch 'wip-MDL-36450-master' of git://github.com/barbararamiro/moodle
Conflicts:
	pix/help.png
	pix/help.svg
	pix/i/outcomes.png
	pix/i/outcomes.svg
2012-11-12 10:10:30 +08:00
Sam Hemelryk
758dbdf894 MDL-36111 cache: Fixed up typo's and trivial issues 2012-11-12 10:36:53 +13: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
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
8975ff88cb MDL-36169 fix enrolled users sorting by alphanumerical column
Credit goes to Nicholas Koeppen, thanks!
2012-11-09 19:47:35 +01: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
Dan Poltawski
8ccaa296fa Moodle release 2.4beta 2012-11-09 18:49:38 +08:00
Dan Poltawski
ae8e5057f4 weekly release 2.4dev 2012-11-09 17:56:42 +08:00
Dan Poltawski
c00804c66a Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2012-11-09 17:52:55 +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
Dan Poltawski
afa23468e9 MDL-36119 - enrol_ldap: fix php error 2012-11-09 14:38:32 +08:00
Barbara Ramiro
9dbb2323c9 MDL-36450 Usability: New svg and png icons for Filters and revised Outcomes and Help icons 2012-11-09 14:24:44 +08:00
Aparup Banerjee
6c4e886426 Merge branch 'WIP-MDL-35512' of git://github.com/nadavkav/moodle 2012-11-09 14:16:15 +08:00
Aparup Banerjee
97bf72055d Merge branch 'MDL-35510_master' of git://github.com/lazydaisy/moodle 2012-11-09 14:09:11 +08:00
Dan Poltawski
8ca0746296 Merge branch 'wip-MDL-36324-m24' of git://github.com/samhemelryk/moodle 2012-11-09 13:43:37 +08:00
Dan Poltawski
224186339e Merge branch 'MDL-34572_accessibility' of git://github.com/rwijaya/moodle 2012-11-09 12:00:47 +08:00
Sam Hemelryk
f1d29cf516 MDL-36324 cache: Fixed incorrect get_string component 2012-11-09 16:58:51 +13:00
Rossiani Wijaya
de471f375b MDL-34572 alfresco repository: add accesshide class to workspace's label 2012-11-09 11:55:24 +08:00
Sam Hemelryk
db0a71d699 MDL-34342 cache: fixed issue within string cache key 2012-11-09 10:48:39 +08:00
Aparup Banerjee
1f9041e42a Merge branch 'WIP-MDL-35566' of git://github.com/nadavkav/moodle 2012-11-09 10:33:26 +08:00
Dan Poltawski
2f1904f811 Merge branch 'MDL-35238-deployment' of git://github.com/mudrd8mz/moodle 2012-11-09 10:30:55 +08:00
Aparup Banerjee
553cc78952 Merge branch 'MDL-35571_master' of git://github.com/lazydaisy/moodle 2012-11-09 10:27:11 +08:00