mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-09 10:19:56 +01:00
Code Issues Projects Releases Wiki Activity
65,970 Commits 36 Branches 523 Tags
Commit Graph

14863 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
24d74a6804 Merge branch 'wip-MDL-43283-master' of git://github.com/marinaglancy/moodle 2014-01-09 23:07:19 +01:00
Marina Glancy
1f47813b29 MDL-43283 mod_chat: corrected SQL query to follow strict groupping rules 2014-01-09 15:37:38 +08:00
Dan Poltawski
a6fa74bca3 Merge branch 'MDL-43595-master' of git://github.com/damyon/moodle 2014-01-08 11:34:46 +08:00
Damyon Wiese
cf1110eb62 MDL-43595: The dropdowns for editpdf stopped working due to a recent change. 2014-01-08 09:15:58 +08:00
Eloy Lafuente (stronk7)
0601a82aff Merge branch 'wip-MDL-42310-master' of git://github.com/abgreeve/moodle 2014-01-08 01:32:28 +01:00
Eloy Lafuente (stronk7)
b8a8f3dd01 Merge branch 'MDL-42607_rss' of https://github.com/andyjdavis/moodle 2014-01-08 00:39:15 +01:00
Dan Poltawski
571944c2a1 Merge branch 'm27_MDL-43482_Lot_Of_Passed_By_Reference_Messages' of https://github.com/scara/moodle 2014-01-07 17:20:44 +08:00
Damyon Wiese
abc217b2bf Merge branch 'MDL-43307-master' of git://github.com/andrewnicols/moodle 2014-01-07 14:10:40 +08:00
Damyon Wiese
e011f229a8 Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle 2014-01-07 12:29:45 +08:00
Damyon Wiese
de47c9c81b Merge branch 'wip-mdl-43293' of https://github.com/rajeshtaneja/moodle 2014-01-07 12:22:49 +08:00
Dan Poltawski
812cc702ad Merge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle 2014-01-07 11:51:15 +08:00
Dan Poltawski
93759b73a5 Merge branch 'MDL-42585-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assign/version.php
 2014-01-07 10:55:20 +08:00
Frederic Massart
f588ea5008 MDL-42995 mod_assign: Extended tests for update_calendar method 2014-01-06 10:20:23 +01:00
Frederic Massart
0cfc7d13ef MDL-42995 mod_assign: Remove files from calendar event description 2014-01-06 09:29:26 +01:00
Frederic Massart
2a5794e099 MDL-42995 mod_assign: Use new global function to strip content 2014-01-06 09:29:25 +01:00
Damyon Wiese
717093583f Merge branch 'MDL-43454-master' of git://github.com/FMCorz/moodle 2014-01-06 15:51:25 +08:00
Damyon Wiese
5490662ade Merge branch 'MDL-41690-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	course/dnduploadlib.php
 2014-01-06 15:48:31 +08:00
Dan Poltawski
00447fd617 Merge branch 'MDL-40922_master' of https://github.com/markn86/moodle 2014-01-06 15:11:23 +08:00
Dan Poltawski
73ee2fda6b MDL-41690 course: remove use of deprecated functions 2014-01-06 10:45:59 +08:00
Sam Hemelryk
7c445ab8c0 Merge branch 'w01_MDL-43527_m27_safemode' of https://github.com/skodak/moodle 2014-01-06 14:46:31 +13:00
Sam Hemelryk
e4ac256c35 Merge branch 'wip-mdl-18770' of https://github.com/rajeshtaneja/moodle 2014-01-06 13:09:42 +13:00
Sam Hemelryk
e6d3f9438e Merge branch 'MDL-40054_master' of https://github.com/markn86/moodle 2014-01-06 12:01:54 +13:00
Sam Hemelryk
a9bd004c8c Merge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle 2014-01-06 11:28:34 +13:00
Sam Hemelryk
f29dcf642b Merge branch 'MDL-42212-master' of git://github.com/FMCorz/moodle 2014-01-06 10:30:31 +13:00
Sam Hemelryk
dfed81ae12 Merge branch 'MDL-36334-master' of git://github.com/andrewnicols/moodle 2014-01-06 09:53:15 +13:00
Sam Hemelryk
2dad31ecf9 MDL-43238 mod_assign: removed incorrect validation 2014-01-06 09:51:38 +13:00
Rajesh Taneja
456d7bc7f3 MDL-18770 mod_assign: Set gradetype to GRADE_TYPE_NONE if feedback not enabled 2014-01-03 16:30:37 +08:00
Rajesh Taneja
184afb6b73 MDL-43238 events: Added event other information in event php doc block 2014-01-03 15:03:48 +08:00
Mark Nelson
4cc4b85deb MDL-40054 mod_lesson: removed 'update email essay grade' add_to_log call 
The add_to_log call was triggered whenever a grade was sent via the messaging
API. We should not be firing an event here, it should be fired via the
messaging API.
 2014-01-02 19:52:49 -08:00
