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

17474 Commits

Author SHA1 Message Date
Frederic Massart
6046f1c8f1 MDL-43185 behat: Use realpath on existing paths 2013-12-04 10:59:49 +08:00
Dan Poltawski
d22147667d Merge branch 'wip-mdl-42597' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-12-04 08:53:25 +08:00
Dan Poltawski
9fff253293 Merge branch 'master_MDL-43049' of git://github.com/totara/moodle 2013-12-04 08:36:05 +08:00
Rajesh Taneja
f487a8f825 MDL-42597 Administration: Modified maintenance mode countdown to display nicely 
Added Style and JS to display maintenance mode timer similar
to what is done on moodle demo site for rest.
 2013-12-04 08:31:56 +08:00
Eloy Lafuente (stronk7)
e16b1bb124 Merge branch 'MDL-41446-master' of git://github.com/sammarshallou/moodle 2013-12-03 23:55:42 +01:00
Sam Hemelryk
5d288a5dbb Merge branch 'MDL-41592_master' of https://github.com/dmonllao/moodle 2013-12-04 11:52:12 +13:00
Eloy Lafuente (stronk7)
2574b28b81 Merge branch 'w49_MDL-43117_m27_releaseinfo' of https://github.com/skodak/moodle 2013-12-03 23:45:54 +01:00
Sam Hemelryk
12f46583f0 Merge branch 'MDL-43093' of git://github.com/timhunt/moodle 2013-12-04 10:12:12 +13:00
Sam Hemelryk
db9c8f4c7d Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle 2013-12-04 09:43:43 +13:00
Eloy Lafuente (stronk7)
75b296abf6 Merge branch 'MDL-43105-master' of git://github.com/andrewnicols/moodle 2013-12-03 19:15:05 +01:00
Damyon Wiese
a977fa7b36 Merge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle 2013-12-03 17:29:39 +08:00
Damyon Wiese
23a05a1b9a Merge branch 'MDL-42627_master' of git://github.com/dmonllao/moodle 2013-12-03 16:15:53 +08:00
Damyon Wiese
a5ec4f7ae9 Merge branch 'wip-MDL-43026-master' of git://github.com/marinaglancy/moodle 2013-12-03 16:11:48 +08:00
Dan Poltawski
8761a4f15d Merge branch 'MDL-42097-master' of git://github.com/ankitagarwal/moodle 2013-12-03 15:21:09 +08:00
Damyon Wiese
53741d32a6 Merge branch 'MDL-42962-master' of git://github.com/ankitagarwal/moodle 2013-12-03 15:15:25 +08:00
Damyon Wiese
4c9464ca0d Revert "MDL-39286 Remove link on My Courses settings heading" 
This reverts commit 8b79059480935160a7ef0b9d767a4fc2a5532b39.

Behat is failing with this change.
 2013-12-03 14:59:16 +08:00
Ankit Agarwal
3c24828823 MDL-42962 events: Add unit tests for the abstract class course_module_viewed 2013-12-03 14:24:31 +08:00
Ankit Agarwal
df2ac49f72 MDL-42962 events: Add a abstract class course_module_viewed 
AMOS BEGIN
 CPY [eventcoursemoduleviewed,core],[eventcoursemoduleviewed,mod_feedback]
AMOS END
 2013-12-03 14:24:31 +08:00
Ankit Agarwal
963cdce4e2 MDL-42097 auth: Auth plugins must check passwordurl before returning it 2013-12-03 14:17:42 +08:00
Damyon Wiese
8f49492ac2 Merge branch 'time-limit-fix' of https://github.com/danpoltawski/moodle 2013-12-03 14:17:34 +08:00
Ankit Agarwal
6513cc0376 MDL-42097 formslib: updates to edit profile form 
Add a new dependency 'in' in forms library
Use the 'in' dependency to disable the 'changepassword' field when a auth plugin doesn't support it
 2013-12-03 14:15:16 +08:00
Dan Poltawski
0b2f11dbc3 MDL-42084 lib: fix undefined variable warnings 2013-12-03 14:00:21 +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
03742ae8f9 Merge branch 'MDL-43066_master' of git://github.com/dmonllao/moodle 2013-12-03 12:36:50 +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
Tim Hunt
b2f1717143 MDL-43093 update repeat_elements PHPdoc. 2013-12-02 17:48:44 +00:00
Damyon Wiese
2a1e730eb3 Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle 2013-12-02 15:16:12 +08:00
Dan Poltawski
6bc8b35add Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle 2013-12-02 14:52:03 +08:00
Marina Glancy
6dfd8325f0 MDL-42731 behat: load 'Site administration' when expanding node in non-javascript mode 2013-12-02 17:44:32 +11: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
David Monllao
677b2e79f1 MDL-41592 general: Also checking the site path 2013-12-02 14:18:10 +08:00
David Monllao
7f7a91e4ce MDL-41592 behat: Config settings more flexible 
Adding the option to just set ->behat_wwwroot to
allow switching to the behat test site.
 2013-12-02 14:18:10 +08:00
Aaron Barnes
cc2691a7bb MDL-41592 behat: Allow alt wwwroot to be set for acceptance testing 
To set add $CFG->behat_wwwroot = 'http://alturl'; in your config.php
 2013-12-02 14:18:10 +08:00
David Monllao
e7c71c448b MDL-42627 behat: Moving the deprecated method to behat_deprecate and updating scenarios 2013-12-02 14:13:17 +08:00
David Monllao
c3a40deab7 MDL-42627 behat: New steps definitions class for deprecated steps 2013-12-02 14:13:17 +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
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
Sam Hemelryk
c619d3d48d Merge branch 'MDL-42876-master' of git://github.com/mouneyrac/moodle 2013-12-02 14:04:09 +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
Petr Škoda
2f98f5d541 MDL-43117 Add release column to Plugins Overview page 
This patch is based on previous patch by Marko Vidberg, thanks a lot!
 2013-12-01 18:57:49 +08:00
Matteo Scaramuccia
35897a5223 MDL-43039 Libraries "The session partition is full." false positive. 2013-11-30 14:36:58 +01:00