mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-19 23:55:54 +01:00
Code Issues Projects Releases Wiki Activity
58,095 Commits 36 Branches 523 Tags
Commit Graph

14781 Commits

Author SHA1 Message Date
Dan Poltawski
3280819b20 Merge branch 'MDL-30899_master' of git://github.com/dmonllao/moodle 2012-12-18 09:10:42 +08:00
Eloy Lafuente (stronk7)
7039c823dc Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle 2012-12-18 00:13:45 +01:00
Sam Hemelryk
9674194eec Merge branch 'w50_MDL-36475_m25_zindexesgrrr' of git://github.com/skodak/moodle 2012-12-18 10:43:00 +13:00
Sam Hemelryk
a483113178 Merge branch 'MDL-37176' of git://github.com/stronk7/moodle 2012-12-18 10:12:37 +13:00
Sam Hemelryk
740f635b79 Merge branch 'MDL-29733_master' of git://github.com/andyjdavis/moodle 2012-12-18 09:42:26 +13:00
David Monllao
9e8961e76f MDL-30899 moodle-enrol-notification Overridding default footer padding 2012-12-17 15:39:19 +08:00
Dan Poltawski
62347c883b Merge branch 'w50_MDL-36493_m25_mysql' of git://github.com/skodak/moodle 2012-12-17 15:28:39 +08:00
Dan Poltawski
f136e27f15 Merge branch 'MDL-37034-CategoryNavigationKey' of https://github.com/iamandrew/moodle 2012-12-17 15:21:31 +08:00
Dan Poltawski
dfa45f7ddc Merge branch 'w50_MDL-36597_m25_courselang' of git://github.com/skodak/moodle 2012-12-17 13:51:32 +08:00
Dan Poltawski
bfcbbc9833 Merge branch 'wip-MDL-35874-master' of git://github.com/phalacee/moodle 2012-12-17 11:52:55 +08:00
Dan Poltawski
06ae410844 Merge branch 'MDL-37078-master' of git://github.com/sammarshallou/moodle 2012-12-17 11:36:57 +08:00
Petr Škoda
75427a824c MDL-37171 fix multiple spreadsheet related PHP4isms 2012-12-15 12:36:40 +01:00
Petr Škoda
83be0dfd57 MDL-36475 tweak zIndexes once more 
The expected ranges are now:
* 0-1000 for normal code
* 5000-5999 for TinyMCE
* 7000-8999 for filepicker and filemanager

This patch fixes also incorrect location of "MDL-25736 - French spellchecker fixes." modification reminder.
 2012-12-15 11:46:46 +01:00
Petr Škoda
57160c25d7 MDL-36493 improve timeout handling in mysql upgrade 
Credit goes to Mark Nielsen, thanks.
 2012-12-15 11:43:52 +01:00
Petr Škoda
801ae0f4d8 MDL-36493 improve performance of mysql unsigned/lob upgrade 2012-12-15 11:43:52 +01:00
Petr Škoda
dbfe415028 MDL-36597 strip '_utf8' from all course.lang fields 2012-12-15 11:13:10 +01:00
Eloy Lafuente (stronk7)
c50c84bbae MDL-37176 timezones: updated to 2012j 2012-12-14 20:06:56 +01:00
Eloy Lafuente (stronk7)
04e56da75f Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle 2012-12-13 10:31:59 +01:00
Jason Fowler
e9904e0988 MDL-35874 - Blocks - Adding a label to the 'Add a block' block's select field 2012-12-13 15:08:23 +08:00
Damyon Wiese
d495f2d75e MDL-30700 tablelib: Fixed get_sort_for_table to work with text sorting columns for oracle 
This change stores the list of columns that require text sorting in the session,
so the static function "get_sort_for_table" can work without any additional parameters.
 2012-12-13 09:58:07 +08:00
sam marshall
79e9e6049b MDL-37078: Restore - section restore fails with multiple availability conditions 2012-12-12 10:47:17 +00:00
Sam Hemelryk
31d5b2dd69 MDL-29805 redirect: added check REQUIRE_CORRECT_ACCESS is true 2012-12-12 09:46:45 +13:00
Sam Hemelryk
16ae43f243 Merge branch 'MDL-29805-master' of git://github.com/mouneyrac/moodle 2012-12-12 09:45:29 +13:00
Eloy Lafuente (stronk7)
771b820285 Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle 2012-12-11 19:56:31 +01:00
Eloy Lafuente (stronk7)
6b9dfe731e MDL-37032 upgrade: define all the 2.4.0 points 2012-12-11 13:11:11 +01:00
Dan Poltawski
02dd021d26 Merge branch 'w49_MDL-36447_m25_gdtest' of git://github.com/skodak/moodle 2012-12-11 17:54:24 +08:00
Damyon Wiese
1e4bd9fe25 MDL-30700 Assignment 2.2: Added text_sorting function to tablelib 
Allows oracle to sort by text (clob) columns (should be used sparingly).
 2012-12-11 15:42:24 +08:00
