Commit graph

12352 commits

Author SHA1 Message Date
Petr Skoda
f0202ae9a2 MDL-30686 improve accuracy of qualified_me() by trying PAGE->url first
This should help SSL proxies and returning to current page after require_login().
2012-04-27 13:39:18 +02:00
Eloy Lafuente (stronk7)
cb6de349e4 Fix permissions 2012-04-27 12:45:22 +02:00
Eloy Lafuente (stronk7)
e97eefd8c8 Merge branch 'MDL-19263-master' of https://github.com/mackensen/moodle 2012-04-26 02:46:21 +02:00
Eloy Lafuente (stronk7)
0529f63373 Merge branch 'MDL-32630-workshop-calendar' of git://github.com/mudrd8mz/moodle 2012-04-26 02:17:00 +02:00
David Mudrak
de7daa8333 MDL-32630 workshop_calendar_update() does not check for calendar permissions
As discussed in MDL-32631, calendar_event::update() should not do
capability checks at all. Until that issue is fixed, we just explicitly
declare that no capability checks should be done.

The function workshop_calendar_update() is executed when adding or
updating a workshop instance (where permissions to modify the instance
were already checked and are sufficient) and in the upgrade code (where
no check should be performed anyway).
2012-04-25 15:35:59 +02:00
Eloy Lafuente (stronk7)
d7f84a2962 Merge branch 'MDL-32471-thumbnails' of git://github.com/mudrd8mz/moodle 2012-04-25 15:14:27 +02:00
David Mudrak
b861b60932 MDL-32471 fixed strict standards in the declaration of send_file() in assignment types
All subtypes declaration should be compatible with that of assignment_base::send_file()
2012-04-25 13:48:12 +02:00
Eloy Lafuente (stronk7)
2360f60fd8 MDL-32322 tests: apply changes in simpletests (now deleted) to phpunit ones. 2012-04-25 03:09:42 +02:00
Eloy Lafuente (stronk7)
d3cb25dfef Merge branch 'MDL-32322' of git://github.com/timhunt/moodle
Conflicts:
	mod/quiz/report/simpletest/testreportlib.php
	mod/quiz/report/statistics/simpletest/test_qstats.php
