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

62190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marina Glancy
73118a2687 Merge branch 'MDL-37065-master' of git://github.com/damyon/moodle 2013-07-09 18:06:33 +10:00
Damyon Wiese
ef5fd5bf40 Merge branch 'wip-mdl-40400' of git://github.com/rajeshtaneja/moodle 2013-07-09 16:05:02 +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
Damyon Wiese
a6673a8b04 Merge branch 'MDL-40369-master' of git://github.com/FMCorz/moodle 2013-07-09 15:28:31 +08:00
Damyon Wiese
bc90ad107a Merge branch 'MDL-40455_M26' of git://github.com/lazydaisy/moodle 2013-07-09 15:20:07 +08:00
Damyon Wiese
de0a6ed459 Merge branch 'MDL-40443' of git://github.com/timhunt/moodle 2013-07-09 15:15:47 +08:00
Jamie Pratt
01c898ecec MDL-40171 question saving test 2013-07-09 15:08:01 +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
Marina Glancy
f64998fab3 Merge branch 'MDL-39020-master' of git://github.com/ankitagarwal/moodle 2013-07-09 16:32:16 +10: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
df6c384d55 MDL-40218 Assignment: updated upgrade.txt and version number 2013-07-09 14:09:11 +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
Damyon Wiese
8a011a9f0a Merge branch 'w28_MDL-40243_m26_ldapsuspend' of https://github.com/skodak/moodle 2013-07-09 13:44:01 +08: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
Damyon Wiese
c2bee5e0d1 Merge branch 'master_MDL-37484' of git://github.com/danmarsden/moodle 2013-07-09 13:33:42 +08:00
Rajesh Taneja
e6cc5347eb MDL-40218 Assignment: Added unit test to check suspended users 2013-07-09 13:32:10 +08:00
Rajesh Taneja
3fa106d0d6 MDL-40218 Assignment: User should not be able to view submissions, whithout proper permissions 2013-07-09 13:32:09 +08:00
Rajesh Taneja
c494e18cbd MDL-40218 Assignment: Participants/submission/grade count only include active users 2013-07-09 13:32:08 +08:00
Rajesh Taneja
a69944eb8b MDL-40218 Assignment: Show suspended user, similar to the way they are shown in grader report 2013-07-09 13:32:08 +08:00
Rajesh Taneja
4c4c7b3f3f MDL-40218 Assignment: Added show/hide suspended users functionality 2013-07-09 13:32:08 +08:00
Damyon Wiese
eb729e0391 Merge branch 'MDL-40499' of git://github.com/jmvedrine/moodle 2013-07-09 13:26:49 +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
Damyon Wiese
26616e4b6d Merge branch 'MDL-40386' of https://github.com/prateeksachan/moodle 2013-07-09 12:34:31 +08:00
Jamie Pratt
596ea56f6b MDL-40388 Reset globals after each unit test 2013-07-09 12:26:28 +08:00