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

67179 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sam Hemelryk
14f40dcc9c Merge branch 'MDL-45561-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE 2014-05-19 13:37:19 +12:00
Sam Hemelryk
8758f4464f MDL-44974 admin: repositioned call to initialise renderer 2014-05-19 08:41:23 +12:00
Sam Hemelryk
9fb8de4cd1 MDL-44711 navigation: better handling of course expansion exception 2014-05-19 08:41:08 +12:00
Sam Hemelryk
0720ecb621 MDL-38923 dock: allowed for space before first time 2014-05-19 08:40:16 +12:00
Sam Hemelryk
6ae3b201cc MDL-38923 theme_bootstrapbase: tidied up dock implementation 
Also:
* Changed to a CSS based compacting solution
* Converted dock colours to variables
* RTL fixes for the dock
 2014-05-19 08:40:16 +12:00
Bas Brands
056b54ff63 MDL-38923 theme bootstrapbase: theme clean: enable docking 2014-05-19 08:40:13 +12:00
Eric Merrill
6a7348df5c MDL-45603 cache Fix the mappingsonly option to work as advertised. 2014-05-17 23:55:10 -04:00
Tim Hunt
fc36e18fb1 MDL-44333 quiz reports: use consitent name for user pref 
The Marks for each question setting was not being saved properly as a
user preference.
 2014-05-17 15:10:55 +01:00
Marina Glancy
3febb9e672 MDL-34914 cohorts: more understandable filter of user list by cohort 2014-05-16 17:17:36 +08:00
Andrew Nicols
ed065ceb93 MDL-41109 dndupload: Add missing error string 2014-05-16 13:50:19 +08:00
Dan Marsden
26143abeaf MDL-45583 badges: check parent contexts consistantly when checking required role. 2014-05-16 13:54:05 +12:00
Tim Hunt
9b3b40c1ab MDL-45455 quiz cron must rollback transaction on error. 2014-05-15 15:08:12 +01:00
Tim Hunt
b7acb1f0e8 MDL-43833 quiz reports: persist states settings between pages. 2014-05-15 15:07:38 +01:00
Jetha Chan
c7f36a87b3 MDL-45561 themes: horizontal scroll in RTL base 2014-05-15 15:49:28 +08:00
Damyon Wiese
ba05f573ca weekly release 2.6.3+ 2014-05-15 15:34:13 +08:00
Damyon Wiese
967fe8ef0d Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-05-15 15:34:09 +08:00
Jason Fowler
4e37becc19 MDL-42953 Themes: Fixing CSS for headers of central blocks 2014-05-15 15:27:51 +08:00
Simey Lameze
60b664a624 MDL-45323 grade: Unit test for grade_get_grade_items_for_activity() 2014-05-15 15:05:40 +08:00
Simey Lameze
b52ea3664e MDL-45323 grade: Fix query errors on grade_get_grade_for_activity method. 2014-05-15 15:05:40 +08:00
Damyon Wiese
9bbe953b68 MDL-41383 Filepicker: whitespace fix 2014-05-15 13:35:33 +08:00
Jetha Chan
5389652d3c MDL-41383: RTL fix for base when zoomed out 2014-05-15 13:29:32 +08:00
Dan Poltawski
247946725c MDL-44323 admin: use correct css class for warning 
The notifyproblem notification is consistent with the rest of
the warnings we report.

Conflicts:
	theme/bootstrapbase/less/moodle/admin.less
	theme/bootstrapbase/style/moodle.css
 2014-05-15 12:22:04 +08:00
Damien Bezborodov
649356958e MDL-44634 Regression: link to user profile in comments block fails due to double URI encoding 2014-05-15 11:47:03 +09:30
Damien Bezborodov
19602ce718 MDL-44634 Regression: link to user profile in comments block fails due to double URI encoding 2014-05-15 10:51:39 +09:30
sam marshall
d355d1f796 MDL-45535 CSS chunking breaks media rules if CSS invalid (IE) 
Invalid CSS with extra } symbols, which previously (by fluke)
worked, was broken by recent chunking improvements. This change
makes the chunking code robust against this (stupid) situation.
 2014-05-14 12:19:10 +01:00
sam marshall
449693fc43 MDL-45477 Behat: List of steps takes too long to load, times out 
Increase time limit to 300 seconds (5 minutes).
 2014-05-14 10:59:49 +01:00
Marina Glancy
2538062907 Merge branch 'MDL-36670_26' of git://github.com/jleyva/moodle into MOODLE_26_STABLE 2014-05-14 16:35:59 +08:00