Dan Poltawski
4889da2199 Merge branch 'w49_MDL-36983_m25_ordertext' of git://github.com/skodak/moodle 2012-12-11 12:09:10 +08:00
Dan Poltawski
cdb7110f72 Merge branch 'MDL-36845' of git://github.com/timhunt/moodle 2012-12-11 11:58:44 +08:00
Sam Hemelryk
159537f65a Merge branch 'w49_MDL-36936_m25_composerdev' of git://github.com/skodak/moodle 2012-12-11 15:35:07 +13:00
Sam Hemelryk
7a6ef4ee8f Merge branch 'w49_MDL-37060_m25_sessinit' of git://github.com/skodak/moodle 2012-12-11 15:27:26 +13:00
Dan Poltawski
b3b4fad994 Merge branch 'MDL-36773-master' of git://github.com/mouneyrac/moodle 2012-12-11 09:56:40 +08:00
Sam Hemelryk
9a2a9b146f Merge branch 'w49_MDL-37061_m25_invalidlang' of git://github.com/skodak/moodle 2012-12-11 14:44:08 +13:00
Andrew Davis
415b15ccd6 MDL-29733 grade: SQL and comment cleanup 2012-12-11 09:15:31 +08:00
Jonathan Champ
8a592bd551 MDL-29733 grade: Query for Identifying Grade Grades to Precreate is SLOW 2012-12-11 09:15:31 +08:00
Sam Hemelryk
0296e662a3 Merge branch 'w49_MDL-29442_m25_entityutf8' of git://github.com/skodak/moodle 2012-12-11 10:22:19 +13:00
Dan Poltawski
8df07e5086 Merge branch 'MDL-36538_webdav_memory' of git://github.com/davosmith/moodle 2012-12-10 13:06:37 +08:00
Sam Hemelryk
754f808546 Merge branch 'MDL-36946-master' of git://github.com/micaherne/moodle 2012-12-10 14:43:40 +13:00
Mark Nielsen
e893c6d442 MDL-36607: Improve block drag and drop 
* Adding support for subpage
* Adding support for regions that do not start with "side-"
 2012-12-10 14:12:57 +13:00
Sam Hemelryk
9d8abffc87 Merge branch 'MDL-35954_master' of git://github.com/markn86/moodle 2012-12-10 14:08:06 +13:00
Sam Hemelryk
1b4e47e43a Merge branch 'MDL-36433-master' of git://github.com/itamart/moodle 2012-12-10 12:13:32 +13:00
Sam Hemelryk
8b5944b9b9 Merge branch 'MDL-36764' of git://github.com/danpoltawski/moodle 2012-12-10 11:54:01 +13:00
Sam Hemelryk
fa9b53cdf8 Merge branch 'message_nav' of git://github.com/andyjdavis/moodle 2012-12-10 11:00:17 +13:00
Sam Hemelryk
70d09e7fd6 Merge branch 'MDL-36761_loop' of git://github.com/andyjdavis/moodle 2012-12-10 10:54:32 +13:00
Sam Hemelryk
d229ac0f0a Merge branch 'wip-MDL-37026-master' of git://github.com/abgreeve/moodle 2012-12-10 10:23:55 +13:00
Petr Škoda
65598feb36 MDL-36447 skip file preview test if GD not available 2012-12-09 19:22:01 +01:00
Petr Škoda
1a4596e434 MDL-29442 add missing utf-8 to entity html encoding and decoding 2012-12-09 18:21:38 +01:00
Petr Škoda
25336547e8 MDL-37061 always validate lang when setting session user 
This should resolve problems with TinyMCE langs and some unknown MUCH caching issue.
 2012-12-09 11:28:36 +01:00
Petr Škoda
3277509a60 MDL-37060 prevent notice in session_get_instance() 2012-12-08 12:31:05 +01:00
Petr Škoda
32772035e1 MDL-36936 require phpunit as composer --dev only 2012-12-07 18:20:03 +01:00