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

68363 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frederic Massart
885650c70c MDL-45546 mod_forum: Login the user before getting its context 2014-05-20 10:25:07 +08:00
Dan Poltawski
06a689b761 Merge branch '44711-28' of git://github.com/samhemelryk/moodle 2014-05-20 10:15:11 +08:00
Sam Hemelryk
37fddc545c Merge branch 'MDL-45603-master' of https://github.com/merrill-oakland/moodle 2014-05-20 13:59:23 +12:00
Marina Glancy
f0085cd6ab Merge branch 'MDL-45469-master' of git://github.com/sammarshallou/moodle 2014-05-20 09:52:25 +08:00
Dan Poltawski
0c722830d9 Merge branch 'MDL-44449' of git://github.com/timhunt/moodle 2014-05-20 09:50:43 +08:00
Dan Poltawski
93b9ded2de Merge branch 'MDL-45550-master' of https://github.com/sammarshallou/moodle 2014-05-20 09:30:19 +08:00
Sam Hemelryk
7be0b69893 Merge branch 'MDL-45479-master' of git://github.com/andrewnicols/moodle 2014-05-20 13:09:34 +12:00
Damyon Wiese
cf229a526c Merge branch '44974-28' of git://github.com/samhemelryk/moodle 2014-05-20 08:49:56 +08:00
Sam Hemelryk
00a8c0d956 Merge branch 'MDL-45543-master' of git://github.com/ankitagarwal/moodle 2014-05-20 12:07:12 +12:00
Sam Hemelryk
4dc5c77f33 Merge branch 'MDL-45477-master' of https://github.com/sammarshallou/moodle 2014-05-20 11:58:12 +12:00
Sam Hemelryk
a3abb19716 Merge branch 'MDL-45535-master' of https://github.com/sammarshallou/moodle 2014-05-20 11:55:35 +12:00
Sam Hemelryk
58a3ed7df3 Merge branch 'MDL-44953-master' of git://github.com/FMCorz/moodle 2014-05-20 11:43:13 +12:00
Frederic Massart
e722133aee MDL-45474 atto_undo: Remove notice when undo stack is empty 2014-05-20 10:47:32 +12:00
Sam Hemelryk
08480b7a0f Merge branch 'MDL-37838-master' of git://github.com/danpoltawski/moodle 2014-05-20 10:42:09 +12:00
Sam Hemelryk
d57e3f8201 Merge branch 'MDL-45380-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 08:52:54 +12:00
Sam Hemelryk
adb5d8a5d6 Merge branch 'MDL-45135-master' of git://github.com/danpoltawski/moodle 2014-05-20 08:47:16 +12:00
Tim Hunt
35cbe84bf7 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:04 +01:00
Damyon Wiese
495243f35c Merge branch 'MDL-45130-master' of git://github.com/FMCorz/moodle 2014-05-19 21:20:10 +08:00
Damyon Wiese
e9e12c97fe Merge branch 'MDL-45472-master' of git://github.com/andrewnicols/moodle 2014-05-19 20:52:19 +08:00
Damyon Wiese
e1a83b8327 Merge branch 'MDL-45447-master' of git://github.com/FMCorz/moodle 2014-05-19 20:18:59 +08:00
Damyon Wiese
cc3dfc2c5f Merge branch 'MDL-43833' of git://github.com/timhunt/moodle 2014-05-19 20:11:50 +08:00
Damyon Wiese
2b3a371239 Merge branch 'MDL-45527-27' of git://github.com/FMCorz/moodle 2014-05-19 20:04:50 +08:00
Damyon Wiese
0cce8af367 Merge branch 'MDL-45455' of git://github.com/timhunt/moodle 2014-05-19 19:54:42 +08:00
Dan Poltawski
c1e3f99249 Merge branch 'MDL-45432-master' of https://github.com/lucisgit/moodle 2014-05-19 18:43:15 +08:00
sam marshall
abdbfc76fc MDL-45469 Conditional availability: Restrict by text area broken 
It has never worked, because the data for text area fields is not
loaded into the $USER object.

