mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-16 05:30:06 +01:00
Code Issues Projects Releases Wiki Activity
68,621 Commits 36 Branches 527 Tags
Commit Graph

18702 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
0272001830 Merge branch 'MDL-44871-master' of git://github.com/damyon/moodle 2014-06-12 11:38:10 +02:00
Damyon Wiese
d27c8d924a MDL-44871 Atto: Add missing tags to behat tests @editor and @editor_atto 2014-06-12 11:14:21 +08:00
Rajesh Taneja
49d82f905e MDL-44871 behat: Hack to make equation editor visible 2014-06-11 17:20:18 +08:00
Damyon Wiese
162e050c66 MDL-44871 Atto behat: Use one less page load to get to profile edit page 2014-06-11 16:29:38 +08:00
Damyon Wiese
e3adee555b MDL-44871 Atto: Move custom select text step to atto specific step definition. 2014-06-11 15:29:20 +08:00
Damyon Wiese
7d8f825bbf MDL-44871 Atto behat tests: Modified the tests to work around focus bugs with workspaces 
The main changes here are that the "select the text in" step was modified to select only the
first text node in the editor field, and to focus on it's parent instead of the entire editable div.

Some tests had to be modified to match the new behaviour, and another "real" bug was found in the table plugin.
 2014-06-11 14:34:48 +08:00
Eloy Lafuente (stronk7)
ea8541d0f9 Merge branch 'm28_MDL-29708_Typo_Extra_Slashes' of https://github.com/scara/moodle 2014-06-11 01:32:24 +02:00
Jason Fowler
b5725a9727 MDL-45418 Files: Adding upgrade steps for publisher docs 
Conflicts:
	lib/db/upgrade.php
	version.php
 2014-06-10 19:18:35 +02:00
James McLean
855d8a2c49 MDL-45418 Files: Adding publisher docs to Filetypes 2014-06-10 19:09:27 +02:00
Marina Glancy
4422b08068 Merge branch 'MDL-45813-scheduled_task' of git://github.com/mudrd8mz/moodle 2014-06-10 15:42:42 +08:00
Marina Glancy
410bb9a92c Merge branch 'MDL-20154-master' of git://github.com/merrill-oakland/moodle 2014-06-10 15:41:53 +08:00
Damyon Wiese
5d44ea3333 Merge branch '45524-28' of git://github.com/samhemelryk/moodle 2014-06-10 15:30:16 +08:00
Damyon Wiese
457a9fa6c5 MDL-44871 Behat: Add tests for Atto functionalities (some of them) 2014-06-10 14:42:00 +08:00
Marina Glancy
0b74d45c70 Merge branch 'wip-MDL45846' of git://github.com/jennymgray/moodle 2014-06-10 14:19:45 +08:00
Daniel Neis Araujo
db282ba4fe MDL-45245 html_writer::select_time does not respect 5th parameter "attributes" 2014-06-10 14:19:04 +08:00
Jenny Gray
d6bc210687 MDL-45846 Libraries custom user agent device detection unit test added 2014-06-09 13:56:42 +01:00
Eloy Lafuente (stronk7)
d663c5abc5 Merge branch 'wip-mdl-45769' of https://github.com/rajeshtaneja/moodle 2014-06-09 13:25:01 +02:00
Marina Glancy
3f445e4e23 Merge branch 'MDL-45634-master' of git://github.com/FMCorz/moodle 2014-06-09 17:23:42 +08:00
David Mudrák
dc561732b5 MDL-45813 Fix variable name in scheduled task 2014-06-09 09:46:13 +02:00
Rajesh Taneja
ddfbdf0924 MDL-45769 Behat: Fixed behat, was failing because of xpath chaining 2014-06-09 09:56:39 +08:00
Sam Hemelryk
cbd063f4c3 MDL-44711 navigation: improved expandable course calculation 2014-06-09 09:34:05 +12:00
Matteo Scaramuccia
8436e8590f MDL-29708 Fixed file_exception() arguments in rename(). 2014-06-07 09:53:11 +02:00
Matteo Scaramuccia
ad3ade7681 MDL-29708 Fixed extra slashes in $string['storedfilenotcreated']. 2014-06-07 09:53:09 +02:00
Jenny Gray
ccbb60d188 MDL-45846 Libraries Reinstate custom user agent device detection 2014-06-06 09:10:32 +01:00
Eric Merrill
c1d0d73718 MDL-20154 questions: question_delete_question should not check perms 
By Moodle convention, library functions should not implement permission
checks, they are to be handled by the invoking code.
 2014-06-05 09:56:35 -04:00
