Commit graph

65806 commits

Author SHA1 Message Date
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
Marina Glancy
9842e231e8 MDL-42731 block_activity_modules: added behat tests 2013-12-02 17:44:32 +11: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
Dan Poltawski
4b9e9fcb01 Merge branch 'MDL-42969-master' of git://github.com/mouneyrac/moodle 2013-12-02 14:23:48 +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
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
Rajesh Taneja
c1b3ac4358 MDL-40079 repositories: Replaced const with configs 2013-12-02 09:41:41 +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
Marina Glancy
f1d7254954 MDL-43150 tinymce_managefiles: fixed unattractive background 2013-12-02 12:01:27 +11: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
AMOS bot
5ca122a2b0 Automatically generated installer lang files 2013-12-02 00:42:53 +00: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
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
Mark Nelson
67bfaaf0dd MDL-43140 mnet: display header after redirects to avoid warning 2013-11-29 14:25:45 -08:00
Mark Nelson
f9b4143a8e MDL-43142 mnet: fixed typo in variable passed to get_string 2013-11-29 14:15:07 -08:00
Petr Škoda
226991e9fe MDL-43106 fix double cookies on first access 2013-11-29 15:47:16 +08:00
Damyon Wiese
df9b573d85 MDL-43065 Backup: Prevent any responsiveness in backup/restore forms
Adding 'unresponsive' class to any moodle form will prevent the default
collapsing on screens < 1200px.
2013-11-29 14:27:34 +08:00
Marina Glancy
dd47f2107f MDL-43026 behat: add tests for all available module generators 2013-11-29 17:24:12 +11:00
Damyon Wiese
6d55d0f5f0 MDL-42919 Renest bootstrap folding forms CSS in less 2013-11-29 14:16: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
Tim Lock
f6c5ceca71 MDL-42487: Forced userprofile dl style to be displayed: inline-block. 2013-11-29 09:22:48 +10:30
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