mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-13 12:10:34 +01:00
Code Issues Projects Releases Wiki Activity
57,384 Commits 36 Branches 523 Tags
Commit Graph

57384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
2d0d36f219 Merge branch 'wip-MDL-36048-master' of git://github.com/marinaglancy/moodle 2012-11-14 09:58:27 +08:00
Dan Poltawski
81d7798996 Merge branch 'MDL-34520-master' of git://github.com/ankitagarwal/moodle 2012-11-14 09:55:51 +08:00
Amy Groshek
b1dd41de86 MDL-36540 - Survey language pack typo 2012-11-14 09:45:42 +08:00
Aparup Banerjee
bf10e51d44 MDL-24736 anotating tinymce changes to readme 2012-11-14 09:40:59 +08:00
Dan Poltawski
762c6c4fee Merge branch 'master_MDL-36467' of git://github.com/danmarsden/moodle 2012-11-14 09:30:59 +08:00
Marina Glancy
52b1ed5ee8 MDL-36048 advise theme developers to output course header/footer 2012-11-14 09:29:54 +08:00
Dan Poltawski
f58c96f842 Merge branch 'MDL-36369' of git://github.com/timhunt/moodle 2012-11-14 09:29:51 +08:00
Dan Poltawski
25c1b2edc4 Merge branch 'wip-MDL-36413-master' of https://github.com/nicolasconnault/moodle 2012-11-14 09:18:27 +08:00
Aparup Banerjee
f132d28aa5 Merge branch 'wip_master_mdl-25736_tinymce_spellchecker_frech_issues' of https://github.com/iarenaza/moodle 2012-11-14 09:12:28 +08:00
Michael Aherne
5035ed6376 MDL-34762 course Hide system archetypes from mod chooser 2012-11-14 09:06:10 +08:00
Dan Poltawski
59d332ea71 Merge branch 'MDL-36494-invalid-update-debugging' of git://github.com/mudrd8mz/moodle 2012-11-14 08:31:29 +08:00
Tim Hunt
837e181225 MDL-36369 qtypes and qbehaviour settings permissions. 
The correct policy is that users with moodle/question:config can set the
default settings for particular qtypes. However, it requires
moodle/site:config in order to do manage qbehaviours or manage qtypes.
 2012-11-13 16:07:28 +00:00
Marina Glancy
e75324a53e MDL-36369 Question types and behaviour settings should not require moodle/site:config 2012-11-13 15:14:03 +00: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
Dan Marsden
a82c1ad05a MDL-36467 SCORM: remove old debugging superceded by full scorm debugger 2012-11-13 09:02:43 +13: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
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
4dcd99de59 MDL-36048 Modify themes to add course headers and footers provided by course format 2012-11-10 15:39:15 +08: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
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 v2.4.0-beta 2012-11-09 18:49:38 +08:00
Dan Poltawski
ae8e5057f4 weekly release 2.4dev 2012-11-09 17:56:42 +08:00