Damyon Wiese
ddf831be20 Merge branch 'MDL-45568_master' of git://github.com/markn86/moodle 2014-06-04 10:20:53 +08:00
Marina Glancy
0313897108 Merge branch 'wip-mdl-44839' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/phpunit/bootstrap.php
 2014-06-04 10:07:03 +08:00
Mark Nelson
336f1567bb MDL-45568 events: fixed the description for the 'course_module_completion_updated' event 2014-06-03 17:25:53 -07:00
Sam Hemelryk
0591c2056d Merge branch 'MDL-44486-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-06-04 09:51:37 +12:00
Dan Poltawski
1051166f78 Merge branch '45333-28' of git://github.com/samhemelryk/moodle 2014-06-03 15:25:59 +01:00
Dan Poltawski
09da421d92 Merge branch '45513-28-defines' of git://github.com/samhemelryk/moodle 2014-06-03 12:20:41 +01:00
Rajesh Taneja
1bce3a70d9 MDL-44839 admin: Moved all system executable paths to config 
AMOS BEGIN
 MOV ['gspath','assignfeedback_editpdf'],['pathtogs','admin']
 MOV ['gspath_help','assignfeedback_editpdf'],['pathtogs_help','admin']
AMOS END
 2014-06-03 17:33:49 +08:00
Damyon Wiese
96c9b2feb3 Merge branch 'MDL-45630_master' of https://github.com/markn86/moodle 2014-06-03 15:00:27 +08:00
Damyon Wiese
0fe6999ace Merge branch 'MDL-45658_master' of https://github.com/markn86/moodle 2014-06-03 14:52:33 +08:00
Frederic Massart
097f7eca38 MDL-45634 editor_atto: Adding type button to toolbar buttons 
This prevents the browser to assume that those buttons are submit
buttons. In which case the submit action was stolen and the form
could not be submitted pressing the 'enter' key.
 2014-06-03 12:09:17 +08:00
Sam Hemelryk
58e70de193 Merge branch 'MDL-33763-master' of git://github.com/ankitagarwal/moodle 2014-06-03 08:57:31 +12:00
Mark Nelson
1ea5f1e2d3 MDL-45630 events: removed unnecessary 'the' from event descriptions 2014-05-31 15:27:11 -07:00
Sam Hemelryk
90395bbfa1 MDL-45333 output: navbar is now wrapped in a <nav> tag 2014-05-30 08:41:29 +12:00
Sam Hemelryk
79a8ea653c MDL-45513 cache: added support to unit tests for alt cache stores 2014-05-30 08:41:07 +12:00
Damyon Wiese
3f86b023ef MDL-45654 Cron: Fix for unit test that was causing integer overflow in 32 bit php 2014-05-29 12:10:19 +08:00
Sam Hemelryk
20f29d2c89 MDL-45654 cron: fixed dataprovider timestamp issue 2014-05-29 11:53:36 +12:00
Sam Hemelryk
69ab6b4713 Merge branch 'wip-mdl-45565' of https://github.com/rajeshtaneja/moodle 2014-05-29 08:12:32 +12:00
Eloy Lafuente (stronk7)
f94891cc00 MDL-45503 upgrade: add v2.7.0 sep lines 2014-05-28 01:13:42 +02:00
Dan Poltawski
a64528d88c Merge branch 'MDL-45544-master' of git://github.com/lameze/moodle 2014-05-27 07:49:58 +01:00
Dan Poltawski
6ca4f19a9f Merge branch 'MDL-45682-master' of git://github.com/andrewnicols/moodle 2014-05-26 11:23:59 +01:00
Rajesh Taneja
6b8e46ad04 MDL-45565 core_message: Reset internal users in phpunit 2014-05-26 15:42:12 +08:00
Simey Lameze
b0ad512f95 MDL-45544 events: Add event user_profile_viewed trigger to user/profile.php. 2014-05-26 12:51:40 +08:00
Andrew Nicols
362659725b MDL-45682 editor_atto: Ensure that the current editor is active when saving selections 2014-05-26 12:02:02 +08:00
Marina Glancy
0251be5bcc Merge branch 'MDL-44014-master' of git://github.com/andrewnicols/moodle 2014-05-26 11:58:43 +08:00
Ankit Agarwal
963402c2ba MDL-33763 notes: Fix issue with incorrect node highlighting in the nav tree 2014-05-26 10:40:10 +08:00