Changing it so that the dropdown list does not include these types
of field.
 2014-05-19 11:37:51 +01:00
Marina Glancy
f50bf62da6 Merge branch 'MDL-45478-master' of git://github.com/sammarshallou/moodle 2014-05-19 17:29:27 +08:00
Andrew Nicols
1ce043614f MDL-45239 editor_atto: The editor cannot be active if it is not the active element 
FireFox thinks that you can have an active selection on an element which
currently does not have focus. How this can be the case is a mystery.

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-05-19 16:15:09 +08:00
Andrew Nicols
17f253faeb MDL-45468 editor_atto: Check that the common ancestor is within the editor 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-05-19 16:14:03 +08:00
Dan Poltawski
18b12e7b60 Merge branch 'MDL-41109-master' of git://github.com/andrewnicols/moodle 2014-05-19 15:07:36 +08:00
Dan Poltawski
457bc31715 Merge branch 'wip-MDL-34914-master' of git://github.com/marinaglancy/moodle 2014-05-19 14:58:49 +08:00
Damyon Wiese
9febfdc56d MDL-32543 upgrade: Increment the version bump 
Conflicts:
	version.php
 2014-05-19 13:03:27 +08:00
Damyon Wiese
fc6b66c913 Merge branch 'MDL-32543' of https://github.com/danielneis/moodle 
Conflicts:
	version.php
 2014-05-19 13:02:48 +08:00
Damyon Wiese
50f0658804 Merge branch 'MDL-23566' of https://github.com/aolley/moodle 2014-05-19 12:45:21 +08:00
Frederic Massart
2507b7e060 MDL-45537 mod_assign: Requiring locallib for class assign 2014-05-19 12:40:17 +08:00
Marina Glancy
1de6c62dc7 Merge branch 'wip-MDL-45483-master' of https://github.com/kwiliarty/moodle 2014-05-19 12:37:10 +08:00
Damyon Wiese
b3eea60ecb Merge branch 'MDL-45533-27' of git://github.com/FMCorz/moodle 2014-05-19 12:25:56 +08:00
Damyon Wiese
634c982104 Merge branch 'MDL-44634-master' of https://github.com/dbezborodovrp/moodle 2014-05-19 12:08:24 +08:00
Sam Hemelryk
da4887a2d9 Merge branch 'MDL-45561-master' of git://github.com/jethac/moodle 2014-05-19 13:37:12 +12:00
Sam Hemelryk
12890c57f2 MDL-44974 admin: repositioned call to initialise renderer 2014-05-19 08:41:29 +12:00
Sam Hemelryk
817d39b8aa MDL-44711 navigation: better handling of course expansion exception 2014-05-19 08:41:14 +12:00
Eric Merrill
e39099ac36 MDL-45603 cache Fix the mappingsonly option to work as advertised. 2014-05-17 23:48:33 -04:00
Marina Glancy
88de944a21 MDL-34914 cohorts: more understandable filter of user list by cohort 2014-05-16 17:09:07 +08:00
Andrew Nicols
679af35722 MDL-41109 dndupload: Add missing error string 2014-05-16 13:45:30 +08:00
Tim Hunt
6f988b712d MDL-45455 quiz cron must rollback transaction on error. 2014-05-15 15:09:58 +01:00
Tim Hunt
69d8094f83 MDL-43833 quiz reports: persist states settings between pages. 2014-05-15 15:09:12 +01:00
Jetha Chan
1e0b920cba MDL-45561 themes: horizontal scroll in RTL base 2014-05-15 15:50:26 +08:00
Damyon Wiese
a929fd50f9 weekly on-sync release 2.8dev 2014-05-15 15:29:23 +08:00
Damyon Wiese
ccce0d49e2 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-05-15 15:29:20 +08:00
Damyon Wiese
2ffff04be7 MDL-41383 Filepicker: whitespace fix 2014-05-15 13:32:13 +08:00
Jetha Chan
05bb4d1320 MDL-41383: RTL fix for base when zoomed out 2014-05-15 13:28:26 +08:00