66854 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
170c87d808 Merge branch 'MDL-44425-en_fix' of git://github.com/mudrd8mz/moodle 2014-03-06 00:35:28 +01:00
Helen Foster
fcca760ae7 MDL-44425 Merge English strings from the en_fix language pack 2014-03-05 13:29:32 +01:00
Brent Boghosian
00dabc896b MDL-43635: Further support custom contexts
Reading from config DB table and reset method for after plugin install
Add PHPUnit test for custom context changes
2014-03-05 15:01:30 +08:00
Dan Poltawski
93881b8011 Merge branch 'MDL-44319-master' of git://github.com/damyon/moodle 2014-03-05 14:21:28 +08:00
Dan Poltawski
ac8d049b47 Merge branch 'wip-MDL-44287-master' of git://github.com/marinaglancy/moodle 2014-03-05 14:18:21 +08:00
Dan Poltawski
08b47e6178 Merge branch 'MDL-43930-master-fix1' of git://github.com/damyon/moodle 2014-03-05 14:13:23 +08:00
Damyon Wiese
0cc30f6fcf Merge branch 'MDL-44370-master' of git://github.com/ankitagarwal/moodle 2014-03-05 13:44:56 +08:00
Damyon Wiese
b33ec0697b Merge branch 'm27_MDL-44312_cron_overdue_warning_Does_Not_Take_Care_Of_cronclionly_And_cronremotepassword' of https://github.com/scara/moodle 2014-03-05 13:35:14 +08:00
Damyon Wiese
3294c1e6dd Merge branch 'MDL-41585' of https://github.com/totara/openbadges 2014-03-05 13:17:18 +08:00
Dan Poltawski
a59b2e18d8 Merge branch '44180-27' of git://github.com/samhemelryk/moodle 2014-03-05 12:47:17 +08:00
Dan Poltawski
3be87d897d Merge branch 'MDL-41248' of git://github.com/timhunt/moodle 2014-03-05 12:39:53 +08:00
Damyon Wiese
67eb36413a MDL-43930 Assign: Fix unit tests.
The tests were expecting exact log data to match, I changed the data
but missed updating the test.
2014-03-05 12:21:27 +08:00
Damyon Wiese
23d142ef5a Merge branch 'MDL-44361-master' of git://github.com/andrewnicols/moodle 2014-03-05 11:36:16 +08:00
Dan Poltawski
baa1c69408 Merge branch 'MDL-43930-master' of git://github.com/damyon/moodle 2014-03-05 11:22:35 +08:00
Dan Poltawski
cb34249fe0 Merge branch 'wip-MDL-44321-master-fix2' of git://github.com/marinaglancy/moodle 2014-03-05 11:08:31 +08:00
Marina Glancy
f2f7065895 MDL-44321 events: make sure the full object is passed to add_record_snapshot in book 2014-03-05 11:01:19 +08:00
Dan Poltawski
673a96bd4e Merge branch 'MDL-44065-master' of https://github.com/sammarshallou/moodle 2014-03-05 10:52:46 +08:00
Damyon Wiese
4cb6f806d7 Merge branch 'wip-MDL-44074-master_4' of git://github.com/gjb2048/moodle 2014-03-05 10:13:56 +08:00
Ankit Agarwal
0f1e1313a5 MDL-42079 calendar: Update core apis to support ical imports with rrule repeats 2014-03-05 09:48:07 +08:00
Ankit Agarwal
693fced7f1 MDL-42079 calendar: Add unittests for rrule_manager class 2014-03-05 09:48:07 +08:00
Ankit Agarwal
76eef5b2eb MDL-42079 calendar: Add a rrule_manager class 2014-03-05 09:48:07 +08:00
Tim Hunt
2fa19cfe82 MDL-43749 quiz editing: fix adding the first question.
The first question added to a quiz was getting slot number 2, not 1.
2014-03-04 17:57:47 +00:00
Dan Poltawski
81cbf283e8 Merge branch 'wip-MDL-44258-master' of git://github.com/marinaglancy/moodle 2014-03-04 17:49:06 +08:00
Damyon Wiese
fa52adce76 Merge branch 'wip-mdl-41266' of https://github.com/rajeshtaneja/moodle 2014-03-04 16:59:10 +08:00
Ankit Agarwal
cebfb9ec9f MDL-44370 calendar: Add support for restoring calendar log rules 2014-03-04 16:13:25 +08:00
Dan Poltawski
f1284d3cfe Merge branch 'MDL-44272-master' of git://github.com/ankitagarwal/moodle 2014-03-04 15:59:55 +08:00
Rajesh Taneja
24b293e45e MDL-41266 Logging: Added choose option for external database store 2014-03-04 15:55:50 +08:00
Dan Poltawski
3071e2bbf9 Merge branch 'MDL-44278' of git://github.com/timhunt/moodle 2014-03-04 15:43:23 +08:00
Ankit Agarwal
e662454a35 MDL-44370 calendar: Fix calendar url in reports 2014-03-04 15:06:20 +08:00
Dan Poltawski
cf77b7c932 Merge branch 'wip-MDL-44321-master-fix' of git://github.com/marinaglancy/moodle 2014-03-04 15:03:02 +08:00
Marina Glancy
ae29096b5b MDL-44321 unittest correction since snapshot is not a reference to object any more. 2014-03-04 14:56:20 +08:00
Frederic Massart
695a18b6aa MDL-43468 mod_assign: Webservice parameters were not safely cleaned 2014-03-04 14:49:20 +08:00
Dan Poltawski
745f2cc521 Merge branch 'MDL-44436-master' of git://github.com/FMCorz/moodle 2014-03-04 14:40:23 +08:00
Damyon Wiese
98b51f3882 Merge branch 'MDL-32917-master-nomerge2' of git://github.com/mouneyrac/moodle 2014-03-04 14:27:33 +08:00
Frederic Massart
cea24f4852 MDL-44436 context: Context IDs are forced to be int
The method context::insert_context_record() sets the context::$id to
an int, while when we create an instance, the $id is often read from
a DB $record object, and is a string. The ID should always be an int.
2014-03-04 14:24:40 +08:00
Damyon Wiese
90f9c88da2 Merge branch 'MDL-42842' of https://github.com/danielneis/moodle 2014-03-04 13:41:55 +08:00
Damyon Wiese
ca0361084b Merge branch 'w10_MDL-41266_m27_logging' of https://github.com/skodak/moodle 2014-03-04 13:32:43 +08:00
Damyon Wiese
267c4b4292 Merge branch 'MDL-43738_master' of git://github.com/dmonllao/moodle 2014-03-04 13:29:03 +08:00
Dan Poltawski
1723cc26f6 Merge branch 'm27_MDL-43852_SWF_Not_Embedded_By_Mediaplugin_Filter' of https://github.com/scara/moodle 2014-03-04 12:56:08 +08:00
Dan Poltawski
caf7665077 MDL-43146 enrol_imsenterprise: missing sesskey protection 2014-03-04 12:24:51 +08:00
Frederic Massart
f4f0aa27d4 MDL-29409 repository_alfresco: Drop support for URL/link
The current solution has two major issues. Firstly, it is using the
session key in the file URL, allowing anyone with the link to steal
the identify of the poster. Secondly, the links are not presistent
and become broken as soon as the server is restarted. Let's not
support this any more until a proper solution is found in MDL-26454.
2014-03-04 11:34:51 +08:00
Dan Poltawski
d129de3761 Merge branch 'w10_MDL-44358_m27_stylesrefact' of https://github.com/skodak/moodle 2014-03-04 07:38:56 +08:00
Matteo Scaramuccia
ed25d7c411 MDL-44312 Administration Take care of cronclionly and cronremotepassword. 2014-03-03 21:46:31 +01:00
Dan Poltawski
5a02170cb3 Merge branch 'MDL-44377' of https://github.com/stronk7/moodle 2014-03-03 15:15:23 +08:00
Marina Glancy
3a7b9b76c2 MDL-39990 wiki: more detailed validation of view/edit access rights 2014-03-03 14:45:03 +08:00
Petr Škoda
31f28b6ac2 MDL-44358 inform developers that CSS handling was refactored 2014-03-03 14:19:12 +08:00
Dan Poltawski
f504e63daa Merge branch 'wip-MDL-44321-master' of git://github.com/marinaglancy/moodle 2014-03-03 13:50:18 +08:00
Dan Poltawski
a8b07dbf98 Merge branch 'wip-MDL-44362-master' of git://github.com/marinaglancy/moodle 2014-03-03 13:33:40 +08:00
Andrew Davis
5c45ea0c6b MDL-44082 mod_chat: added a security check for users already in the chat activity 2014-03-03 12:15:54 +08:00
Tomasz Muras
1298acc707 MDL-43656 mod_feedback: availablity date logic incorrect 2014-03-03 11:23:44 +08:00