Sam Hemelryk
a65cbb009c
MDL-41511 blocks: improved how custom block regions were being rendered.
...
There is a new theme property 'blockrendermethod' that can be set by the
theme in its config.php and tells Moodle what method it is using to render
blocks in the layout files.
Either blocks, or blocks_for_region.
Then when adding custom block regions to a page content we ensure we use
the same method the theme is using elsewhere.
This is really a hack becuase we (I) didn't properly deprecate
blocks_for_region when I added the blocks method.
Conflicts:
lib/outputlib.php
2014-04-06 15:17:42 +12:00
Mary Evans
82cce3b097
MDL-38183 themes: Removed redundant css rules for #adminsettings .form-overridden from standard and formal_white.
2014-04-05 17:11:07 +01:00
sam marshall
90761f1a8c
MDL-44891 Behat: Add step to check attribute
...
This commit creates a Behat step of the form:
Then the "title" attribute of "Toggle visibility" "button"
should contain "Show"
This is useful because unless I missed something there is currently
no step that checks attribute values; this seems like a simple
generic step. Behat is intended to check user-visible effects in
the resulting HTML, and sometimes these effects are implemented
using attribute values (two common examples are the alt= attribute,
which is visible to screenreader users, and the title= attribute,
which is visible to all users; there's also the src attribute of
images, and lots of other possibilities too).
2014-04-04 18:29:32 +01:00
Marina Glancy
28e8c6e95c
MDL-40843 workshop: sort entries in recent activity block by time
2014-04-04 17:05:20 +08:00
Marina Glancy
2a91ea91b9
MDL-40843 workshop: show user names in recent activity
2014-04-04 17:05:20 +08:00
Marina Glancy
b0bbb673e0
MDL-40843 recent_activity: corrections to grouping and user fields
2014-04-04 17:05:20 +08:00
Marina Glancy
d66bbb7f6f
MDL-40872 Restore functionality of showrecentsubmissions setting
2014-04-04 17:05:00 +08:00
Rajesh Taneja
b25d44c200
MDL-44873 behat: Added suppport for clean error class.
2014-04-04 17:00:44 +08:00
Rajesh Taneja
cfaaab6656
MDL-44873 theme_bootstrapbase: Added support for notifytiny class
2014-04-04 17:00:39 +08:00
Dan Marsden
626d97248d
MDL-44738 SCORM: don't show heading when in popup mode.
2014-04-04 11:42:47 +13:00
Dan Marsden
0b26fbc7be
MDL-44938 SCORM: missing constant definition during upgrade.
2014-04-04 09:39:57 +13:00
Mathieu Petit-Clair
61ebf8e5af
MDL-44295 auth: Update truncate_userinfo to match current DB fields size.
2014-04-03 10:19:36 -04:00
AMOS bot
42a7a084d3
Automatically generated installer lang files
2014-04-03 09:28:13 +00:00
Marina Glancy
89117976b8
weekly release 2.6.2+
2014-04-03 12:39:51 +08:00
Marina Glancy
6815afcc89
MDL-43021 course: corrections to the shortname and idnumber uniqueness validation
2014-04-03 11:07:56 +08:00
Damyon Wiese
ff34886e8f
MDL-42195 Bootstrap: Make bootstrap responsive images "opt-in".
...
This responsive image behaviour prevents setting of image sizes in text editors,
as well as a string of pix icon bugs / profile image bugs across Moodle.
We are switching to Bootstrap 3 syntax where you need img-responsive class to images
that want this behaviour.
2014-04-03 09:23:27 +08:00
Damyon Wiese
82fbf80171
Merge branch 'm26_MDL-44753' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE
2014-04-02 16:35:27 +08:00
Dan Marsden
eee676dcd8
MDL-44753 SCORM: make correct selection of first sco - also fixes MDL-44896
2014-04-02 20:51:48 +13:00
Marina Glancy
e0f47ce98c
Merge branch 'MDL-41063_26' of git://github.com/jmvedrine/moodle into MOODLE_26_STABLE
2014-04-02 09:46:50 +08:00
Eloy Lafuente (stronk7)
13689e7d20
Merge branch 'MDL-31262_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-04-02 03:23:42 +02:00
Marina Glancy
7b5cd3154d
Merge branch 'm26_MDL-44753' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
2014-04-02 09:16:26 +08:00
Marina Glancy
acc0d89f5b
MDL-34012 chat: removing repetetive db query (performance)
2014-04-02 02:58:02 +02:00
Eloy Lafuente (stronk7)
ee21ac5333
Merge branch 'wip-MDL-43398-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-04-02 02:50:34 +02:00
Eloy Lafuente (stronk7)
001247f3c9
Merge branch 'w14_MDL-44843_m26_localedash' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-04-02 02:23:46 +02:00
Eloy Lafuente (stronk7)
c6008a30cd
Merge branch 'wip-MDL-41102-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-04-02 02:20:44 +02:00
Sam Hemelryk
d7680b1f23
Merge branch 'w14_MDL-44824_m26_subplugins' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-04-02 13:04:52 +13:00
Dan Marsden
8fb32f86dd
MDL-44753 SCORM: add check during SCORM restore to make sure valid launch sco is set
2014-04-02 10:03:40 +13:00
Sam Hemelryk
15f780a797
Merge branch 'MDL-43284-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE
2014-04-02 09:27:07 +13:00
Eloy Lafuente (stronk7)
8414fb7073
Merge branch 'wip-MDL-35305-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-04-01 21:50:23 +02:00
Michael Aherne
195a68a508
MDL-41895 conditions Show details of grouping restriction
2014-04-01 13:39:18 +01:00
Marina Glancy
4c0e7741c3
Merge branch '26STABLE-wip-MDL44021' of git://github.com/jennymgray/moodle into MOODLE_26_STABLE
2014-04-01 17:40:57 +08:00
Jenny Gray
c1fa0dce9e
MDL-44021 mod_glossary - fixed search multiple keywords sql duplicate parameter error
2014-04-01 09:40:58 +01:00
Marina Glancy
0cbcd72e8f
Merge branch 'W14_MDL-44862_m26_pgsocket' of git://github.com/skodak/moodle into MOODLE_26_STABLE
2014-04-01 15:33:54 +08:00
Marina Glancy
d19792d5de
Merge branch 'MDL-44746_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE
2014-04-01 13:52:52 +08:00
Marina Glancy
3b7b097f2a
Merge branch 'MDL-44701_26' of git://github.com/aolley/moodle into MOODLE_26_STABLE
2014-04-01 11:06:48 +08:00
Marina Glancy
1a0bc77645
Merge branch 'MDL-44670-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-04-01 11:05:45 +08:00
Marina Glancy
37de060263
Merge branch 'MDL-44590-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE
2014-04-01 11:05:09 +08:00
Marina Glancy
b3aed4e5aa
Merge branch 'MDL-44837-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE
2014-04-01 10:40:07 +08:00
Marina Glancy
ea3d172274
Merge branch 'wip_MDL-44854_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE
2014-04-01 10:37:56 +08:00
Marina Glancy
cc247afe18
Merge branch 'wip-MDL-44850_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE
2014-04-01 10:36:39 +08:00
sam marshall
d0434cb119
MDL-44837 Behat: 'dialogue' selector only works for confirm dialogues
...
The dialogue selector in Behat (used only in one place) didn't work for
other types of standard Moodle notification dialogue.
2014-03-31 13:50:47 +01:00
Gareth J Barnard
16b4059ca3
MDL-44854 theme: 'svg' font type not served.
2014-03-31 11:07:47 +01:00
Gareth J Barnard
5b74abc38d
MDL-44850 theme: 'eot' font type not served.
2014-03-31 11:05:08 +01:00
Damyon Wiese
6d458076d5
MDL-44583 Assign: performance fixes
2014-03-31 12:53:41 +08:00
Marina Glancy
26a44fc7bb
Merge branch 'MDL-44822_26' of git://github.com/aolley/moodle into MOODLE_26_STABLE
2014-03-31 12:47:14 +08:00
Eloy Lafuente (stronk7)
106f3e9ce9
MDL-44862 postgres: tests to support socket & port
...
Both the database auth and enrol plugins use ADOdb
to perform connections. Socket and port are allowed
there if passed as "socket:port", so, when both are
configured in CFG, we pass them that way. Else
ADOdb defaults to standard port (5432).
2014-03-31 09:29:53 +08:00
Jean-Michel Vedrine
081468fdb1
MDL-41063 Lesson qformat_default class is missing an error function
2014-03-30 09:22:25 +02:00
Petr Škoda
d94e9570c7
MDL-44862 always add dbport to dbsocket in pg driver
...
This should hopefully resolve problems when using sockets connection
to pg servers running on non-standard ports.
2014-03-30 10:13:08 +08:00
Mark Nelson
d27dadca87
MDL-44746 core_events: minor changes to the user_deleted event
2014-03-28 17:08:55 -07:00
Mark Nelson
12d0bf448f
MDL-44746 core_events: removed incorrect use of snapshot
2014-03-28 16:55:24 -07:00
