moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56070 commits 37 branches 540 tags 1.3 GiB
Commit graph

56070 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
a8cdd8758b Merge branch 'w37_MDL-35318_m24_stringrevisions' of git://github.com/skodak/moodle 2012-09-10 20:39:19 +02:00
Petr Škoda
6dd4241f81 MDL-35318 fix lang revision incrementation conditions 2012-09-10 20:23:14 +02:00
Eloy Lafuente (stronk7)
e79802e04e Merge branch 'w37_MDL-35289_m24_tinymcelangs' of git://github.com/skodak/moodle 2012-09-10 16:54:43 +02:00
Eloy Lafuente (stronk7)
979b868cf1 Merge branch 'MDL-35343' of git://github.com/timhunt/moodle 2012-09-10 16:41:25 +02:00
Tim Hunt
8e8a397b16 MDL-35343 JavaScript visible in multichoice choice feedback. 
Also, Match correct answer, and calculated multi and multianswer
feedback.
 2012-09-10 13:06:47 +01:00
Aparup Banerjee
e2abebcbb2 Merge branch 'MDL-34944-master' of git://github.com/ankitagarwal/moodle 2012-09-10 17:15:00 +08:00
Aparup Banerjee
b3b79a58ee Merge branch 'MDL-35223-master' of git://github.com/ankitagarwal/moodle 2012-09-10 17:00:16 +08:00
Aparup Banerjee
5ddaa60d49 Merge branch 'MDL-35264_master' of git://github.com/dmonllao/moodle 2012-09-10 14:37:40 +08:00
Aparup Banerjee
fda1d233a7 Merge branch 'MDL-27398_master' of git://github.com/dmonllao/moodle 2012-09-10 14:29:47 +08:00
David Monllao
bd9cb43e09 MDL-27398 mod_chat Removing PAGE references 2012-09-10 14:09:02 +08:00
David Monllao
32b49bbd84 MDL-27398 mod_chat Adding file basic doc 2012-09-10 14:09:02 +08:00
David Monllao
24242682df MDL-27398 mod_chat Removing deprecated calls and moving dependencies 
Credit to Jorge Villalon
 2012-09-10 14:08:49 +08:00
David Monllao
e54370d7fb MDL-27398 mod_chat Adding CLI_SCRIPT to chat daemon 
Credit to Jorge Villalon
 2012-09-10 14:08:22 +08:00
Petr Škoda
79df150a62 MDL-35318 use new lang revision to invalidate TinyMCE lang caches 2012-09-09 12:18:32 +02:00
Petr Škoda
a46e11b5df MDL-35318 add lang revision counter and improve PHPUnit test reset 
We need this for hacks that need to find out if strings changed.
 2012-09-09 12:15:30 +02:00
Petr Škoda
29149f981c MDL-35289 use unmodified TinyMCE 2012-09-09 11:57:25 +02:00
Petr Škoda
a4a4b2f6c6 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
 2012-09-07 10:11:37 +02:00
David Monllao
84ac37f0f4 MDL-34068 mod_chat Sending text/html headers when sending the messages frame output for the first time 2012-09-07 12:10:36 +08:00
David Monllao
476a235db1 MDL-35264 mod_chat Changing the input frame of chat daemon method to a embedded page layout 2012-09-07 12:07:46 +08:00
Ankit Agarwal
15c5f2a8bd MDL-34944 book: Implementing reset framework for book 2012-09-07 10:17:21 +08:00
Ankit Agarwal
93ec553969 MDL-35223 book: use chapter names in page titles 2012-09-07 10:10:01 +08:00
Eloy Lafuente (stronk7)
935c3d5ed2 weekly release 2.4dev 2012-09-07 02:39:21 +02:00
Eloy Lafuente (stronk7)
3b70685c26 fix permissions 2012-09-07 02:36:04 +02:00
Eloy Lafuente (stronk7)
9411c595e0 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2012-09-07 02:17:55 +02:00
Eloy Lafuente (stronk7)
92b75df804 Merge branch 'MDL-34945-master' of git://github.com/FMCorz/moodle 2012-09-06 20:11:53 +02:00
Eloy Lafuente (stronk7)
34a52050b2 Merge branch 'MDL-34985' of git://github.com/merrill-oakland/moodle 2012-09-06 20:06:30 +02:00
Eloy Lafuente (stronk7)
df5ac8d0ec MDL-6424 - blocks - Add missing global vars. 2012-09-06 19:39:49 +02:00
Eloy Lafuente (stronk7)
7c2bc95ae2 Merge branch 'wip-MDL-6424-master' of git://github.com/abgreeve/moodle 2012-09-06 19:31:43 +02:00
Eloy Lafuente (stronk7)
6f050c7dea MDL-31291 assign: Fix diffs between installed & upgraded DB schema 2012-09-06 18:31:26 +02:00
Aparup Banerjee
d59b488b5a Merge branch 'MDL-31291-POST23' of git://github.com/netspotau/moodle-mod_assign 2012-09-06 19:43:15 +08:00
Aparup Banerjee
89577d774d Merge branch 'MDL-31284-POST23' of git://github.com/netspotau/moodle-mod_assign 2012-09-06 19:36:24 +08:00
Martin Vögeli
b5cd5f83e1 MDL-31365 Regions for pagelayout 'secure' 2012-09-06 18:11:13 +08:00
Martin Vögeli
934f04e7c3 MDL-31365 Follow up after discussion 2012-09-06 18:11:09 +08:00
Eloy Lafuente (stronk7)
0cbf023ab6 Merge branch 'w36_MDL-35172_m24_editortoolbar' of git://github.com/skodak/moodle 2012-09-06 12:08:26 +02:00
Aparup Banerjee
7183a1f4a4 Revert "MDL-34257 quiz 'secure' mode: PAGE initialisation order issues." 
This reverts commit 0e708c3476.

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.
 2012-09-06 17:35:40 +08:00
