mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
68,406 Commits 36 Branches 519 Tags
Commit Graph

68406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Aherne
8561492010 MDL-43669 messaging Enable sending email only from no-reply address 2014-05-19 09:24:26 +01: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
Marina Glancy
69d570c130 MDL-45466 forum: performance improvement for mass (un)subscriptions 2014-05-19 13:37:05 +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
Damyon Wiese
726b011050 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:37:16 +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
Tim Hunt
1c65d09f17 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 14:52:43 +01: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
Andrew Nicols
531c263a86 MDL-45536 theme: Use width auto for inputs and textareas specifying them 2014-05-16 12:09:40 +08:00
Dan Marsden
dafb79106e MDL-45583 badges: check parent contexts consistantly when checking required role. 2014-05-16 13:51:58 +12:00
Mark Nelson
10dbb4bae0 MDL-45571 events: included enrolment method in the 'user_enrolment_created' event description 2014-05-15 14:48:26 -07: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
Simey Lameze
1468444f42 MDL-45323 grade: Unit test for grade_get_grade_items_for_activity() 2014-05-15 15:00:56 +08:00
Simey Lameze
3a34659252 MDL-45323 grade: Fix query errors on grade_get_grade_for_activity method. 2014-05-15 15:00:03 +08:00
Ankit Agarwal
9d59d9e39e MDL-45501 availability: Add uninstall support for conditional plugins 2014-05-15 14:04:52 +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
Dan Poltawski
376a17e4ae MDL-44323 admin: use correct css class for warning 
The notifyproblem notification is consistent with the rest of
the warnings we report.
 2014-05-15 12:00:11 +08:00
Frederic Massart
9389ff572b MDL-45533 editor_atto: Default paragraph is removed from empty Atto 2014-05-15 11:10:54 +08:00
Andrew Nicols
f366221309 MDL-45479 atto_image: Improve the preview area 
This changes the preview area:
* to show the image at the requested size; and
* to fix the scaling issues.
 2014-05-15 10:36:41 +08:00
Damien Bezborodov
5d49b2b21d MDL-44634 Regression: link to user profile in comments block fails due to double URI encoding 2014-05-15 11:39:24 +09:30
Damien Bezborodov
a9af43be51 MDL-44634 Regression: link to user profile in comments block fails due to double URI encoding 2014-05-15 10:48:50 +09:30
sam marshall
fbe79e4937 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:08:27 +01:00
sam marshall
3f8527aa1e MDL-45550 Conditional availability: Missing lang string for save settings error 2014-05-14 11:47:53 +01:00
sam marshall
2164bd723a MDL-45477 Behat: List of steps takes too long to load, times out 
Increase time limit to 300 seconds (5 minutes).
 2014-05-14 11:06:51 +01:00
Marina Glancy
363c49f4c8 Merge branch 'MDL-36670' of git://github.com/jleyva/moodle 2014-05-14 16:34:52 +08:00
Ankit Agarwal
5cad8d353d MDL-45543 availability: Use correct namespace for global classes 2014-05-14 15:31:08 +08:00
Damyon Wiese
9bced5c0e2 Merge branch 'MDL-41383-master-basefix' of https://github.com/jethac/moodle 2014-05-14 15:04:20 +08:00
Jetha Chan
92061d3890 MDL-41383 theme: filepicker zoom resiliency (base) 
Fixed an issue that broke the file picker on base when initial zoom level is less than 100%.
 2014-05-14 14:46:20 +08:00