mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-04 08:06:30 +01:00
Code Issues Projects Releases Wiki Activity
61,864 Commits 36 Branches 523 Tags
Commit Graph

61864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
c7b6c86a49 Merge branch 'wip-MDL-39044-master' of git://github.com/phalacee/moodle 2013-06-24 15:43:19 +12:00
Sam Hemelryk
109a2ff00e Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle 2013-06-24 15:15:01 +12:00
Sam Hemelryk
4ba45e3955 Merge branch 'MDL-39779' of git://github.com/rwijaya/moodle 2013-06-24 14:43:00 +12:00
Sam Hemelryk
7bb2a9586e Merge branch 'MDL-39760-master' of https://github.com/lucisgit/moodle 2013-06-24 14:30:49 +12:00
Sam Hemelryk
615a5aa6f1 Merge branch 'MDL-39280-master-int' of git://github.com/FMCorz/moodle 2013-06-24 14:19:20 +12:00
Sam Hemelryk
f8dcecfd07 Merge branch 'mdl26dev-MDL-40130-let-course-category-caching-be-used' of git://github.com/brki/moodle 2013-06-24 11:44:20 +12:00
Sam Hemelryk
1d713c7c53 Merge branch 'w26_MDL-40294_m26_plugininfo' of https://github.com/skodak/moodle 2013-06-24 11:42:29 +12:00
Sam Hemelryk
f04721e2bf MDL-38347 fixed whitespace 2013-06-24 11:28:23 +12:00
Sam Hemelryk
2d9161791f Merge branch 'wip-MDL-38347-master' of git://github.com/phalacee/moodle 2013-06-24 11:22:30 +12:00
Sam Hemelryk
45aac51a3c MDL-38376 mod_assign: fixed whitespace 2013-06-24 11:05:51 +12:00
Sam Hemelryk
8448a12a33 Merge branch 'MDL-28124_master' of git://github.com/lazydaisy/moodle 2013-06-24 10:30:19 +12:00
Amanda Doughty
ea698284cf MDL-38376 mod_assign: Feedback displayed when Grade set to hidden 2013-06-24 10:16:04 +12:00
Sam Hemelryk
0b20ce2841 Merge branch 'wip-MDL-38631-master' of git://github.com/marinaglancy/moodle 2013-06-24 10:00:20 +12:00
Sam Hemelryk
ef03bb6d9f Merge branch 'MDL-39153-master' of git://github.com/ankitagarwal/moodle 2013-06-24 08:57:44 +12:00
Petr Škoda
490149eb8f MDL-40294 remove references to removed plugin caches 2013-06-23 21:24:15 +02:00
Petr Škoda
c3bc6f1217 MDL-39701 prevent filters before finishing 2.5 upgrade 
This prevents problems with unsigned integers in MySQL 5.5
 2013-06-22 22:22:47 +02:00
Marina Glancy
3b42c973d7 MDL-38631 link categories in My courses only when needed 2013-06-22 16:27:28 +10:00
Dmytro Vorona
257b59e737 MDL-38631 Fixed faulty add_category call, introduced in 758103 2013-06-22 16:27:28 +10:00
Brian King
b04f84bc80 MDL-40130 Caching: let make_categories_list use the cache it makes 2013-06-21 11:12:21 +02:00
Dan Poltawski
0ea1fbbb55 weekly release 2.6dev 2013-06-21 13:25:42 +08:00
Dan Poltawski
a6ef66d919 fix permissions 2013-06-21 13:24:44 +08:00
Dan Poltawski
ba045b31a7 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-06-21 13:23:21 +08:00
Dan Poltawski
e64e28d715 Revert "MDL-33105 flexible apply_units() function" 
This reverts commit bf766d43f965d81ff0461026e6f3aba34c0f59b0.
 2013-06-20 21:09:36 +08:00
Jason Fowler
a9e9b129e0 MDL-39044 - Course Completion - Replaceing strtolower with multibyte safe textlib::strtolower 2013-06-20 08:56:23 +08:00
Ruslan Kabalin
450fde4e16 MDL-39760: mod_assign: Add few more callback methods. 
Adds lock, unlock and release_to_draft. All of them accept single parameter -
an assign_submission record.
 2013-06-19 14:51:46 +01:00
Dan Poltawski
0ea73a5524 Merge branch 'fix_classloading8' of git://github.com/skodak/moodle 2013-06-19 15:47:08 +08:00
Petr Škoda
1652aa9cdd MDL-39854 fix borked core_component cache 2013-06-19 09:42:05 +02:00
Dan Poltawski
846f6fbe00 MDL-33955 filelib: accept any HTTP 1.0 in tests 
This is common with proxies like squid which don't support http
pipelining.
 2013-06-19 14:55:35 +08:00
