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

61908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
36096f0fe9 Merge branch 'MDL-39634_master' of git://github.com/dmonllao/moodle 2013-06-18 14:51:06 +12:00
Sam Hemelryk
0f8d5064f1 Merge branch 'wip-MDL-38318_master' of git://github.com/gjb2048/moodle 2013-06-18 14:47:25 +12:00
Dan Poltawski
0afca44627 Merge branch 'MDL-40180_master' of https://github.com/nadavkav/moodle 2013-06-18 10:42:33 +08:00
Dan Poltawski
83b8e822f1 Merge branch 'MDL-33105' of https://github.com/ppichet/moodle 2013-06-18 10:35:47 +08:00
Sam Hemelryk
5c8cfccad3 Merge branch 'w25_MDL-26455_m26_installport' of git://github.com/skodak/moodle 
Conflicts:
	admin/cli/install.php
 2013-06-18 14:29:08 +12:00
Sam Hemelryk
1b194c9047 Merge branch 'MDL-17468-master' of git://github.com/danpoltawski/moodle 2013-06-18 14:06:33 +12:00
Sam Hemelryk
ad3d3c2ba7 Merge branch 'MDL-40036-master' of git://github.com/FMCorz/moodle 2013-06-18 14:01:54 +12:00
Sam Hemelryk
044bb690f8 Merge branch 'MDL-39865-master' of git://github.com/FMCorz/moodle 2013-06-18 13:54:39 +12:00
Jason Fowler
ee11f4a759 MDL-39794 - Course - Add 'Add a new course' button to front page when page editing is on 2013-06-18 09:26:55 +08:00
Marina Glancy
4b4ac86a37 Merge branch 'MDL-38079_master' of git://github.com/mr-russ/moodle 2013-06-18 11:18:30 +10:00
Eloy Lafuente (stronk7)
b515f8001d MDL-40137 Whitespace fix 2013-06-18 01:47:13 +02:00
Eloy Lafuente (stronk7)
421e6decf4 Merge branch 'wip-MDL-40137-m26' of git://github.com/samhemelryk/moodle 2013-06-18 01:43:57 +02:00
Yuliya Bozhko
111c5fd93f MDL-40022 badges: Fix missing calls to setType in course criteria settings 2013-06-18 11:38:22 +12:00
Sam Hemelryk
d35d831190 Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle 2013-06-18 11:38:05 +12:00
Eloy Lafuente (stronk7)
edd3fd91d7 MDL-40103 doc create_temptable_from_real_table() deletion. 2013-06-18 01:35:11 +02:00
Eloy Lafuente (stronk7)
27c07947c4 MDL-40103 Fix wrong call, causing restore to fail. 2013-06-18 01:30:14 +02:00
Eloy Lafuente (stronk7)
672bee2d23 MDL-40103 Bump version & whitespace/punctuation 2013-06-18 01:30:13 +02:00
Eloy Lafuente (stronk7)
96c90fab6a Merge branch 'MDL-40103_temptable' of https://github.com/mr-russ/moodle 
Conflicts:
	lib/db/upgrade.php
 2013-06-18 01:30:07 +02:00
Sam Hemelryk
407020ef8c Merge branch 'MDL-32253-master' of git://github.com/danpoltawski/moodle 2013-06-18 11:26:23 +12:00
Sam Hemelryk
7d7a6e3c20 Merge branch 'wip-MDL-26998-master' of git://github.com/abgreeve/moodle 2013-06-18 11:22:40 +12:00
Sam Hemelryk
21467b4461 Merge branch 'wip-mdl-39863' of git://github.com/rajeshtaneja/moodle 2013-06-18 11:19:35 +12:00
Sam Hemelryk
540a8f8499 Merge branch 'MDL-40109_master' of git://github.com/dmonllao/moodle 2013-06-18 11:08:45 +12:00
Sam Hemelryk
e667bd9db0 Merge branch 'MDL-39626_master' of git://github.com/kordan/moodle 
Conflicts:
	theme/formal_white/style/course.css
 2013-06-18 11:03:21 +12:00
