mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 00:20:37 +01:00
Code Issues Projects Releases Wiki Activity
69,436 Commits 36 Branches 527 Tags
Commit Graph

18956 Commits

Author SHA1 Message Date
uhunkler
6dccf359a0 MDL-46302 correct atto img float right 
Correct the atto image "float right" margin CSS
 2014-08-20 00:59:31 +02:00
Marina Glancy
376a6f687c Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle 2014-08-19 17:28:55 +08:00
Rajesh Taneja
a9950b49c4 MDL-46327 phpunit: drop_table should be used, rather then drop_temp_table 2014-08-19 17:16:55 +08:00
Damyon Wiese
52ed065131 Merge branch 'MDL-46706-master' of https://github.com/sammarshallou/moodle 
Conflicts:
	lib/tests/modinfolib_test.php
 2014-08-19 17:13:05 +08:00
Damyon Wiese
aba9019832 Merge branch 'wip_MDL-46711_m28_memcachesrvs' of https://github.com/skodak/moodle 2014-08-19 16:31:06 +08:00
Damyon Wiese
fc9b567f32 Merge branch 'MDL-46772-master' of git://github.com/andrewnicols/moodle 2014-08-19 15:41:32 +08:00
Marina Glancy
7e4475d37c Merge branch 'MDL-46833-master' of git://github.com/lucisgit/moodle 2014-08-19 14:20:41 +08:00
Marina Glancy
2c0ee558e5 Merge branch 'wip-mdl-46817' of git://github.com/rajeshtaneja/moodle 2014-08-19 14:03:27 +08:00
Marina Glancy
430529bde8 Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle 2014-08-19 13:50:44 +08:00
Damyon Wiese
9eea856632 MDL-18014 Atto autosave: Add a timemodified field to the auto save drafts 
Do not restore any draft older than 4 days to (sort of) sync with the draft file
lifetime.
 2014-08-19 12:30:13 +08:00
Damyon Wiese
942501f318 MDL-18014 Atto autosave: When text is recovered, force it into the undo stack 
This allows you to use "Undo" to go back to the unaltered text in the form.
 2014-08-19 12:13:41 +08:00
Marina Glancy
b3194ab1b2 Merge branch 'master_MDL-46775' of git://github.com/totara/moodle 2014-08-19 11:21:22 +08:00
Marina Glancy
3377a87d69 Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle 2014-08-19 10:48:11 +08:00
Rajesh Taneja
c1dc3f4793 MDL-46327 phpunit: Fixed oracle fail 2014-08-19 10:11:20 +08:00
Eloy Lafuente (stronk7)
652d886ae5 Merge branch 'wip_MDL-46552_m28_memcached' of https://github.com/skodak/moodle 2014-08-19 02:28:56 +02:00
Eloy Lafuente (stronk7)
6ea7fde09c Merge branch 'MDL-45874' of https://github.com/danielneis/moodle 2014-08-18 23:58:27 +02:00
Eloy Lafuente (stronk7)
6ba12477ec Merge branch 'wip-MDL-46589-master' of git://github.com/marinaglancy/moodle 2014-08-18 19:47:50 +02:00
Rajesh Taneja
641459a8a5 MDL-46817 behat: Step to check if value exist/not in table column 2014-08-18 09:59:29 +08:00
Marina Glancy
041a1de0a1 MDL-41284 stats: fix sql query from MDL-41284 2014-08-16 18:55:29 +08:00
Marina Glancy
fb71171fc6 MDL-46589 scheduled task does not send emails 
Thanks to  Luděk Šulák  for the patch
 2014-08-16 11:29:34 +08:00
Daniel Neis
e0530c2f14 MDL-45874 Fix access to users reports in navigation when using separate groups 2014-08-15 17:04:50 -03:00
sam marshall
d25c41fbc5 MDL-46706 Library: API to get cm_info more easily 
Creates two new functions that make it easier to get cm_info
objects (both in modinfolib.php):

get_course_and_cm($cmid) - intended for use e.g. in modules;
efficiently loads $course and $cm (normally saves 1 query).

cm_info::from_mixed($cm) - for use in back-end API where we
are not sure whether a $cm is a real cm_info or a stdClass.
 2014-08-15 18:24:11 +01:00
Rajesh Taneja
7d1c6a6e62 MDL-46817 behat: Table selector support css 
Previously table selector supported id and caption only.
But in few cases we don't have proper id, so added support
for css
 2014-08-15 13:11:33 +08:00
