Commit graph

67081 commits

Author SHA1 Message Date
Marina Glancy
2f8d26346f MDL-40721 wiki: missing page->set_url() when restoring wiki 2014-03-07 09:38:15 +08:00
Marina Glancy
846f6886f0 MDL-32699 wiki: only edit capability is required to restore wiki revision 2014-03-07 09:36:57 +08:00
Petr Škoda
c6b44cb4f2 MDL-44359 fix explode(', ', regressions from MDL-44255 2014-03-07 08:51:04 +08:00
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
Andrew Nicols
d10e611876 MDL-44480 Javascript: Correct dialogue ID generation 2014-03-06 17:02:22 +08:00
Damyon Wiese
c46db93c28 MDL-43721 Assign + groups: Improve performance of assign grading table
Add a function to the groups lib to filter a list of users down
to the ones who can see the module. Required because calling
groups_course_module_visible() for a list of users is too slow
and we shouldn't spread group logic outside of grouplib.php.

Using it in the assign grading table reduces DB queries from 6198/1 to 256/3.

This is 12secs down to 2.5secs.
2014-03-06 15:50:13 +08:00
Andrew Nicols
502d580970 MDL-44478 Javascript: Remove duplications in simpleyui rollup 2014-03-06 15:25:29 +08:00
Damyon Wiese
a9e634afa6 MDL-43721 Assign: Static cache for plugin is_enabled and is_visible because they get used alot 2014-03-06 15:15:57 +08: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 1d128663f6.
This reverts commit 4a521e6596.
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 840c1c554d.
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
Frederic Massart
eaafde6ec0 MDL-44345 repository_youtube: Endless loop when reaching last results 2014-03-05 16:58:13 +08:00
Andrew Nicols
1fa31fb376 MDL-44061 Ajax: Log whitespace issues to the server error log 2014-03-05 16:34:35 +08:00
Petr Škoda
b3d5bd33f8 MDL-44451 fix plugin_misplaced_exception exception 2014-03-05 16:33:41 +08: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
Mary Evans
457c1208d9 MDL-44328 theme_bootstrapbase: Re-defined colour variables making new ones where needed; 2014-03-05 01:44:04 +00: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