2012-04-25 03:02:14 +02:00
Eloy Lafuente (stronk7)
2c6dbf4a54 MDL-32490 Offline assignment: phpdocs and whitespace fixes 2012-04-25 02:40:35 +02:00
Eloy Lafuente (stronk7)
2ae4f3849a Merge branch 'MDL-32490' of git://github.com/bostelm/moodle 2012-04-25 02:28:50 +02:00
Eloy Lafuente (stronk7)
ee35fa43de Merge branch 'wip-MDL-30478-master' of git://github.com/abgreeve/moodle 2012-04-25 01:11:38 +02:00
Andreas Grabs
7e5dc9f3bb MDL-32624 - initialbars disappears 2012-04-24 21:26:56 +02:00
Aparup Banerjee
aed560a197 MDL-19391 Database : fixed icon size 2012-04-24 16:00:38 +01:00
David Mudrak
7a00d4385d MDL-32471 preview thumbnails support for other component types
This commit affects mostly qtypes. Other standard components either do
not have pluginfile handler or have been already updated to the new API.
2012-04-24 14:29:44 +02:00
David Mudrak
261cbbacc1 MDL-32471 preview thumbnails support for activity modules
Activity module's xxx_pluginfile() now accepts the $options parameter
that is to be passed to the send_stored_file() function.
2012-04-24 12:09:45 +02:00
Eloy Lafuente (stronk7)
3e0b0ae59b Merge branch 'wip-MDL-26500' of git://github.com/danpoltawski/moodle 2012-04-24 00:03:36 +02:00
Dan Poltawski
544cfe962e Merge branch 'MDL-32104-master' of git://github.com/ankitagarwal/moodle 2012-04-23 12:49:56 +08:00
Dan Poltawski
bebf083159 Merge branch 'w17_MDL-31607_m23_login' of git://github.com/skodak/moodle 2012-04-23 11:47:11 +08:00
Dan Poltawski
f488088109 Merge branch 'w17_MDL-32569_m23_phpunit5' of git://github.com/skodak/moodle 2012-04-23 11:21:06 +08:00
Dan Poltawski
eadff47811 Merge branch 'master_MDL-29975' of git://github.com/danmarsden/moodle 2012-04-23 10:59:17 +08:00
Petr Skoda
cdbea7eed1 MDL-31607 use full course object for require_login() if already available
This eliminates 1 db query.
2012-04-22 17:41:47 +02:00
Petr Skoda
f596005b6c MDL-32569 drop migrated module tests 2012-04-21 16:58:07 +02:00
Petr Skoda
dde4368ffc MDL-32451 fix remaining E_STRICT issues in wiki 2012-04-21 11:15:39 +02:00
Charles Fulton
2f8b49d569 MDL-25695 wiki: enable anchor tags 2012-04-20 12:47:23 -07:00
Charles Fulton
d402ee1c56 MDL-19263 assignment: only notify users enrolled in course 2012-04-20 06:10:33 -07:00
Tim Hunt
9d58dae33b MDL-32322 quiz reports: fix PHPdoc comments. Thanks Smurf. 2012-04-20 11:34:56 +01:00
Tim Hunt
c0270961a8 MDL-32322 more changes to make the code more similar before refactoring. 2012-04-20 10:07:28 +01:00
Tim Hunt
361cf27d7f MDL-32322 quiz reports: refactor processing actions. 2012-04-20 10:07:26 +01:00
Tim Hunt
e97d60adce MDL-32322 quiz reports: pass options object -> table, not separate args. 2012-04-20 10:07:25 +01:00
Tim Hunt
9e67e357eb MDL-32322 quiz_reports: move some more options into the options class. 2012-04-20 10:07:23 +01:00
Tim Hunt
ac4d91575a MDL-32322 quiz reports: name improvement attempt_report -> attempts_report. 2012-04-20 10:07:22 +01:00
Tim Hunt
dcd65f1b4f MDL-32322 quiz reports: extract a mod_quiz_attempt_report_options class.
More clean-ups are possible in the reports after this, but I am committing now, having got the code back to a working state.
2012-04-20 10:07:21 +01:00
Tim Hunt
303aa3b8d0 MDL-32322 quiz reports: killing more duplication. 2012-04-20 10:07:19 +01:00
Tim Hunt
5ca45fddab MDL-32322 quiz reports: eliminate more duplication. 2012-04-20 10:07:18 +01:00
Tim Hunt
5bf8a1695d MDL-32322 quiz reports: defines -> class constants. 2012-04-20 10:07:17 +01:00
Tim Hunt
2639a68ad5 MDL-32322 quiz reports: refactor the settings forms to eliminate duplication. 2012-04-20 10:07:15 +01:00
Tim Hunt
4747c788c0 MDL-32322 quiz reports: edit to increase duplication, before refactoring. 2012-04-20 10:07:14 +01:00
Tim Hunt
768a758854 MDL-32322 quiz reports: Appease the great god codechecker. 2012-04-20 10:07:12 +01:00
Tim Hunt
90fbad644b MDL-32322 quiz reports: fix more strict syntax issues. 2012-04-20 10:07:11 +01:00
Tim Hunt
8d76124c5b MDL-32322 quiz reports: fix up PHP doc comments. 2012-04-20 10:07:09 +01:00
Tim Hunt
6b4e2d76a3 MDL-32322 quiz reports: rename classes, and fix one strict syntax. 2012-04-20 10:07:08 +01:00
Tim Hunt
f5e42695bd MDL-32322 quiz reports: split attemptsrepor.php into one file per class. 2012-04-20 10:07:06 +01:00
Tim Hunt
26aded5581 MDL-32322 quiz reports: get_context_instance -> new classes.
Also, eliminate unnecessary use of global $COURSE.
2012-04-20 10:07:05 +01:00
Ankit Agarwal
33c5202ba2 MDL-32104 forum: Fixing issue with logs during restore 2012-04-20 08:55:40 +08:00
Adrian Greeve
5dedd64d58 MDL-30478 - wiki - Fixing up group problems when viewing and creating wiki pages.
Thanks to Matt Kolb for his contribution.
2012-04-20 07:27:50 +08:00
Dan Marsden
d5159fb8d3 MDL-29975 SCORM improve pop-up generation 2012-04-20 10:28:12 +12:00
Henning Bostelmann
2159c1eaed MDL-32490 Offline assignment: do not display lateness information 2012-04-19 19:27:11 +01:00
Tim Hunt
34b037dec6 MDL-32396 more quiz strict syntax problems. 2012-04-18 16:05:13 +08:00
Eloy Lafuente (stronk7)
099aaa8d51 Merge branch 'MDL-32061-master-2' of git://git.luns.net.uk/moodle 2012-04-18 02:31:47 +02:00