mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-04 16:10:59 +01:00
Code Issues Projects Releases Wiki Activity
62,375 Commits 36 Branches 523 Tags
Commit Graph

16287 Commits

Author SHA1 Message Date
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
Jason Fowler
3b62cd64d7 MDL-37565 - HTMLEditor - Adding a toggle plugin to TinyMCE to improve the appearance of the editor 2013-07-09 13:02:05 +08:00
Jamie Pratt
596ea56f6b MDL-40388 Reset globals after each unit test 2013-07-09 12:26:28 +08:00
Tony Levi
00726467f6 MDL-40035: Avoid rebuild_course_cache always for empty course 2013-07-09 13:53:27 +10:00
Adrian Greeve
a327f25ef1 MDL-31776 - lib: Alternate name fields 
Add support for additional name fields and flexible formating of
user names.
 2013-07-09 11:45:50 +08:00
Damyon Wiese
9ac5809512 Merge branch 'MDL-40562_master' of git://github.com/dmonllao/moodle 2013-07-09 11:04:58 +08:00
Sam Hemelryk
a13ee8e18a Merge branch 'MDL-40402-master2' of git://github.com/ankitagarwal/moodle 2013-07-09 14:42:03 +12:00
Damyon Wiese
b080d5b688 Merge branch 'wip-MDL-40490-master' of git://github.com/abgreeve/moodle 2013-07-09 10:03:22 +08:00
Damyon Wiese
15b726d584 Merge branch 'MDL-40561-master' of git://github.com/FMCorz/moodle 2013-07-08 22:28:21 +08:00
David Monllao
bda1dea4de MDL-40562 behat: Catch NoSuchElement exception 2013-07-08 12:05:45 +02:00
Frederic Massart
dc95bdd8d9 MDL-40561 phpunit: Return the right guessed class 2013-07-08 17:58:38 +08:00
Damyon Wiese
64830bf658 Merge branch 'MDL-38314-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2013-07-08 15:10:58 +08:00
Damyon Wiese
3536560eff Merge branch 'w28_MDL-40415_m26_opcache' of https://github.com/skodak/moodle 2013-07-08 13:40:09 +08:00