moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66755 commits 37 branches 544 tags 1.3 GiB
Commit graph

66755 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marina Glancy
7a562bf521 MDL-45320 behat: change to block selector 2014-05-20 20:52:37 +08:00
Marina Glancy
0c11e7ed30 MDL-45320 block_html: behat tests 2014-05-20 20:52:14 +08:00
Marina Glancy
a33bc20d2e MDL-45320 behat: Step definitions for blocks 2014-05-20 20:52:01 +08:00
David Monllao
e3353f92fc MDL-45294 behat: Updating block references to aria label value 
Also improving moodle selectors xpath expressions
readability.
 2014-05-20 20:47:48 +08:00
David Monllao
28e5ece329 MDL-45294 behat: Supporting an aria-label as a block ref 2014-05-20 20:47:48 +08:00
Dan Poltawski
239db05eec Merge branch '44711-26-r2' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-05-20 20:32:02 +08:00
Sam Hemelryk
4fc9f74029 MDL-44711 block_navigation: fixed typo in behat tests 2014-05-20 23:38:25 +12:00
Damyon Wiese
e679a371ef MDL-45606 Unit test fix for MySQL and added a comment about the removed code. 2014-05-20 18:07:28 +08:00
Dan Poltawski
af8bd4de8e Merge branch 'MDL-45496-m26' of https://github.com/micaherne/moodle into MOODLE_26_STABLE 2014-05-20 15:55:13 +08:00
Marina Glancy
1cbfc11612 Merge branch 'MDL-45525-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 14:30:14 +08:00
Marina Glancy
bf75a73cc5 Merge branch 'MDL-45536-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 14:26:31 +08:00
Marina Glancy
97dc7bfc0b Merge branch 'wip-MDL-45512-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE 2014-05-20 14:22:51 +08:00
Marina Glancy
f60c23a781 Merge branch 'MDL-43669-m26' of git://github.com/micaherne/moodle into MOODLE_26_STABLE 2014-05-20 14:16:27 +08:00
Marina Glancy
2b0b60631d Merge branch 'MDL-44333_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-05-20 14:11:57 +08:00
Andrew Nicols
51a6bf7f1a MDL-45536 theme: Use width auto for inputs and textareas specifying them 2014-05-20 14:08:58 +08:00
Damyon Wiese
2a6cc872ff Merge branch 'm26_MDL-45583' of github.com:danmarsden/moodle into MOODLE_26_STABLE 2014-05-20 13:30:37 +08:00
Damyon Wiese
350e34d177 Merge branch 'MDL-45323-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE 2014-05-20 13:29:30 +08:00
Dan Poltawski
67f6ebacff Merge branch 'MDL-45545-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-05-20 12:21:58 +08:00
Sam Hemelryk
e77dcc602d Merge branch 'MDL-44323-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/less/moodle/admin.less
	theme/bootstrapbase/style/moodle.css
 2014-05-20 15:45:21 +12:00
Sam Hemelryk
aa1d665a3a Merge branch 'MDL-44027-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-05-20 15:39:31 +12:00
Dan Poltawski
2b0ea3051d Merge branch 'MDL-45605-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2014-05-20 10:51:27 +08:00
Dan Poltawski
fa496d3fe1 Merge branch 'MDL-45546-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-05-20 10:24:40 +08:00
Dan Poltawski
fa4ff1bd10 Merge branch '44711-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-05-20 10:14:24 +08:00
Sam Hemelryk
43f39c235f Merge branch 'MDL-45603-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE 2014-05-20 13:59:33 +12:00
Marina Glancy
0e46c03356 Merge branch 'MDL-45469-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-05-20 09:52:48 +08:00
Dan Poltawski
940269660f Merge branch 'MDL-44449_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-05-20 09:50:51 +08:00
Damyon Wiese
4c2ba6794b Merge branch '44974-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-05-20 09:01:24 +08:00
Sam Hemelryk
7d14ae30e9 Merge branch 'MDL-45477-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-05-20 11:58:18 +12:00
Sam Hemelryk
8ffb738721 Merge branch 'MDL-45535-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-05-20 11:55:47 +12:00
Sam Hemelryk
cf1cf9499f Merge branch 'MDL-37838-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-05-20 10:42:19 +12:00
Sam Hemelryk
d18bc9dc02 Merge branch 'MDL-45380-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 08:53:11 +12:00
Sam Hemelryk
17f8fb7f3e Merge branch 'MDL-45135-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-05-20 08:47:21 +12:00
Tim Hunt
969c26def0 MDL-44449 quiz access rules should have a delete hook. 
So they can clean up their settings when the quiz is deleted.

