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

65435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
753eb47edc Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle 2013-12-03 13:45:59 +08:00
Damyon Wiese
6b8c6278bc Merge branch 'MDL-43076-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-12-03 13:18:47 +08:00
Damyon Wiese
e7af63633e Merge branch 'MDL-43081-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/upgrade.txt
 2013-12-03 13:03:32 +08:00
Dan Poltawski
ebe051792d Merge branch 'MDL-42738_master' of git://github.com/dmonllao/moodle 2013-12-03 12:41:03 +08:00
Dan Poltawski
03742ae8f9 Merge branch 'MDL-43066_master' of git://github.com/dmonllao/moodle 2013-12-03 12:36:50 +08:00
Damyon Wiese
b3d252a6b4 Merge branch 'wip-mdl-43048' of https://github.com/rajeshtaneja/moodle 2013-12-03 11:43:32 +08:00
Dan Poltawski
cd515a9421 Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle 2013-12-03 11:41:06 +08:00
Mark Nelson
4c61097cc7 MDL-42932 core_lib: added missing $CFG declaration 2013-12-02 19:25:32 -08:00
Damyon Wiese
de3e0d20bd Merge branch 'wip-mdl-42904' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	enrol/self/db/upgrade.php
 2013-12-03 11:10:18 +08:00
Dan Poltawski
8d8e6f9607 Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle 2013-12-03 10:07:10 +08:00
Damyon Wiese
13410584be Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle 
Conflicts:
	filter/tex/version.php
	lang/en/admin.php
 2013-12-03 09:26:58 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Sam Hemelryk
b5fd2497d6 Merge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle 2013-12-03 10:25:26 +13:00
Damyon Wiese
2a1e730eb3 Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle 2013-12-02 15:16:12 +08:00
Damyon Wiese
2b267d31c8 MDL-32888: Whitespace fixes (grr) 2013-12-02 15:14:26 +08:00
Damyon Wiese
7363aacb65 Merge branch 'MDL-32888_master' of https://github.com/maitkin-ltu/moodle 2013-12-02 15:01:37 +08:00
Dan Poltawski
6bc8b35add Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle 2013-12-02 14:52:03 +08:00
Damyon Wiese
cc9651dcae Merge branch 'm27_MDL-43039_SessionDiskFull_False_Positive' of https://github.com/scara/moodle 2013-12-02 14:37:22 +08:00
Andrew Nicols
0bb56f2e31 MDL-42989 Admin: Clean output when building site administration tree for JS 
Previously, any inappropriate whitespace found whilst building the admin
tree caused a JSON error and for the site administration tree retrieval to
fail.

This change ensures that access to the site administration tree is unbroken
for non-developers, whilst still alerting developers that there is an
issue.
 2013-12-02 14:28:37 +08:00
Dan Poltawski
4b9e9fcb01 Merge branch 'MDL-42969-master' of git://github.com/mouneyrac/moodle 2013-12-02 14:23:48 +08:00
David Monllao
0e825e5dd4 MDL-43066 behat: Checking that the site is not already installed 2013-12-02 14:10:57 +08:00
Damyon Wiese
bd3811f1b4 MDL-43018 Fix unit tests for minify changes. 2013-12-02 12:52:01 +08:00
Damyon Wiese
df68e73824 Merge branch 'MDL-40040-master' of git://github.com/ankitagarwal/moodle 2013-12-02 12:16:59 +08:00
Ankit Agarwal
6b36411587 MDL-40040 Cleanup some blog methods and replace add_to_log 
Cleaned up add_association()
cleaned up add_associations()
Replaced remaining add_to_log() in blogs with events
 2013-12-02 12:06:32 +08:00
Ankit Agarwal
cf0116db07 MDL-40040 events: Add unit tests for blog events 2013-12-02 12:06:32 +08:00
Ankit Agarwal
164931570f MDL-40040 events: Add blog events 
Added blog_entries_viewed
Added blog_association_created
 2013-12-02 12:06:32 +08:00