Mark Nelson
00c027c7e3 MDL-40054 mod_lesson: replaced 'end' add_to_log call with an event 2014-01-02 19:52:49 -08:00
Mark Nelson
9c192d812b MDL-40054 mod_lesson: replaced 'start' add_to_log call with an event 2014-01-02 19:52:48 -08:00
Mark Nelson
81d2421c55 MDL-40054 mod_lesson: replaced 'view highscores' add_to_log call with an event 2014-01-02 19:52:48 -08:00
Mark Nelson
8539411823 MDL-40054 mod_lesson: replaced 'update highscores' add_to_log call with an event 2014-01-02 19:52:44 -08:00
Mark Nelson
b6374c24ee MDL-40054 mod_lesson: replaced 'grade view' add_to_log call with an event 2014-01-02 19:44:39 -08:00
Mark Nelson
3f08c95ade MDL-40054 mod_lesson: replaced 'view all' add_to_log call with an event 2014-01-02 19:44:39 -08:00
Mark Nelson
7edf27c48e MDL-40054 mod_lesson: replaced 'view' add_to_log call with an event 2014-01-02 19:44:32 -08:00
Michael Milette
a059b434f7 MDL-42310 feedback mod - Enable filtering of multichoice and multichoice rated controls 
Conflicts:
	mod/feedback/item/multichoice/lib.php
	mod/feedback/item/multichoicerated/lib.php

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
 2014-01-03 10:24:49 +08:00
Petr Škoda
90627d9d59 MDL-43527 eliminate last references to safe_mode 
Safe mode is not availabel in PHP 5.4 any more...
 2014-01-02 09:23:15 +08:00
Mark Nelson
81ec45ea11 MDL-40922 mod_folder: replaced the 'edit' add_to_log call with an event 2013-12-31 15:14:57 -08:00
Mark Nelson
6f3e33c947 MDL-40922 mod_folder: replaced the 'view' and 'view all' add_to_log calls with events 2013-12-31 15:14:57 -08:00
Andrew Davis
8f6e47d9c7 MDL-42607 mod_forum:fixed some inefficiencies in forum RSS generation 2013-12-31 12:28:09 +08:00
Andrew Nicols
4e2c2c64bb MDL-36334 mod_scorm: Remove gallery-sm-treeview 
This has now been incorporated into core.
 2013-12-30 19:19:26 +08:00
Andrew Davis
e3288953e7 MDL-35973 lib: added a page title to redirect() and added 2 seconds to the page redirection when posting in a forum 2013-12-30 18:26:24 +08:00
Petr Škoda
2803f3c1b5 MDL-43402 remove all zlib detection code 
Zlib extension is now required.
 2013-12-27 11:06:18 +08:00
Matteo Scaramuccia
323f4fff46 MDL-43482 Chat Lot of "Only variables should be passed by reference". 2013-12-24 11:02:29 +01:00
Sam Hemelryk
946e770ede Merge branch 'MDL-43243-master' of git://github.com/andrewnicols/moodle 2013-12-24 11:56:01 +13:00
Sam Hemelryk
c5213d7e6e Merge branch 'MDL-43438-master' of git://github.com/FMCorz/moodle 2013-12-24 11:23:15 +13:00
Sam Hemelryk
ee70f10f99 Merge branch 'MDL-43250-master' of git://github.com/damyon/moodle 2013-12-24 10:36:22 +13:00
Andrew Nicols
54a3dca258 MDL-43307 JavaScript: Migrate moodle-mod_assign-history to use Shifter 2013-12-23 16:18:10 +08:00
Sam Hemelryk
6ac16bb981 Merge branch 'MDL-35032-master' of git://github.com/FMCorz/moodle 2013-12-23 15:58:04 +13:00