Commit graph

4342 commits

Author SHA1 Message Date
David Monllao
32d6e29eb4 MDL-38547 behat: New tests
According MDLQA-1597, MDLQA-1598,
MDLQA-1599, MDLQA-1600 and MDLQA-1601
2013-03-19 16:28:19 +08:00
Damyon Wiese
3b2a6bf555 MDL-37079 Course create/update module. Remove use of "continue 2". 2013-03-19 13:03:11 +08:00
Damyon Wiese
8f2913b936 MDL-37079 Course create/update module. Fix indenting, some comment formatting and whitespace. 2013-03-19 11:20:39 +08:00
Damyon Wiese
8fe55f6862 Merge branch 'MDL-37079-master2' of git://github.com/mouneyrac/moodle 2013-03-19 11:13:23 +08:00
Damyon Wiese
1c14b1c10c MDL-38367 Course dnduploadlib : deprecated add_* functions as they are internal to the class. 2013-03-19 09:56:16 +08:00
Damyon Wiese
23477802b7 Merge branch 'MDL-38367_dnd_ui_improvements' of git://github.com/davosmith/moodle 2013-03-19 09:31:07 +08:00
Davo Smith
09fd07fe00 MDL-38367 course dndupload - deprecate public 'add_type' function, remove non-YUI3 API call to _node 2013-03-18 18:47:04 +00:00
Jerome Mouneyrac
37550a52e7 MDL-37079 missed one modedit.php change since started to work on the issue 2013-03-18 16:08:52 +08:00
Jerome Mouneyrac
80fe0c1983 MDL-37079 switch the modedit.php functions into course/modedit.php 2013-03-18 14:41:38 +08:00
Jerome Mouneyrac
7cb0ea2c37 MDL-37079 remove TODO, add . in comments 2013-03-18 14:41:37 +08:00
Jerome Mouneyrac
7bf4f6e999 MDL-37079 Added many assertEquals + generic test function (easy to test new module) + now process next advanced grading screens 2013-03-18 14:41:36 +08:00
Jerome Mouneyrac
dd5d933f30 MDL-37079 create/update_module() 2013-03-18 14:41:35 +08:00
Damyon Wiese
7c211f565a Merge branch 'MDL-38005-master' of git://github.com/FMCorz/moodle 2013-03-18 13:45:41 +08:00
Petr Škoda
9d4f949547 MDL-38202 fix loginas logout redirection 2013-03-17 20:51:25 +01:00
Frederic Massart
807cf3d0ae MDL-38005 form: Headers have a proper name 2013-03-15 11:06:25 +08:00
sam marshall
3a09f4dc64 MDL-38035 Activity settings: Support multilang names for custom user fields 2013-03-12 15:05:24 +00:00
Ankit Agarwal
50c02a3556 MDL-36872 reports: Fixing incorrect sorting of recent activites by timestamp 2013-03-12 17:04:53 +08:00
Aparup Banerjee
ca5cb4ccac Merge branch 'MDL-35615' of git://github.com/rwijaya/moodle 2013-03-12 15:55:17 +08:00
Frederic Massart
2ce5fd502f MDL-38414 course: Settings form displays all role renaming fields 2013-03-12 13:04:02 +08:00
Davo Smith
413bca9f76 MDL-38367 course dndupload - workaround to allow 'add X here' text to be drop target in Firefox 2013-03-11 22:44:55 +00:00
Davo Smith
66079e28fd MDL-38367 course dndupload - various tweaks to the UI
Switched to Moodle-style dialog boxes (thanks Andrew for the pointer)
Enter button now submits the form (from within the 'name' field)
Upload button is disabled when the name is empty (if the name is required for the selected handler)
Dialog now has 'What do you want to do with this text?' and 'Name' for the text
Entire course section now has a class added when you drag over it (to enable it to be styled in the future)
2013-03-11 22:44:55 +00:00
David Monllao
5ecb87a9a2 MDL-38352 behat: Updating tests
According to latest language strings
changes
2013-03-07 13:56:49 +08:00
Aparup Banerjee
c65e7fcbc8 Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle 2013-03-07 10:41:52 +08:00
Davo Smith
2748d8efdb MDL-33946 course dndupload - fixes to dialog when dragging text
Radio buttons have unique IDs, matching the label IDs
'What do you want to call this text' input moved down and disabled when 'label' selected
'Add page here' changed to 'Add text here'
2013-03-06 22:38:01 +00:00
Eloy Lafuente (stronk7)
9af30e60b5 Merge branch 'MDL-38252-master' of git://github.com/danpoltawski/moodle 2013-03-05 18:12:55 +01:00
Daniele Cordella
a5b884fe6f MDL-35615 Course section: fixed alignment for userdefaultname checkbox to be inline with section name text input 2013-03-05 16:03:13 +08:00
Aparup Banerjee
c2b40106d3 Merge branch 'wip-MDL-38251-m25' of git://github.com/samhemelryk/moodle 2013-03-05 13:09:37 +08:00
Sam Hemelryk
dc8e7116a7 Merge branch 'wip-MDL-37901_master' of git://github.com/gjb2048/moodle 2013-03-05 15:23:46 +13:00
Gareth J Barnard
dafa91279f MDL-37901 format_topics & format_weeks: Fix drag icon tooltip after move. 2013-03-02 12:38:29 +00:00
sam marshall
7ae7c3cf9a MDL-38101 Completion: Error when teacher/admin marks activity complete 2013-03-01 11:18:31 +00:00
Sam Hemelryk
79137823fa MDL-38251 course: fixed add category button on top level 2013-03-01 10:12:02 +13:00
Dan Poltawski
b22b74035c MDL-38252 - course: fix typo 2013-02-28 11:04:30 +08:00
Eloy Lafuente (stronk7)
9515c34ee6 Merge branch 'wip-MDL-30669-master' of git://github.com/abgreeve/moodle 2013-02-26 09:46:13 +01:00
Sam Hemelryk
07ccb35731 Merge branch 'wip-MDL-38144-master' of git://github.com/marinaglancy/moodle 2013-02-26 15:43:26 +13:00
Adrian Greeve
b7d3bb0fc6 MDL-30669 - blocks: Unit tests for course_page_type_list() 2013-02-26 10:21:45 +08:00
Adrian Greeve
3dd204b1e6 MDL-30669 - blocks: Added a warning when deleting blocks that have multiple displays set.
Also added a fix to the function course_page_type_list(). It was making a call to
get_context_info_array() which will generate an error if $currentcontext is not set.
2013-02-26 10:21:37 +08:00
Eloy Lafuente (stronk7)
b1ed9f6970 Merge branch 'MDL-38141-m' of git://github.com/andrewnicols/moodle 2013-02-26 01:19:29 +01:00
Eloy Lafuente (stronk7)
2a80528fd6 Merge branch 'wip-MDL-38146-master' of git://github.com/marinaglancy/moodle 2013-02-25 23:52:20 +01:00
Eloy Lafuente (stronk7)
05fc7ccc82 Merge branch 'MDL-30098_master' of git://github.com/markn86/moodle
Conflicts:
	course/tests/externallib_test.php