Eloy Lafuente (stronk7)
57ed9d90c7 Merge branch 'w25_MDL-40210_m26_badgescaps' of git://github.com/skodak/moodle 2013-06-18 00:55:53 +02:00
Eloy Lafuente (stronk7)
a48dad1fe1 Merge branch 'MDL-33562-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-06-18 00:40:36 +02:00
Sam Hemelryk
007b5f5f35 Merge branch 'MDL-30132_master' of git://github.com/lazydaisy/moodle 2013-06-18 10:27:11 +12:00
Sam Hemelryk
03d34e07c0 Merge branch 'wip-mdl-16982' of git://github.com/rajeshtaneja/moodle 2013-06-18 10:04:18 +12:00
Petr Škoda
ad35231698 MDL-40210 do not use CAP_PREVENT for role defaults! 2013-06-17 12:12:36 +02:00
Russell Smith
725ab3d07f MDL-38079 mod_feedback - Hide "add question to activity" button 2013-06-17 19:50:13 +10:00
Dan Poltawski
e9d011250e Merge branch 'MDL-40110_master' of git://github.com/dmonllao/moodle 2013-06-17 17:02:11 +08:00
Dan Poltawski
85db00e0c3 Merge branch 'MDL-39825_dev_master' of https://github.com/totara/openbadges 2013-06-17 16:40:24 +08:00
Dan Poltawski
af08eb9912 Merge branch 'MDL-39474-master' of git://github.com/sammarshallou/moodle 2013-06-17 15:36:15 +08:00
Ankit Agarwal
5b23d9adac MDL-39152 webservices: Rename external_api::get_context() to external_api::get_context_from_params() 2013-06-17 15:18:49 +08:00
Dan Poltawski
877bb8294c Merge branch 'MDL-31680' of https://github.com/ppichet/moodle 2013-06-17 14:53:19 +08:00
Dan Poltawski
e00916d933 Merge branch 'wip-MDL-40136-m26' of git://github.com/samhemelryk/moodle 2013-06-17 13:37:18 +08:00
Rajesh Taneja
d8372b54b9 MDL-16982 Administration: Moved bulk action outside loop and using profile api to save data 2013-06-17 12:55:09 +08:00
Sam Hemelryk
68e33c2932 Merge branch 'm26_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle 2013-06-17 16:14:00 +12:00
Sam Hemelryk
ca64174031 Merge branch 'MDL-21933_master' of https://github.com/mr-russ/moodle 2013-06-17 15:45:56 +12:00
Sam Hemelryk
e4ce39c99f Merge branch 'wip-MDL-40091-master' of git://github.com/satrun77/moodle 2013-06-17 15:43:31 +12:00
Rossiani Wijaya
47e00c342f MDL-39779 wiki module: fix the alignment for required label to display inline on mobile devices 2013-06-17 11:26:11 +08:00
Sam Hemelryk
d63082454b Merge branch 'MDL-39369' of git://github.com/rwijaya/moodle 2013-06-17 15:10:41 +12:00
Dan Poltawski
f1da132271 MDL-40207 simplepie: reduce false failures in unit tests 
The simplepie tests time out too quickly due to a low connect timeout,
to fix this:

* Introduced a way to set the timeout during intitial construction
* Converted the unit tests to use a high timeout value
 2013-06-17 10:32:25 +08:00
Sam Hemelryk
e41ecc6260 Merge branch 'MDL-39761-master' of https://github.com/lucisgit/moodle 2013-06-17 14:30:24 +12:00
AMOS bot
a87a4764e0 Automatically generated installer lang files 2013-06-17 00:43:35 +00:00
Marina Glancy
ba75dfd10d Merge branch 'wip-MDL-40142-m26' of git://github.com/samhemelryk/moodle 2013-06-17 10:43:29 +10:00
Sam Hemelryk
a4f264031a MDL-39949 dock: fixed whitespace 2013-06-17 10:24:39 +12:00
Sam Hemelryk
7d1d4137ca Merge branch 'wip-MDL-39949-master' of git://github.com/phalacee/moodle 2013-06-17 10:01:10 +12:00
Sam Hemelryk
d85f228f18 MDL-40137 theme_clean: corrected lib.php function names 2013-06-17 09:39:23 +12:00
Sam Hemelryk
67b34c34f0 MDL-40136 cache: fixed dirroot change bugs with plugin caches 2013-06-17 09:23:50 +12:00
Sam Hemelryk
8a7d747581 MDL-40142 navigation: fixed chainable issue with navigation JS 2013-06-17 09:11:45 +12:00