Commit graph

19034 commits

Author SHA1 Message Date
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
Marina Glancy
f1d7254954 MDL-43150 tinymce_managefiles: fixed unattractive background 2013-12-02 12:01:27 +11: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
Petr Škoda
226991e9fe MDL-43106 fix double cookies on first access 2013-11-29 15:47:16 +08:00
Marina Glancy
dd47f2107f MDL-43026 behat: add tests for all available module generators 2013-11-29 17:24:12 +11:00
Andrew Nicols
104d698ffd MDL-43105 JavaScript: Use the correct versions of our rollups 2013-11-28 12:31:51 +08:00
Frederic Massart
74c4405b8a MDL-42951 curl: Re-organise Unit Tests in smaller chunks 2013-11-28 12:14:13 +08:00
Frederic Massart
102230b23c MDL-42951 curl: Always keep the last headers of a request 2013-11-28 12:00:42 +08:00
Dan Poltawski
fb16acf24e MDL-43081 upgrade.txt: note generator change 2013-11-27 13:29:15 +08:00
Dan Poltawski
eeb6b7847b Merge branch 'MDL-42942_master' of git://github.com/dmonllao/moodle 2013-11-27 11:32:23 +08:00
Andrew Nicols
19d97d6b15 MDL-43018 JavaScript: Correct joining of multiple minified JS
When minifiying JS, unnecessary semi-colons are removed - this includes the
trailing semi-colon.

Since we join multiple files together after minification, we need to add an
additional semi-colon in this situation to produce valid JavaScript.
2013-11-27 09:33:14 +08:00
Damyon Wiese
e359857e41 Merge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle 2013-11-26 16:56:20 +08:00
Adrian Greeve
b404b1f41c MDL-43008 calendar: Allow calendar plugins to display setting pages. 2013-11-26 15:44:57 +08:00
Dan Poltawski
2bc34d6528 Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle 2013-11-26 14:52:21 +08:00
Damyon Wiese
e6b1d132cb MDL-41919 Forms: Add a class to form elements with an empty label
This means they can be styled properly when the form is folded with
the labels above the form fields.
2013-11-26 13:28:51 +08:00
Dan Poltawski
c9ed9e5662 Merge branch 'MDL-42733_master' of git://github.com/dmonllao/moodle 2013-11-26 12:09:45 +08:00
David Monllao
5df9e40cec MDL-40741 behat: Changing xpaths for clean theme
Keeps compatibility with standard theme.
2013-11-26 11:41:13 +08:00
Marina Glancy
4fd2a16e35 MDL-40191 navigation: do not throw an error if activity is not visible
navigationlib is not the place to check it, let the page itself decide what to do in this case
2013-11-26 13:54:19 +11:00
David Monllao
e2d7379682 MDL-42842 behat: Adding a new formatter
Based on ProgressFormatter, the site info
will be displayed when the suite begins.
2013-11-26 10:48:58 +08:00
David Monllao
7514c2f282 MDL-42842 testing: Generalization of the site info 2013-11-26 10:48:29 +08:00
Damyon Wiese
18962add08 Merge branch 'wip-MDL-40850-master' of git://github.com/marinaglancy/moodle 2013-11-26 09:29:44 +08:00
Simon Coggins
529b85b06f MDL-43049 accesslib: Fix typo in memory optimization code 2013-11-26 08:01:28 +13:00
Damyon Wiese
a184b3d712 Merge branch 'MDL-42985-master' of git://github.com/FMCorz/moodle 2013-11-25 14:52:26 +08:00
Dan Poltawski
b7e6b82155 Merge branch 'w48_MDL-37016_m27_sloppymysql' of https://github.com/skodak/moodle 2013-11-25 13:40:54 +08:00
Damyon Wiese
aacd01f28e Merge branch 'wip-mdl-42924' of https://github.com/rajeshtaneja/moodle 2013-11-25 13:16:04 +08:00
Damyon Wiese
dc4c0310ee Merge branch 'MDL-42913a' of https://github.com/srynot4sale/moodle 2013-11-25 13:11:24 +08:00
Petr Škoda
e696fe6aa5 MDL-37016 fix sloppy mysql nulls in event.uuid 2013-11-24 15:10:58 +08:00
Marina Glancy
724b00b2b6 MDL-43024 course: fixed bug for accessing section options 2013-11-22 12:41:35 +11:00
Jerome Mouneyrac
ad417fdfe7 MDL-42876 Screen reader does not trigger the keyboard move 2013-11-21 17:42:18 +08:00
David Monllao
85ad19ec78 MDL-42733 behat: Removing the restriction of an started output to handle the PHP errors 2013-11-21 14:34:56 +08:00
Frederic Massart
ba72e295c2 MDL-42985 curl: Correctly apply rule proxybypass 2013-11-21 09:56:54 +08:00
Rajesh Taneja
fd0f7ac5c2 MDL-33618 Messages: Added support to disable message provider 2013-11-21 09:40:34 +08:00
Marina Glancy
1f897a72f3 MDL-40850 editor: Manage files popup correctly sets the course/cm context 2013-11-21 11:55:20 +11:00
Damyon Wiese
b170380a8e MDL-42930 Release upgrade line: Fix ordering for tinymce 2013-11-20 11:47:35 +08:00
Marina Glancy
a99e1ad9ec Merge branch 'MDL-42767-master' of git://github.com/ankitagarwal/moodle 2013-11-20 13:20:17 +11:00
Aaron Barnes
2eaa440c34 MDL-42913 lib/grouplib.php: Avoid cache sometimes for groups_get_all_groups
The new groups cache returns unexpected results when you pass
in a field parameter than would normally change the result array index
2013-11-20 11:56:42 +13:00
Ankit Agarwal
cc49a6f7eb MDL-42767 notes: Delete notes on a course delete 2013-11-19 16:32:19 +08:00
Rajesh Taneja
8c59114f24 MDL-42924 Administration: use normalize_component to extract plugin name and type 2013-11-19 11:51:20 +08:00
Sam Hemelryk
8b5e008bc2 Merge branch 'MDL-42553_master' of https://github.com/markn86/moodle 2013-11-19 14:31:51 +13:00
Sam Hemelryk
d7a0da37d9 Merge branch 'wip-MDL-42852_master' of git://github.com/gjb2048/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-19 11:42:25 +13:00
Damyon Wiese
79149e85fb Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle 2013-11-18 15:26:52 +08:00
Damyon Wiese
7f2c374dcd Merge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle 2013-11-18 14:55:18 +08:00
Dan Poltawski
b6813d8f6a Merge branch 'MDL-42884_master' of https://github.com/markn86/moodle 2013-11-18 14:41:06 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Gareth J Barnard
b3eadf7050 MDL-42852 lib: Blocks disappear in Clean in RTL. 2013-11-17 13:33:30 +00:00