2013-02-25 23:38:20 +01:00
Marina Glancy
f0b137c5b8 MDL-38146 fixing navigation when adding/editing course category 2013-02-23 12:06:56 +11:00
Marina Glancy
db1eed7012 MDL-38144 categories are created in reverse sort order in externallib 2013-02-23 12:06:39 +11:00
Andrew Robert Nicols
005c6c203f MDL-38141 JavaScript: Remove unused dependency in module chooser 2013-02-20 21:37:43 +00:00
Eloy Lafuente (stronk7)
ca1774aea4 Merge branch 'wip-MDL-34298-m25' of git://github.com/samhemelryk/moodle 2013-02-20 00:45:50 +01:00
Eloy Lafuente (stronk7)
26581a7420 Merge branch 'wip-MDL-37987-master' of git://github.com/marinaglancy/moodle 2013-02-20 00:10:35 +01:00
Eloy Lafuente (stronk7)
8337ed1e69 Merge branch 'MDL-38033_dnd_uppercase_extn' of git://github.com/davosmith/moodle 2013-02-19 12:23:41 +01:00
Damyon Wiese
b27fc5b64f Merge branch 'wip-MDL-33774-master' of git://github.com/marinaglancy/moodle 2013-02-19 12:36:40 +08:00
Dan Poltawski
93a2d4e1a6 Merge branch 'MDL-37858_master' of git://github.com/dmonllao/moodle 2013-02-19 10:33:50 +08:00
Sam Hemelryk
79a809ba44 MDL-34298 course: fixed course search output validation issue 2013-02-19 11:03:58 +13:00
Marina Glancy
7d579b1e61 MDL-37987 bugfix: swapped column headings in the category management table 2013-02-18 13:24:06 +11:00
Andrew Robert Nicols
3f61e4cbf3 MDL-37939 Course: Add additional unit tests to confirm that module move occurs correctly 2013-02-15 21:28:50 +00:00