mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
66,866 Commits 36 Branches 519 Tags
Commit Graph

66866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
0a489777fc weekly release 2.7dev 2014-03-06 22:16:58 +01:00
Eloy Lafuente (stronk7)
5d04aed148 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-03-06 22:16:48 +01:00
Yuliya Bozhko
100ec86182 MDL-44140 badges: Prevent non-owners to change visibility of issued badges 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-03-06 14:33:51 +08:00
Damyon Wiese
052b8c81c6 Revert "MDL-32917 YUI2 to YUI3 Calendar port: only display the date from the matching selector and display the month/year matching the selector value" 
There are numerous bugs with this new module to do with showing the currently selected date,
random changes in the selected dates, showing multiple selected dates and css errors.

This reverts commit 1d128663f69be8b60fc28b6b7732acd24d800a98.
This reverts commit 4a521e6596918279fd0cdeb47d06e7906bc004cc.
 2014-03-06 13:38:17 +08:00
Damyon Wiese
81b4ec4fc3 Merge branch 'MDL-32917-master-nomerge3' of git://github.com/mouneyrac/moodle 2014-03-06 11:41:09 +08:00
Jerome Mouneyrac
1d128663f6 MDL-32917 YUI2 to YUI3 Calendar port: only display the date from the matching selector and display the month/year matching the selector value 2014-03-06 11:35:00 +08:00
Damyon Wiese
d09cfab660 Merge branch 'wip-MDL-44403-master' of git://github.com/marinaglancy/moodle 2014-03-06 09:21:24 +08:00
Dan Poltawski
dc88f6699d Revert "MDL-43852 Filters Fixed naked-OR conditions." 
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.

This reverts commit 840c1c554d12d9214928da6f10989fc5546dbb43.
 2014-03-06 09:03:19 +08:00
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
AMOS bot
f172b961ae Automatically generated installer lang files 2014-03-05 00:54:42 +00: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
Marina Glancy
d5bc7b66e9 MDL-44403 events: MDL-44403 events: bug fix in legacy event data for unknown_service_api_called 2014-03-04 15:16:19 +08:00
Marina Glancy
24c32bdf2f MDL-44403 events: added public method to get eventdata 2014-03-04 15:16:15 +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