Sam Hemelryk [Mon, 10 Sep 2012 23:33:41 +0000 (11:33 +1200)]
MDL-34794 mod_assign: Fixed up style after integration
Sam Hemelryk [Mon, 10 Sep 2012 23:33:04 +0000 (11:33 +1200)]
Merge branch 'MDL-34794' of git://github.com/raymondAntonio/moodle
Sam Hemelryk [Mon, 10 Sep 2012 23:15:45 +0000 (11:15 +1200)]
Merge branch 'MDL-27786-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 10 Sep 2012 23:10:39 +0000 (11:10 +1200)]
Merge branch 'MDL-33374-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 10 Sep 2012 23:07:29 +0000 (11:07 +1200)]
Merge branch 'MDL-35007-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 23:03:06 +0000 (01:03 +0200)]
Merge branch 'MDL-35272-typo' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 10 Sep 2012 22:38:23 +0000 (10:38 +1200)]
Merge branch 'wip-MDL-32785-master-v3' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 21:45:47 +0000 (23:45 +0200)]
Merge branch 'MDL-35301-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 21:35:12 +0000 (23:35 +0200)]
Merge branch 'MDL-8307-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 20:13:36 +0000 (22:13 +0200)]
Merge branch 'w37_MDL-35284_m24_borkedtoolbar' of git://github.com/skodak/moodle
Conflicts:
lib/editor/tinymce/version.php
Petr Škoda [Fri, 7 Sep 2012 20:46:15 +0000 (22:46 +0200)]
MDL-35284 patch empty toolbar crashing TinyMCE
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 18:39:19 +0000 (20:39 +0200)]
Merge branch 'w37_MDL-35318_m24_stringrevisions' of git://github.com/skodak/moodle
Petr Škoda [Mon, 10 Sep 2012 18:23:14 +0000 (20:23 +0200)]
MDL-35318 fix lang revision incrementation conditions
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 14:54:43 +0000 (16:54 +0200)]
Merge branch 'w37_MDL-35289_m24_tinymcelangs' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 14:41:25 +0000 (16:41 +0200)]
Merge branch 'MDL-35343' of git://github.com/timhunt/moodle
Tim Hunt [Mon, 10 Sep 2012 12:06:47 +0000 (13:06 +0100)]
MDL-35343 JavaScript visible in multichoice choice feedback.
Also, Match correct answer, and calculated multi and multianswer
feedback.
Aparup Banerjee [Mon, 10 Sep 2012 09:15:00 +0000 (17:15 +0800)]
Merge branch 'MDL-34944-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Mon, 10 Sep 2012 09:00:16 +0000 (17:00 +0800)]
Merge branch 'MDL-35223-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Mon, 10 Sep 2012 06:37:40 +0000 (14:37 +0800)]
Merge branch 'MDL-35264_master' of git://github.com/dmonllao/moodle
Aparup Banerjee [Mon, 10 Sep 2012 06:29:47 +0000 (14:29 +0800)]
Merge branch 'MDL-27398_master' of git://github.com/dmonllao/moodle
David Monllao [Tue, 4 Sep 2012 02:24:45 +0000 (10:24 +0800)]
MDL-27398 mod_chat Removing PAGE references
David Monllao [Tue, 4 Sep 2012 02:23:56 +0000 (10:23 +0800)]
MDL-27398 mod_chat Adding file basic doc
David Monllao [Tue, 4 Sep 2012 02:22:47 +0000 (10:22 +0800)]
MDL-27398 mod_chat Removing deprecated calls and moving dependencies
Credit to Jorge Villalon
David Monllao [Thu, 23 Aug 2012 02:24:10 +0000 (10:24 +0800)]
MDL-27398 mod_chat Adding CLI_SCRIPT to chat daemon
Credit to Jorge Villalon
Adrian Greeve [Thu, 30 Aug 2012 07:42:54 +0000 (15:42 +0800)]
MDL-32785 - lib - Ignorning hard frozen fields when submitting data.
Petr Škoda [Sun, 9 Sep 2012 10:05:52 +0000 (12:05 +0200)]
MDL-35318 use new lang revision to invalidate TinyMCE lang caches
Petr Škoda [Sun, 9 Sep 2012 09:55:31 +0000 (11:55 +0200)]
MDL-35318 add lang revision counter and improve PHPUnit test reset
We need this for hacks that need to find out if strings changed.
Petr Škoda [Fri, 7 Sep 2012 11:56:16 +0000 (13:56 +0200)]
MDL-35289 use unmodified TinyMCE
Petr Škoda [Fri, 7 Sep 2012 07:19:58 +0000 (09:19 +0200)]
MDL-35289 use new TinyMCE en lang import
AMOS BEGIN
MOV [common:browsemedia,editor_tinymce],[moodlemedia:browsemedia,tinymce_moodlemedia]
MOV [common:browseimage,editor_tinymce],[moodleimage:browseimage,tinymce_moodleimage]
AMOS END
Raymond Wijaya [Tue, 21 Aug 2012 07:50:56 +0000 (15:50 +0800)]
MDL-34794: Add reset course feature in mod_assign (new assignment (2.3))
David Monllao [Thu, 6 Sep 2012 01:14:44 +0000 (09:14 +0800)]
MDL-34068 mod_chat Sending text/html headers when sending the messages frame output for the first time
David Monllao [Thu, 6 Sep 2012 02:28:52 +0000 (10:28 +0800)]
MDL-35264 mod_chat Changing the input frame of chat daemon method to a embedded page layout
Frederic Massart [Fri, 7 Sep 2012 03:12:56 +0000 (11:12 +0800)]
MDL-35301 Unit Tests: Test cases for course requests
Frederic Massart [Fri, 7 Sep 2012 01:34:39 +0000 (09:34 +0800)]
MDL-35301 Unit Tests: Basic test for create_course()
Frederic Massart [Thu, 16 Aug 2012 06:10:39 +0000 (14:10 +0800)]
MDL-8307 Course: Course requests can suggest a category
Ankit Agarwal [Thu, 6 Sep 2012 03:10:45 +0000 (11:10 +0800)]
MDL-27786 calendar: Changing the eventname string for accessibility
Ankit Agarwal [Mon, 3 Sep 2012 08:37:44 +0000 (16:37 +0800)]
MDL-33374 profile: Use correct text for buttons when creating a new user
Ankit Agarwal [Tue, 4 Sep 2012 03:12:22 +0000 (11:12 +0800)]
MDL-34944 book: Implementing reset framework for book
Ankit Agarwal [Tue, 4 Sep 2012 03:56:21 +0000 (11:56 +0800)]
MDL-35007 book: Adding rule to parse links to book chapters from 1.9 backups
Ankit Agarwal [Thu, 6 Sep 2012 03:28:45 +0000 (11:28 +0800)]
MDL-35223 book: use chapter names in page titles
Eloy Lafuente (stronk7) [Fri, 7 Sep 2012 00:39:21 +0000 (02:39 +0200)]
weekly release 2.4dev
Eloy Lafuente (stronk7) [Fri, 7 Sep 2012 00:36:04 +0000 (02:36 +0200)]
fix permissions
Eloy Lafuente (stronk7) [Fri, 7 Sep 2012 00:17:55 +0000 (02:17 +0200)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 18:11:53 +0000 (20:11 +0200)]
Merge branch 'MDL-34945-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 18:06:30 +0000 (20:06 +0200)]
Merge branch 'MDL-34985' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 17:39:49 +0000 (19:39 +0200)]
MDL-6424 - blocks - Add missing global vars.
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 17:31:43 +0000 (19:31 +0200)]
Merge branch 'wip-MDL-6424-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 16:31:26 +0000 (18:31 +0200)]
MDL-31291 assign: Fix diffs between installed & upgraded DB schema
Aparup Banerjee [Thu, 6 Sep 2012 11:43:15 +0000 (19:43 +0800)]
Merge branch 'MDL-31291-POST23' of git://github.com/netspotau/moodle-mod_assign
Aparup Banerjee [Thu, 6 Sep 2012 11:36:24 +0000 (19:36 +0800)]
Merge branch 'MDL-31284-POST23' of git://github.com/netspotau/moodle-mod_assign
Martin Vögeli [Thu, 6 Sep 2012 07:48:52 +0000 (09:48 +0200)]
MDL-31365 Regions for pagelayout 'secure'
Martin Vögeli [Wed, 5 Sep 2012 20:31:26 +0000 (22:31 +0200)]
MDL-31365 Follow up after discussion
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 10:08:26 +0000 (12:08 +0200)]
Merge branch 'w36_MDL-35172_m24_editortoolbar' of git://github.com/skodak/moodle
Aparup Banerjee [Thu, 6 Sep 2012 09:35:40 +0000 (17:35 +0800)]
Revert "MDL-34257 quiz 'secure' mode: PAGE initialisation order issues."
This reverts commit
0e708c34760ee274990e1c5bad96583301a6cc79.
note : there is another commit prefixed with MDL-34257 hash '
ddda79c' which was really for MDL-34187. '
ddda79c' is not being reverted as its not really about MDL-34257.
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 00:01:11 +0000 (02:01 +0200)]
Merge branch 'MDL-35034-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 23:29:04 +0000 (01:29 +0200)]
Merge branch 'MDL-27799' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:04:01 +0000 (19:04 +0200)]
Revert "MDL-30643 - Fixed speed issues with stats generation."
This reverts commit
5d911452cd9ef60f8f79ed9bd39fc8302211a96c.
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:03:46 +0000 (19:03 +0200)]
Revert "MDL-30643 - Added additional temporary tables to deal with log growth in daily tables."
This reverts commit
e710925a24bbbe0a4f0ddfa0b760380091890083.
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:03:30 +0000 (19:03 +0200)]
Revert "MDL-30643 - Moved table create/drop out of loop to fix performance issue."
This reverts commit
678f53c5f781d45424020530435382645325ab73.
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:03:17 +0000 (19:03 +0200)]
Revert "MDL-30643 - Now loading table definitions from XML files."
This reverts commit
d352e733b3729ee820de8859d67c859cda81ee34.
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:03:06 +0000 (19:03 +0200)]
Revert "MDL-30643 - Added statslib test file."
This reverts commit
8646f5a4363a4331c8673e2bc98a7372ed789182.
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:02:54 +0000 (19:02 +0200)]
Revert "MDL-30643 - Fixing minor log output error and test cases."
This reverts commit
2da32bd6a5a0071756c29a4684c73694f0971664.
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:02:38 +0000 (19:02 +0200)]
Revert "MDL-30643 - Updated test cases to handle timezones better."
This reverts commit
f0f0fec29572e6670cb46f4325955201f871b519.
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:02:27 +0000 (19:02 +0200)]
Revert "RFC-30643 - Removed get_context_instance calls."
This reverts commit
eb0ffd3214ad568ded291936c2cd6e67276350b6.
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:02:07 +0000 (19:02 +0200)]
Revert "MDL-30643 fixed whitespace"
This reverts commit
5c27678d3aa51af7c6e5ce992e52e55a29195a22.
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 16:01:24 +0000 (18:01 +0200)]
MDL-29662 quiz overrides: use proper course value (was php notice).
David Mudrák [Wed, 5 Sep 2012 12:05:36 +0000 (14:05 +0200)]
MDL-35272 Fix typo in qformat_blackboard_six.php
Credit goes to German Valero for spotting and reporting this.
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 11:12:59 +0000 (13:12 +0200)]
Merge branch 'w36_MDL-35077_m24_stats' of git://github.com/skodak/moodle
Petr Škoda [Wed, 5 Sep 2012 08:01:30 +0000 (10:01 +0200)]
MDL-35077 do not show link to system stats report if stats disabled
Aparup Banerjee [Wed, 5 Sep 2012 07:02:17 +0000 (15:02 +0800)]
Merge branch 'MDL-35089' of git://github.com/stronk7/moodle
Petr Škoda [Wed, 5 Sep 2012 06:23:36 +0000 (08:23 +0200)]
MDL-35172 fix handling of more than 10 tinymce toolbars
Aparup Banerjee [Wed, 5 Sep 2012 03:45:56 +0000 (11:45 +0800)]
Merge branch 'w36_MDL-35177_m24_editoradminicons' of git://github.com/skodak/moodle
Aparup Banerjee [Wed, 5 Sep 2012 02:16:35 +0000 (10:16 +0800)]
MDL-26504 blog: fixed SQL to add explicit casting
Eloy Lafuente (stronk7) [Tue, 4 Sep 2012 22:52:17 +0000 (00:52 +0200)]
Merge branch 'MDL-34997-master' of git://github.com/FMCorz/moodle
Aparup Banerjee [Tue, 4 Sep 2012 17:51:39 +0000 (01:51 +0800)]
MDL-30643 fixed whitespace
Aparup Banerjee [Tue, 4 Sep 2012 17:16:51 +0000 (01:16 +0800)]
Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle
Tyler Bannister [Tue, 4 Sep 2012 14:11:16 +0000 (10:11 -0400)]
RFC-30643 - Removed get_context_instance calls.
- Added fifth table to speed up enrolment look ups.
Tyler Bannister [Tue, 4 Sep 2012 14:10:19 +0000 (10:10 -0400)]
MDL-30643 - Updated test cases to handle timezones better.
Aparup Banerjee [Tue, 4 Sep 2012 09:31:50 +0000 (17:31 +0800)]
Merge branch 'wip-mdl-34537' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 4 Sep 2012 05:43:11 +0000 (13:43 +0800)]
Merge branch 'MDL-26504_blog_unregister' of git://github.com/andyjdavis/moodle
Conflicts:
lib/db/upgrade.php
version.php
Sam Hemelryk [Tue, 4 Sep 2012 04:50:36 +0000 (16:50 +1200)]
Merge branch 'MDL-30022_message_duplicate' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 4 Sep 2012 04:10:30 +0000 (12:10 +0800)]
MDL-31365 theme: mymobile updated to compatible declaration
Tim Hunt [Thu, 12 Jul 2012 17:39:01 +0000 (18:39 +0100)]
MDL-34257 quiz 'secure' mode: PAGE initialisation order issues.
Aparup Banerjee [Tue, 4 Sep 2012 03:38:11 +0000 (11:38 +0800)]
Merge branch 'MDL-31365_master' of https://github.com/birdy1976/moodle
Tim Lock [Tue, 28 Aug 2012 04:27:35 +0000 (13:57 +0930)]
MDL-35092: Add proxy support to enrol/paypal IPN
Eloy Lafuente (stronk7) [Tue, 4 Sep 2012 00:08:54 +0000 (02:08 +0200)]
Merge branch 'wip-mdl-34606' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 23:52:08 +0000 (01:52 +0200)]
Merge branch 'MDL-34633-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 23:27:49 +0000 (01:27 +0200)]
MDL-31295 assign: fix comments in upgrade code.
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 23:20:55 +0000 (01:20 +0200)]
Merge branch 'MDL-31295-POST23' of git://github.com/netspotau/moodle-mod_assign
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 23:14:06 +0000 (01:14 +0200)]
Merge branch 'MDL-29662' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 23:06:48 +0000 (01:06 +0200)]
Merge branch 'MDL-27818' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 22:38:30 +0000 (00:38 +0200)]
Merge branch 'w36_MDL-35189_m24_typo3' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 22:35:48 +0000 (00:35 +0200)]
Merge branch 'w36_MDL-35185_m24_flowplayer' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 22:30:35 +0000 (00:30 +0200)]
Merge branch 'MDL-33306' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 22:19:53 +0000 (00:19 +0200)]
Merge branch 'MDL-33812-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 22:05:52 +0000 (00:05 +0200)]
Merge branch 'MDL-34725-strict-standards' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 22:00:20 +0000 (00:00 +0200)]
Merge branch 'w36_MDL-34097_m24_environment' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 21:42:14 +0000 (23:42 +0200)]
Merge branch 'w36_MDL-35188_m24_tcpdf' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 21:31:13 +0000 (23:31 +0200)]
Merge branch 'w36_MDL-35186_m24_phpmailer' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 18:16:20 +0000 (20:16 +0200)]
Merge branch 'w36_MDL-35184_m24_adodb' of git://github.com/skodak/moodle