Ruslan Kabalin
dfaedf0854 MDL-46833 mod_assign: Fix assignment view when available for group members only. 
When assignment is "Available for group members only" and no users with
mod/assign:submit role permision is enrolled (students),
groups_filter_users_by_course_module_visible is causing error (as $users
array is empty). The patch resolves the issue.
 2014-08-14 16:06:08 +01:00
Damyon Wiese
c07f86ce26 MDL-18014 Atto autosave: Use the $PAGE->url to differentiate autosave instances 2014-08-14 13:23:05 +08:00
Damyon Wiese
d8733567ee MDL-18014 Atto autosave: Redo version bump after rebase 2014-08-14 12:44:01 +08:00
Damyon Wiese
56579fb68b MDL-18014 Atto autosave: Change ajax script path to an attribute 2014-08-14 12:44:00 +08:00
Damyon Wiese
e7a8977ef4 MDL-18014 Atto: Fix for error handling bug on autosave 2014-08-14 12:43:47 +08:00
Damyon Wiese
f1018cd615 MDL-18014 Atto: Make notifications fade in/out. 2014-08-14 12:43:32 +08:00
Damyon Wiese
a10c6ea8fc MDL-18014 Atto: Language change for auto save text. 
Make this text shorter so it's less distracting.
 2014-08-14 12:43:14 +08:00
Damyon Wiese
19549f8bed MDL-18014 Atto: Assorted coding style changes from peer review 2014-08-14 12:43:14 +08:00
Damyon Wiese
6bfd450a6d MDL-18014 Atto: Make the autosave frequency configurable 2014-08-14 12:43:04 +08:00
Damyon Wiese
a108fbeecf MDL-18014 Atto: Add a notification when text is autosaved. 2014-08-14 12:42:55 +08:00
Damyon Wiese
8593521f4c MDL-18014 Atto autosave: Fix coding style issues 2014-08-14 12:42:46 +08:00
Damyon Wiese
e3502577b8 MDL-18014 Atto: Reset auto save frequency to 60 seconds. 2014-08-14 12:42:45 +08:00
Damyon Wiese
c195bbffab MDL-18014 Atto autosave: Correct detection of autosaving error when session expired 2014-08-14 12:42:37 +08:00
Damyon Wiese
8a5db5472e MDL-18014 Atto autosave: Show warning when the server cannot be contacted for autosave. 2014-08-14 12:42:27 +08:00
Damyon Wiese
ddaeae21fd MDL-18014 Atto autosave: Change default autosave frequency to 60 seconds 2014-08-14 12:42:17 +08:00
Damyon Wiese
75c86d13c7 MDL-18014 Atto: Add notification support to Atto. 2014-08-14 12:42:06 +08:00
Damyon Wiese
2ba6706d12 MDL-18014 Atto: Autosave text every N seconds. 2014-08-14 12:41:55 +08:00
Andrew Nicols
7dfaa3aede MDL-46772 core: html_writer::table should respect tr attributes 2014-08-14 12:06:31 +08:00
Dan Poltawski
023d758513 Merge branch 'wip_MDL-46561_m28_sessexists' of https://github.com/skodak/moodle 2014-08-12 14:28:22 +01:00
Dan Poltawski
70c16c5336 Merge branch 'MDL-45642' of git://github.com/timhunt/moodle 2014-08-12 11:34:05 +01:00
Marina Glancy
49b9144c87 Merge branch 'm28_MDL-46315' of git://github.com/totara/moodle 2014-08-12 15:01:30 +08:00
Marina Glancy
7c27c681b1 Merge branch 'wip_MDL-46480_m28_footernan' of git://github.com/skodak/moodle 2014-08-12 15:01:10 +08:00
Simon Coggins
754313fbb8 MDL-46775: Fix call to unavailable function when loading an invalid JS file 2014-08-12 14:06:37 +12:00
Eloy Lafuente (stronk7)
f414c5aa9e Merge branch 'MDL-46646_master' of https://github.com/Syxton/moodle 2014-08-12 01:53:23 +02:00
Dan Poltawski
c068b0814b Merge branch 'MDL-46496-master' of git://github.com/andrewnicols/moodle 2014-08-11 14:38:33 +01:00
Dan Poltawski
c5186b2251 Merge branch 'MDL-46688' of git://github.com/timhunt/moodle 2014-08-11 14:13:12 +01:00
Dan Poltawski
463d281377 Merge branch 'MDL-45759-master' of git://github.com/andrewnicols/moodle 2014-08-11 11:24:19 +01:00