David Monllao
1d4ae19d62 MDL-39854 disable component cachin in BEHAT_TEST 2013-06-19 11:28:32 +08:00
Sam Hemelryk
11fb83fee8 Merge branch 'MDL-40109_master-fix' of git://github.com/dmonllao/moodle 2013-06-19 14:06:41 +12:00
Sam Hemelryk
80b3780a53 Revert "MDL-38555 forms: Prevent same data submission multiple times." 
This reverts commit 761670208a97c0ed7e1ff7c2e6a7ec5494eb93d3.
 2013-06-19 13:45:46 +12:00
David Monllao
2532b034f4 MDL-40109 behat: Fixing backup feature 2013-06-19 08:53:08 +08:00
Sam Hemelryk
9d109ad60d Merge branch 'w25_MDL-33955_m26_curlredir' of git://github.com/skodak/moodle 2013-06-19 09:13:30 +12:00
Eloy Lafuente (stronk7)
d745d2d45e MDL-40103 Now xmldb code matches original templates 100% 
There were still some differences between the php code
used in the issue and the php code generated by the
xmldb editor for the template tables. This commit put
both 100% in sync.
 2013-06-18 15:22:51 +02:00
Russell Smith
2412371efd MDL-40103 stats: correct incorrectly copied stats tables. 2013-06-18 12:16:38 +02:00
Petr Škoda
04a4b97f99 MDL-39854 disable component caching in BEHAT_UTIL 2013-06-18 12:02:07 +02:00
Petr Škoda
402a974e5e MDL-39854 fix get_list_of_plugins() test 2013-06-18 11:46:44 +02:00
Dan Poltawski
6ef007def6 Merge branch 'MDL-37761-m' of git://github.com/andrewnicols/moodle 2013-06-18 16:47:18 +08:00
Eloy Lafuente (stronk7)
952cd13796 Merge branch 'fix_classloading5' of git://github.com/skodak/moodle 2013-06-18 10:37:45 +02:00
Petr Škoda
7f86a95f30 MDL-39854 fix test_finder regression 2013-06-18 10:37:04 +02:00
Petr Škoda
1abf2f6acc MDL-39854 fix installer regression caused by new core_component 2013-06-18 10:31:26 +02:00
Dan Poltawski
0bd0328e6c MDL-39854: version bump for classloader new world 2013-06-18 15:13:51 +08:00
Petr Škoda
e835ef583a MDL-39854 use classloader in add-on installer tool 2013-06-18 09:10:23 +02:00
Petr Škoda
299e107e97 MDL-39854 use class loader in editor_tinymce 2013-06-18 09:10:17 +02:00
Petr Škoda
9e19a0f08b MDL-39854 reimplement Frankenstyle support and enable classloader 
Better performance, more reliable, completely self contained,
more validation and full backwards compatibility.

This will also allow us to implement ignoring of plugins.
 2013-06-18 09:10:07 +02:00
Dan Poltawski
3d164e1ef4 Revert "MDL-39474 Library: Make a fast way to check developer debug mode" 
There were multiple problems discovered.

This reverts commit 5c92e7a740fbce4184cf204a11ebbb6b918a376b.

Conflicts:
	admin/cli/install.php
 2013-06-18 15:07:22 +08:00
Andrew Nicols
aa15e2a8b0 MDL-37761 Backup: Add phpdoc for MODE constants 2013-06-18 07:52:04 +01:00
Andrew Nicols
b1850c12c1 MDL-37761 Backup: Do not include files in backups when importing courses/activities 
When we import courses or duplicate activities, the deduplicating nature of
the file_storage system means that we don't actually have to include the
real files in the backup - just their metadata from the file table.

The restoration process needs to know not to expect files from the backup
phase so a flag is set in moodle_backup metadata.
 2013-06-18 07:52:04 +01:00
Ankit Agarwal
fbf4acdc9e MDL-39153 libraries: role_unassign doesn't accept context as parameter. Fixing incorrect doc. 2013-06-18 14:27:30 +08:00
Ankit Agarwal
1e63179285 MDL-39153 webservices: Provide alternative to passing contextids 
As per our policy webservices should never have a required contextid, thuse providing a support for passing contextlevel and instanceid as parameters to the api
 2013-06-18 14:15:54 +08:00