mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-02 23:12:32 +02:00
Code Issues Projects Releases Wiki Activity
69,551 Commits 36 Branches 528 Tags
Commit Graph

18977 Commits

Author SHA1 Message Date
Damyon Wiese
3a7887baa4 MDL-47060 Atto: Autosave - play nicely with HTML source view. 
There are 2 fixes here:
1. do not overwrite the changes to the HTML source when we do an autosave.
2. Move the Atto notifications alert to the containing div so it aligns properly for either view.
 2014-09-03 15:00:02 +08:00
Eloy Lafuente (stronk7)
934a22a333 Merge branch 'm28_MDL-46875' of https://github.com/totara/moodle 2014-08-27 01:41:58 +02:00
Damyon Wiese
6d9a83c294 Revert "Merge branch 'MDL-46917-master' of git://github.com/andrewnicols/moodle" 
This reverts commit acbcea51013bdf5d0101dc5856d8aca97bf1c036, reversing
changes made to 91f31c097dd46674d8535096e020ffa42536e854.
 2014-08-26 17:18:03 +08:00
Damyon Wiese
112632ed58 Merge branch 'wip_MDL-46235_m28_innodbtext' of https://github.com/skodak/moodle 2014-08-26 12:28:47 +08:00
Damyon Wiese
a564a66efa Merge branch 'MDL-46509' of https://github.com/danielneis/moodle 2014-08-26 11:45:43 +08:00
Brian Barnes
24af352b40 MDL-46875 tinymce: Fixed issue with full screen and spelling 2014-08-26 13:19:43 +12:00
Damyon Wiese
acbcea5101 Merge branch 'MDL-46917-master' of git://github.com/andrewnicols/moodle 2014-08-25 16:54:47 +08:00
Damyon Wiese
a88770d7eb Merge branch 'MDL-46923_master' of git://github.com/markn86/moodle 2014-08-25 16:48:27 +08:00
Damyon Wiese
4da7f20610 Merge branch 'wip_MDL-43918_m28_cm' of https://github.com/skodak/moodle 2014-08-25 16:45:15 +08:00
Marina Glancy
cf2d4159b7 Merge branch 'MDL-46191-master' of git://github.com/FMCorz/moodle 2014-08-25 15:43:29 +08:00
Frederic Massart
07f827acd4 MDL-46191 gradereport_history: Final clean up for integration 2014-08-25 14:53:28 +08:00
Marina Glancy
241d1d42cf Merge branch 'MDL-46904-master' of git://github.com/damyon/moodle 2014-08-25 14:45:05 +08:00
Petr Skoda
a45d54b8cb MDL-46235 ddl: add support for large number of text fields in one database table 2014-08-25 12:40:57 +12:00
Petr Skoda
b6f299bb69 MDL-43918 add more validation to $modulename parameter when fetching cms 2014-08-25 12:09:54 +12:00
Andrew Nicols
1b8f073de3 MDL-46917 atto: Focus on the editor when the form label is selected 2014-08-22 08:58:21 +08:00
Daniel Neis Araujo
b5a289c4e8 MDL-46509 enrol: Require 'enrol/PLUGIN:config' capabilities to show/hide enrollment instances 2014-08-21 19:01:57 -03:00
Eloy Lafuente (stronk7)
52953ff948 MDL-46918 ddl: cover behavior with unit test 2014-08-21 18:33:23 +01:00
Tim Hunt
5dc266d980 MDL-46918 ddl: fix error when renaming table already exists 2014-08-21 18:33:22 +01:00
Mark Nelson
08678f6f45 MDL-46923 core_behat: fixed typos in function names 2014-08-20 22:09:29 -07:00
Marina Glancy
ea1a0ff85a NOBUG: Fixed file access permissions 2014-08-21 10:18:37 +08:00
Damyon Wiese
a0ac406055 MDL-46904 core_task: Gracefully handle rubbish entries in the tasks table. 2014-08-20 17:01:15 +08:00
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