Dan Poltawski
466aa44471 Merge branch 'w49_MDL-43106_m27_doublecookie' of https://github.com/skodak/moodle 2013-12-02 11:58:01 +08:00
Damyon Wiese
8d68ea7233 Merge branch 'MDL-43018-master' of git://github.com/andrewnicols/moodle 2013-12-02 11:23:46 +08:00
Dan Poltawski
10c12c94a8 Merge branch 'wip-MDL-40191-master' of git://github.com/marinaglancy/moodle 2013-12-02 11:19:41 +08:00
Dan Poltawski
9a7de39d7a Merge branch 'MDL-43068' of git://github.com/timhunt/moodle 2013-12-02 11:11:07 +08:00
Damyon Wiese
ecfbb657f3 Merge branch '43033-27' of git://github.com/samhemelryk/moodle 2013-12-02 09:33:39 +08:00
Sam Hemelryk
c619d3d48d Merge branch 'MDL-42876-master' of git://github.com/mouneyrac/moodle 2013-12-02 14:04:09 +13:00
Sam Hemelryk
12539749f4 Merge branch 'MDL-42918' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-12-02 13:44:05 +13:00
Petr Škoda
a377754770 MDL-41819 try to work around max_input_vars restriction 2013-12-02 08:29:08 +08:00
Sam Hemelryk
f2d7e2dca9 Merge branch 'MDL-42951-master' of git://github.com/FMCorz/moodle 2013-12-02 10:52:11 +13:00
Sam Hemelryk
06ef842707 Merge branch 'wip-mdl-33618' of https://github.com/rajeshtaneja/moodle 2013-12-02 10:35:46 +13:00
Sam Hemelryk
1e9f4c98e3 MDL-43033 cache: added stats logging to set_many methods 2013-12-02 09:30:04 +13:00
Sam Hemelryk
e28a953996 MDL-43033 cache: fixed display of definition stores in admin interface 2013-12-02 09:30:03 +13:00
Sam Hemelryk
d31fd615eb MDL-43033 cache: added a warning icon for mappings 
We now show a warning icon with an explanatory alt if the user
has mapped a store as a mode default that doesn't not fulfill the
requirements of every known definition.
 2013-12-02 09:30:03 +13:00
Sam Hemelryk
bf77c0b273 MDL-43033 cache: fixed mode map event invalidation scenario 2013-12-02 09:30:03 +13:00
Sam Hemelryk
6dbe2df208 MDL-43033 cache: added stats logging to get_many methods 2013-12-02 09:30:03 +13:00
Matteo Scaramuccia
35897a5223 MDL-43039 Libraries "The session partition is full." false positive. 2013-11-30 14:36:58 +01:00
Petr Škoda
226991e9fe MDL-43106 fix double cookies on first access 2013-11-29 15:47:16 +08:00
Dan Poltawski
9b37cd72a2 weekly release 2.7dev 2013-11-29 12:52:39 +08:00
Dan Poltawski
4f42752d70 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-11-29 12:52:35 +08:00
Eloy Lafuente (stronk7)
4942801c39 Merge branch 'MDL-42957-master' of https://github.com/jamiepratt/moodle 
Conflicts:
	question/classes/statistics/questions/calculator.php
	question/classes/statistics/responses/analyser.php
 2013-11-28 12:44:04 +01:00
James Pratt
7d6b28d87a MDL-42957 (3) quiz statistics : removing assertEquals(time(), ..) tests 2013-11-28 17:57:02 +07:00
James Pratt
487e7e6602 MDL-42957 (2) quiz statistics : Hardcoded sql LIMIT clause 
Fixing some typos and adding some tests.
 2013-11-28 17:13:26 +07:00
AMOS bot
4be2c1b812 Automatically generated installer lang files 2013-11-28 09:12:39 +00:00
Frederic Massart
74c4405b8a MDL-42951 curl: Re-organise Unit Tests in smaller chunks 2013-11-28 12:14:13 +08:00