Eloy Lafuente (stronk7)
4afd580231
Merge branch 'MDL-38271_master' of git://github.com/dmonllao/moodle
2013-03-05 15:43:15 +01:00
David Monllao
6fe3986dec
MDL-38007 behat: Refining error texts
...
Also removing a couple of silly notices
2013-03-05 16:52:48 +08:00
Damyon Wiese
d0eac6f639
Merge branch 'MDL-38178_master' of git://github.com/dmonllao/moodle
2013-03-05 15:10:52 +08:00
Aparup Banerjee
c0da001c49
Merge branch 'MDL-38025_master' of git://github.com/dmonllao/moodle
2013-03-05 14:43:46 +08:00
David Monllao
f8f1bdc315
MDL-38178 behat: Adding find_all and step to expand all form's fieldsets
2013-03-05 14:41:52 +08:00
Aparup Banerjee
212e5ee909
Merge branch 'MDL-38007_master' of git://github.com/dmonllao/moodle
2013-03-05 14:37:05 +08:00
Damyon Wiese
a27996bbad
Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle
2013-03-05 11:42:25 +08:00
Aparup Banerjee
d1e220eb0e
Merge branch 'MDL-36171-m' of git://github.com/andrewnicols/moodle
2013-03-05 11:13:33 +08:00
Aparup Banerjee
fb3c1d2b34
Merge branch 'MDL-38067-m' of git://github.com/andrewnicols/moodle
2013-03-05 11:06:55 +08:00
Aparup Banerjee
23a6fca502
Merge branch 'MDL-34300-m' of git://github.com/andrewnicols/moodle
2013-03-05 10:37:33 +08:00
Frederic Massart
dfe203c12e
MDL-34284 library: Import ZF2012-01 security patch for Zend
2013-03-05 10:35:56 +08:00
Sam Hemelryk
2e2bac9d32
Merge branch 'MDL-37932' of git://github.com/timhunt/moodle
2013-03-05 15:30:45 +13:00
Sam Hemelryk
627a43917a
MDL-37127 js: fixed indentation of tooltip.js
2013-03-05 14:11:35 +13:00
Sam Hemelryk
5c1d5998ac
Merge branch 'MDL-37127-m' of git://github.com/andrewnicols/moodle
2013-03-05 13:54:10 +13:00
Eloy Lafuente (stronk7)
86d053490d
Merge branch 'wip-MDL-36215-m25' of git://github.com/samhemelryk/moodle
2013-03-05 01:27:50 +01:00
Eloy Lafuente (stronk7)
2b48123b92
Merge branch 'wip-MDL-38300-m25' of git://github.com/samhemelryk/moodle
2013-03-05 01:21:47 +01:00
Eloy Lafuente (stronk7)
adc4aca475
Merge branch 'MDL-37897' of git://github.com/jmvedrine/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2013-03-05 00:56:24 +01:00
Eloy Lafuente (stronk7)
cdbbd48a66
Merge branch 'MDL-38261-workshop-attachments-size' of git://github.com/mudrd8mz/moodle
2013-03-05 00:48:47 +01:00
Eloy Lafuente (stronk7)
2673254919
Merge branch 'wip-MDL-32975-m25' of git://github.com/samhemelryk/moodle
2013-03-04 23:47:13 +01:00
Sam Hemelryk
f87ce4e9a0
MDL-32975 navigation: Added option to select how my courses are sorted
2013-03-05 09:46:11 +13:00
Sam Hemelryk
cf7386139d
MDL-31983 navigation: fixed copy+paste typo
2013-03-05 09:24:19 +13:00
Eloy Lafuente (stronk7)
25ba263d60
Merge branch 'MDL-38133-master' of git://github.com/sammarshallou/moodle
2013-03-04 20:37:57 +01:00
Eloy Lafuente (stronk7)
d03d5e7816
Merge branch 'wip-MDL-33013-m25' of git://github.com/samhemelryk/moodle
2013-03-04 20:18:48 +01:00
Eloy Lafuente (stronk7)
8b0f09d940
Merge branch 'MDL-36380-master' of git://github.com/FMCorz/moodle
2013-03-04 17:59:39 +01:00
Eloy Lafuente (stronk7)
d5834b3712
Merge branch 'MDL-38170-master' of git://github.com/sammarshallou/moodle
2013-03-04 16:25:00 +01:00
Sam Hemelryk
4ce761716c
Merge branch 'MDL-31557_master' of git://github.com/markn86/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2013-03-04 14:35:59 +13:00
Sam Hemelryk
74bf99ddad
Merge branch 'MDL-37625-master' of https://github.com/jfilip/moodle
2013-03-04 14:18:49 +13:00
Sam Hemelryk
121e604851
Merge branch 'MDL-38168-master' of git://github.com/sammarshallou/moodle
2013-03-04 13:35:16 +13:00
Frederic Massart
954b354511
MDL-37507 repositories: improved formatting of external resources
2013-03-04 13:28:41 +13:00
Mark Nielsen
8d220cb552
MDL-36901: Remove system paths from exceptions
...
Replaces any server paths, like dataroot, with a token
in exception messages and debug info.
2013-03-04 00:17:01 +01:00
Tim Hunt
d23edcf151
MDL-37932 formslib: setAdvanced for repeatelements.
...
I think this commit also fixes some other problems with repeatelements
and shortforms. The shortforms code was trying to use hidden elements
with names like in conjunction with ...[0] with optional_param which
will not work. Hidden form fields that relate to other parts of the form
must use the other elements's id, no name, to make the hidden field
name.
2013-03-01 11:41:59 +00:00
sam marshall
85cb4b65b1
MDL-38170 SimplePie: Cannot read https feeds through proxy
2013-03-01 10:36:51 +00:00
David Monllao
072f67fcac
MDL-38026 behat: Base to write steps to work with specific DOM parts
2013-03-01 16:40:22 +08:00
David Monllao
46ac40cd0b
MDL-38025 behat: Compliant with moodlechecker and codechecker
2013-03-01 16:07:04 +08:00
David Monllao
4092397794
MDL-38025 behat: Adding generic manipulation methods
...
Also required modifications in the affected
steps definitions
2013-03-01 16:06:15 +08:00
David Monllao
e2eb40ea3c
MDL-38271 behat: Adds site shortname
2013-03-01 11:41:28 +08:00
David Monllao
fa7e4e2b6a
MDL-38007 behat: Changing check_behat_setup interface
2013-03-01 10:44:31 +08:00
Andrew Robert Nicols
e2798523d6
MDL-37127 JavaScript: Switch moodle-core-tooltip to shifter
2013-03-01 01:33:08 +00:00
Andrew Robert Nicols
a45e8fd3da
MDL-37127 JavaScript: Add support for development using YUI Shifter
2013-03-01 01:25:54 +00:00
Sam Hemelryk
4e83302f6f
MDL-38055 navigation: fixed ampersand use within titles
2013-03-01 10:09:51 +13:00
Sam Hemelryk
8bc8ab6ee8
MDL-36215 navigation: fixed blog URL within courses using groups
2013-03-01 10:08:42 +13:00
Sam Hemelryk
ba7b1ca565
MDL-33013 navigation: fixed expansion limit issue hiding nodes
2013-03-01 10:08:20 +13:00
Andrew Robert Nicols
08b196e265
MDL-36171 Administration Skip replace in the log table
2013-02-28 19:44:42 +00:00
David Mudrák
8f5cbbd6c8
MDL-38261 Add a new file preview mode for bigger thumbnails
2013-02-28 18:53:37 +01:00
Andrew Robert Nicols
1015b24b42
MDL-38067 JavaScript: Ensure the filemanager does not show through the tooltip
2013-02-28 17:00:02 +00:00
Andrew Robert Nicols
03bd9e7b78
MDL-34300 JavaScript: Stop YUI from forcing z-index on moodle-core-notification
2013-02-28 17:00:02 +00:00
Andrew Robert Nicols
694c4c87ac
MDL-34300 JavaScript: Stop YUI from forcing z-index on moodle-core-notification
2013-02-28 16:54:59 +00:00
Jean-Michel Vedrine
4f315786e8
MDL-37897 Remove useless Blackboard question import format
2013-02-28 17:46:29 +01:00
Frederic Massart
bed828de91
MDL-36380 stats: Issue with DST and monthly statistics
2013-02-28 13:56:05 +08:00
Eloy Lafuente (stronk7)
9515c34ee6
Merge branch 'wip-MDL-30669-master' of git://github.com/abgreeve/moodle
2013-02-26 09:46:13 +01:00