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

68618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jetha Chan
328ef3df0e MDL-46022 custom_menu: add support for dividers 2014-06-20 15:53:11 +08:00
Eloy Lafuente (stronk7)
337075d17b weekly release 2.8dev 2014-06-12 18:58:54 +02:00
Eloy Lafuente (stronk7)
0272001830 Merge branch 'MDL-44871-master' of git://github.com/damyon/moodle 2014-06-12 11:38:10 +02:00
Eloy Lafuente (stronk7)
1a32e1d446 Merge branch 'MDL-42835-master' of http://github.com/damyon/moodle 2014-06-12 09:51:11 +02:00
Rajesh Taneja
c2c5d57790 MDL-45808 enrol_self: Fixed behat to observe the group key policy 2014-06-12 14:20:02 +08:00
Damyon Wiese
c48c9bf02f MDL-42835 Scorm: Fix for JS error because no nodes are selected in the toc. 2014-06-12 13:57:34 +08: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
Damyon Wiese
ca4f7f6105 MDL-45763 Question types: Allow saving '0' as question text. 2014-06-11 17:28:52 +08:00
Rajesh Taneja
49d82f905e MDL-44871 behat: Hack to make equation editor visible 2014-06-11 17:20:18 +08:00
Marina Glancy
84dc90034a MDL-39726 backup: fix SQL syntax for Oracle 2014-06-11 17:16:45 +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
Marina Glancy
b9329e0cfe MDL-39726 backup: fix SQL syntax for Oracle 2014-06-11 12:14:16 +08:00
Marina Glancy
5528117324 MDL-45763 question: fix SQL syntax for Oracle 2014-06-11 12:13:19 +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
Eloy Lafuente (stronk7)
a834119d81 Merge branch 'MDL-45808-master' of git://github.com/FMCorz/moodle 2014-06-10 22:47:54 +02:00
Eloy Lafuente (stronk7)
ffce783fcd Merge branch 'MDL-45579-master' of git://github.com/FMCorz/moodle 2014-06-10 20:56:14 +02:00
Eloy Lafuente (stronk7)
ed16bf3724 Merge branch 'MDL-45418' of git://github.com/stronk7/moodle 2014-06-10 20:12:58 +02:00
Barbara Ramiro
1e2e5d83e9 MDL-45943: Replacement for publisher icons 2014-06-10 19:20:35 +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
5adb8d86bd Merge branch 'MDL-45763-master' of git://github.com/merrill-oakland/moodle 2014-06-10 20:08:06 +08:00
Eric Merrill
516a3ddc76 MDL-45763 question: Correct random question text if set to true or false 2014-06-10 06:05:33 -04: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
Damyon Wiese
79b1aa8ac3 Merge branch 'wip-MDL-44309-master' of https://github.com/deraadt/moodle 2014-06-10 14:06:19 +08:00
Damyon Wiese
850833378d Merge branch 'MDL-45761-master' of https://github.com/merrill-oakland/moodle 2014-06-10 14:01:23 +08:00
Damyon Wiese
dc92753a3a Merge branch 'MDL-45767_returnInstanceid' of https://github.com/moodlerooms/moodle 2014-06-10 13:34:01 +08:00
Damyon Wiese
5262686e5f Merge branch 'MDL-45729-master' of http://github.com/damyon/moodle 2014-06-10 13:28:04 +08:00
Damyon Wiese
2d8d99ab5b Merge branch 'MDL-45763-master' of https://github.com/merrill-oakland/moodle 2014-06-10 12:42:09 +08:00
Damyon Wiese
5ba4ca894a MDL-45729 assign: Fix for assign unit tests 
Check the user in the params, not the $USER
 2014-06-10 11:39:20 +08:00
Eloy Lafuente (stronk7)
3150271c22 Merge branch 'MDL-45789_master' of https://github.com/markn86/moodle 2014-06-10 01:16:27 +02:00
Eloy Lafuente (stronk7)
d1b183b94b Merge branch 'MDL-45804_master' of https://github.com/markn86/moodle 2014-06-10 01:14:21 +02:00
Eloy Lafuente (stronk7)
2975f1a0cc Merge branch 'MDL-42782-master' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-06-10 01:08:45 +02:00
Eloy Lafuente (stronk7)
0a87b6809f Merge branch 'MDL-42835' of git://github.com/nobelium/moodle 2014-06-10 00:36:33 +02:00
Graham Bowman
09fdd221ca MDL-45729 assign: conditional submission summary 
Only show the submission summary if user has assign:submit capability.

Amended to fix some whitespace and the commit message.
 2014-06-09 22:07:15 +02:00
Eloy Lafuente (stronk7)
3566ea16a8 Merge branch 'MDL-45574-master' of https://github.com/sammarshallou/moodle 2014-06-09 20:18:06 +02:00
Eloy Lafuente (stronk7)
61e11664c8 Merge branch 'wip-MDL-44501-master' of git://github.com/abgreeve/moodle 2014-06-09 18:59:16 +02: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
8c46fc33dc Merge branch 'MDL-45560-master' of git://github.com/andrewnicols/moodle 2014-06-09 17:23:54 +08: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
9e4c31accc MDL-45769 behat: use final versions of symfony and behat 2014-06-09 09:56:52 +08:00
Rajesh Taneja
ddfbdf0924 MDL-45769 Behat: Fixed behat, was failing because of xpath chaining 2014-06-09 09:56:39 +08:00