See
babf149c2c
for an example of using this.
 2014-05-19 16:59:21 +01:00
Damyon Wiese
cbaad47bf2 Merge branch 'MDL-45472-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-05-19 20:47:49 +08:00
Damyon Wiese
9ccd8759ea Merge branch 'MDL-43833_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-05-19 20:12:20 +08:00
Damyon Wiese
5b26aca437 Merge branch 'MDL-45527-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-05-19 20:07:00 +08:00
Damyon Wiese
2e0b5708f1 Merge branch 'MDL-45455_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-05-19 19:57:57 +08:00
Dan Poltawski
ce400f61e6 Merge branch 'MDL-45432-MOODLE_26_STABLE' of https://github.com/lucisgit/moodle into MOODLE_26_STABLE 2014-05-19 18:43:17 +08:00
Michael Aherne
8257e19b7a MDL-43669 messaging Enable sending email only from no-reply address 2014-05-19 09:52:23 +01:00
Marina Glancy
8e73bb6328 MDL-45371 behat: Tests for block glossary_random 2014-05-19 15:20:10 +08:00
Dan Poltawski
2fa8db79cc Merge branch 'MDL-41109-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-05-19 15:07:53 +08:00
Dan Poltawski
1ad0beaf4f Merge branch 'wip-MDL-34914-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-05-19 14:59:36 +08:00
Damyon Wiese
60802ff32e Merge branch 'MDL-32543-26' of https://github.com/danielneis/moodle into MOODLE_26_STABLE 2014-05-19 12:55:31 +08:00
Damyon Wiese
b29da693b6 Merge branch 'MDL-23566_26' of https://github.com/aolley/moodle into MOODLE_26_STABLE 2014-05-19 12:43:45 +08:00
Marina Glancy
709f70145f Merge branch 'wip-MDL-45483-MOODLE_26_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_26_STABLE 2014-05-19 12:38:47 +08:00
Damyon Wiese
9d14dcd64e Merge branch 'MDL-44634-26' of https://github.com/dbezborodovrp/moodle into MOODLE_26_STABLE 2014-05-19 12:20:38 +08:00
Frederic Massart
da14c5dff1 MDL-45527 cron: Already deleted unconfirmed users are ignored 2014-05-19 12:06:49 +08:00
Damyon Wiese
d38ef5cfe0 Merge branch '43995-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-05-19 11:53:34 +08:00
Sam Hemelryk
e6e58c7a92 MDL-38923 theme_bootstrapbase: pre-integration fixups 
* Fixed the way we added the block class to the dock panel in dock.js
* Added a class to the h2 that is used to test dock title width
* Fixed RTL alignment issues as best I could at present
* Fixed overlap of dock + navbar on small screens
* Fixed the docked block width to be constrained to the available space
* Fixed hidden actions on docked blocks

Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-19 15:28:00 +12:00
Damyon Wiese
eba90af0d3 MDL-45605 Phpunit: Do not call gc_collect_cycles as part of reset. 
This takes 25% of the time in running tests and there is no benefit. The
behaviour of destructors is the same before/after the patch.
 2014-05-19 10:38:39 +08:00