Eloy Lafuente (stronk7)
0e08f394f5 Merge branch 'MDL-35034-master' of git://github.com/FMCorz/moodle 2012-09-06 02:01:11 +02:00
Eloy Lafuente (stronk7)
37a74d1e28 Merge branch 'MDL-27799' of git://github.com/timhunt/moodle 2012-09-06 01:29:04 +02:00
Eloy Lafuente (stronk7)
44a2eb911b Revert "MDL-30643 - Fixed speed issues with stats generation." 
This reverts commit 5d911452cd.
 2012-09-05 19:04:01 +02:00
Eloy Lafuente (stronk7)
cbcf50a2f4 Revert "MDL-30643 - Added additional temporary tables to deal with log growth in daily tables." 
This reverts commit e710925a24.
 2012-09-05 19:03:46 +02:00
Eloy Lafuente (stronk7)
583a19d772 Revert "MDL-30643 - Moved table create/drop out of loop to fix performance issue." 
This reverts commit 678f53c5f7.
 2012-09-05 19:03:30 +02:00
Eloy Lafuente (stronk7)
6a7fb9f778 Revert "MDL-30643 - Now loading table definitions from XML files." 
This reverts commit d352e733b3.
 2012-09-05 19:03:17 +02:00
Eloy Lafuente (stronk7)
8127f098d8 Revert "MDL-30643 - Added statslib test file." 
This reverts commit 8646f5a436.
 2012-09-05 19:03:06 +02:00
Eloy Lafuente (stronk7)
06d54f411c Revert "MDL-30643 - Fixing minor log output error and test cases." 
This reverts commit 2da32bd6a5.
 2012-09-05 19:02:54 +02:00
Eloy Lafuente (stronk7)
fa4fbd9790 Revert "MDL-30643 - Updated test cases to handle timezones better." 
This reverts commit f0f0fec295.
 2012-09-05 19:02:38 +02:00
Eloy Lafuente (stronk7)
447721b44f Revert "RFC-30643 - Removed get_context_instance calls." 
This reverts commit eb0ffd3214.
 2012-09-05 19:02:27 +02:00
Eloy Lafuente (stronk7)
ac9fe9b3a5 Revert "MDL-30643 fixed whitespace" 
This reverts commit 5c27678d3a.
 2012-09-05 19:02:07 +02:00
Eloy Lafuente (stronk7)
393cadf205 MDL-29662 quiz overrides: use proper course value (was php notice). 2012-09-05 18:01:24 +02:00
Eloy Lafuente (stronk7)
130eddd24c Merge branch 'w36_MDL-35077_m24_stats' of git://github.com/skodak/moodle 2012-09-05 13:12:59 +02:00
Petr Škoda
61712b0fb0 MDL-35077 do not show link to system stats report if stats disabled 2012-09-05 10:01:30 +02:00
Aparup Banerjee
379833e0d0 Merge branch 'MDL-35089' of git://github.com/stronk7/moodle 2012-09-05 15:02:17 +08:00