Dan Poltawski
317638a3d6
MDL-28466 remove enrol_authorize from standard list of plugins
2013-07-15 10:25:22 +08:00
Marina Glancy
bf50508f06
MDL-37565 fixed PDW plugin to calculate number of button rows
2013-07-11 14:47:58 +10:00
Marina Glancy
06832223d4
Merge branch 'MDL-40354-master' of git://github.com/ankitagarwal/moodle
2013-07-10 13:15:37 +10:00
Ankit Agarwal
e481f05c0d
MDL-40354 groups: Fix issues in groups_group_visible()
2013-07-10 10:50:22 +08:00
Ankit Agarwal
2d4d29da06
MDL-40354 groups:groups_get_activity_allowed_groups() should use passed userid to check capabilities
2013-07-10 10:50:22 +08:00
Ankit Agarwal
e7eb992d3a
MDL-40354 groups: Add new api groups_group_visible()
2013-07-10 10:50:21 +08:00
Ankit Agarwal
f4d46f6848
MDL-40354 groups: Add unit tests for the api groups_group_visible()
2013-07-10 10:50:21 +08:00
Marina Glancy
f8be9f9e73
Merge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle
2013-07-10 11:58:44 +10:00
Sam Hemelryk
6426d2d264
Merge branch 'wip-MDL-40593-master' of git://github.com/marinaglancy/moodle
2013-07-10 12:19:05 +12:00
Marina Glancy
9a2188812d
Merge branch 'wip-mdl-40218' of git://github.com/rajeshtaneja/moodle
2013-07-10 09:58:09 +10:00
Sam Hemelryk
1be1f6be53
Merge branch 'w28_MDL-40450_m26_tinymcebuttons' of https://github.com/skodak/moodle
2013-07-10 11:02:21 +12:00
Sam Hemelryk
ccae3a612d
Merge branch 'w28_MDL-40537_m26_majorupgrade' of https://github.com/skodak/moodle
2013-07-10 10:43:28 +12:00
Sam Hemelryk
a4fd82ac75
Merge branch 'MDL-40466-master' of git://github.com/FMCorz/moodle
2013-07-10 10:19:13 +12:00
Sam Hemelryk
33ed6a9d94
Merge branch 'MDL-40516-master' of git://github.com/danpoltawski/moodle
2013-07-10 10:12:44 +12:00
Sam Hemelryk
59cd82f9b7
Merge branch 'MDL-40496-master' of git://github.com/danpoltawski/moodle
...
Conflicts:
lib/deprecatedlib.php
2013-07-10 09:51:15 +12:00
Marina Glancy
deabf12e31
MDL-40593 fixed SQL query to be postgres-compartible
2013-07-09 22:24:02 +10:00
Dan Poltawski
3a1b0dd908
Merge branch 'wip-MDL-40430-master' of git://github.com/abgreeve/moodle
2013-07-09 16:57:07 +08:00
Dan Poltawski
f6455e63dd
Merge branch 'wip-MDL-40429-master' of git://github.com/abgreeve/moodle
2013-07-09 16:52:52 +08:00
Dan Poltawski
58b2251be3
Merge branch 'MDL-40425-master' of git://github.com/ankitagarwal/moodle
2013-07-09 16:42:18 +08:00
Adrian Greeve
329846f198
MDL-40430 - Libraries: Deprecate print_context_name().
2013-07-09 16:11:55 +08:00
Adrian Greeve
b4482dfe19
MDL-40429 - Libraries: Deprecate get_contextlevel_name().
2013-07-09 16:07:04 +08:00
Dan Poltawski
92e9260d96
Merge branch 'wip-mdl-40427' of git://github.com/rajeshtaneja/moodle
2013-07-09 16:00:12 +08:00
Ankit Agarwal
db314f34fb
MDL-40425 libraries: Remove context_instance_preload() from core
2013-07-09 15:55:51 +08:00
Ankit Agarwal
c5dcd25d5f
MDL-40425 libraries: Deprecate context_instance_preload()
2013-07-09 15:55:40 +08:00
Dan Poltawski
af578aec7c
Merge branch 'wip-mdl-40407' of git://github.com/rajeshtaneja/moodle
...
(moved a deprecation warning around to try and avoid more conflicts in
upgrade.txt)
Conflicts:
lib/upgrade.txt
2013-07-09 15:55:20 +08:00
Rajesh Taneja
2c5b0eb7fc
MDL-40427 Libraries: Deprecated context_moved in favor of context::update_moved()
2013-07-09 15:51:29 +08:00
Dan Poltawski
9e40816b3a
Merge branch 'MDL-40406-master' of git://github.com/FMCorz/moodle
...
Conflicts:
lib/upgrade.txt
2013-07-09 15:49:45 +08:00
Dan Poltawski
0574cd9061
Merge branch 'MDL-40405-master' of git://github.com/FMCorz/moodle
...
Conflicts:
lib/upgrade.txt
2013-07-09 15:47:07 +08:00
Rajesh Taneja
8f7d3d129f
MDL-40407 Libraries: deprecated preload_course_contexts
2013-07-09 15:46:51 +08:00
Dan Poltawski
d06f10cf97
Merge branch 'wip-mdl-40404' of git://github.com/rajeshtaneja/moodle
...
Conflicts:
lib/upgrade.txt
2013-07-09 15:43:43 +08:00
Frederic Massart
cc4de415b4
MDL-40406 libraries: Deprecate rebuild_contexts()
2013-07-09 15:43:02 +08:00
Frederic Massart
79f6b384d4
MDL-40406 libraries: Deprecate build_context_path()
2013-07-09 15:43:02 +08:00
Frederic Massart
84378a57b9
MDL-40406 libraries: Deprecate cleanup_contexts()
2013-07-09 15:43:02 +08:00
Frederic Massart
9fdbf620a4
MDL-40406 libraries: Deprecate create_contexts()
2013-07-09 15:43:02 +08:00
Frederic Massart
f9aa8016b1
MDL-40405 libraries: Deprecate get_child_contexts()
2013-07-09 15:37:40 +08:00
Jamie Pratt
faaf80fadb
MDL-40176 mock_submit method for testing
2013-07-09 15:07:36 +08:00
Rajesh Taneja
c513812cd9
MDL-40404 Libraries: Moved DEVELOPER_DEBUG outside loop
2013-07-09 14:33:21 +08:00
Rajesh Taneja
7f5b51c4e6
MDL-40404 Libraries: Deprecated get_parent_contextid()
2013-07-09 14:33:21 +08:00
Andrew Davis
766fd0d92f
MDL-34454 core_message: removed a deprecated function
...
Conflicts:
lib/deprecatedlib.php
2013-07-09 14:11:07 +08:00
Rajesh Taneja
1ecb8044b6
MDL-40218 Assignment: Added lazy loading for showactiveenrol option and supended users
2013-07-09 14:09:11 +08:00
Marina Glancy
8bed37619e
Merge branch 'MDL-23646-master' of git://github.com/damyon/moodle
2013-07-09 15:55:51 +10:00
Marina Glancy
84842f54dd
Merge branch 'wip-MDL-37565-master' of git://github.com/phalacee/moodle
2013-07-09 15:54:45 +10:00
Dan Poltawski
bb0458aa7c
Merge branch 'MDL-40403-master' of git://github.com/FMCorz/moodle
2013-07-09 13:38:10 +08:00
Frederic Massart
82c9aa843e
MDL-40403 tests: Fix pointless assertion
2013-07-09 13:34:44 +08:00
Frederic Massart
8e8891b76b
MDL-40403 libraries: Deprecate get_parent_contexts()
2013-07-09 13:34:44 +08:00
Rajesh Taneja
e6cc5347eb
MDL-40218 Assignment: Added unit test to check suspended users
2013-07-09 13:32:10 +08:00
Damyon Wiese
b9bca41b53
MDL-23646: Tinymce wrap plugin fixes.
...
Added info to upgrade.txt
Removed wrap plugins from the tinymce plugin list.
Fix trailing comma in wrap plugin javascript.
Removed non functioning "!" handling.
Fixed icons for wrap plugin.
2013-07-09 13:22:33 +08:00
Damyon Wiese
46a24596b8
MDL-23646 tinymce: Fix for pdw plugin
...
This plugin was changing the display of the toolbar tables from "display: table"
to "display: block" when hiding/unhiding the toolbars.
This broke the wrapping plugin.
2013-07-09 13:22:33 +08:00
Damyon Wiese
650a44fc26
MDL-23646 tinymce: Add upgrade algorithm for custom toolbars.
2013-07-09 13:22:33 +08:00
Damyon Wiese
05e9c136e6
MDL-23646 tinymce: Add plugin to wrap toolbar on small screens
2013-07-09 13:22:33 +08:00