Commit graph

3662 commits

Author SHA1 Message Date
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
David Monllao
02ca6219a6 MDL-37858 behat: Removing fixStepArgument
It can be managed by a @Transform in
a centralized way
2013-02-15 13:38:14 +08:00
Davo Smith
04a38bd311 MDL-38033 dndupload - ignore case when comparing dropped file extensions with those supported by activity modules 2013-02-14 20:19:41 +00:00
Marina Glancy
9ecb50e6e3 MDL-33774 instead of checking that activity is label we check that it has view url 2013-02-14 19:46:19 +11:00
Dan Poltawski
6065652f24 Merge branch 'wip-MDL-37976-master' of git://github.com/marinaglancy/moodle 2013-02-12 16:13:48 +08:00
Damyon Wiese
147f592742 Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle
Conflicts:
	course/tests/behat/add_activities.feature
2013-02-12 14:48:40 +08:00
Damyon Wiese
f49ec42973 Merge branch 'MDL-37750_master-fix' of git://github.com/dmonllao/moodle 2013-02-12 14:47:50 +08:00
David Monllao
333cb91fbf MDL-37750 behat: Removing (now) collapsed elements 2013-02-12 14:06:51 +08:00
Damyon Wiese
6904688967 Merge branch 'MDL-37654_master' of https://github.com/markn86/moodle 2013-02-12 13:09:18 +08:00
Dan Poltawski
501bdad2b9 Merge branch 'wip-MDL-34798_master-2' of git://github.com/gjb2048/moodle 2013-02-12 10:34:07 +08:00
Marina Glancy
2333bfa7e8 MDL-37976 fixed missing global 2013-02-12 12:59:35 +11:00
Gareth J Barnard
cbddba1887 MDL_34798 format_topics and format_weeks: Adjust section names when moving up. 2013-02-11 13:43:42 +00:00
David Monllao
bf4fa29980 MDL-37750 behat: Adding tests for the rest of the steps definitions 2013-02-08 17:11:27 +08:00
David Monllao
1f9ffbdbde MDL-37750 behat: Using base find* methods 2013-02-08 17:11:27 +08:00
Davo Smith
785e09a7e3 MDL-32456 mod_label - support course drag and drop upload images to create labels 2013-02-08 08:13:24 +00:00
Marina Glancy
9d093b71af MDL-37572 small bug fix with misplaced assignment 2013-02-07 15:22:29 +13:00
Sam Hemelryk
e6a3f4ae27 MDL-37572 course: fixed bug when moving categories 2013-02-07 12:29:03 +13:00
Mark Nelson
79949c1ba3 MDL-30098 core_course: adding webservice functions to allow the deletion of module instances 2013-02-06 16:56:17 +08:00
Dan Poltawski
ef5a82104c MDL-37572 - fix typo in has_any_capability() 2013-02-06 14:47:29 +08:00
Mark Nelson
9a9cb74118 MDL-37654 core_course: ensure exceptions return static error codes for debugging purposes 2013-02-06 12:10:10 +08:00
Damyon Wiese
e2adaaf788 MDL-30062 - Fix whitespace 2013-02-05 16:07:08 +08:00
Damyon Wiese
33d943500f Merge branch 'wip-mdl-30062' of git://github.com/rajeshtaneja/moodle 2013-02-05 15:53:21 +08:00
Dan Poltawski
9cf44c32b5 Merge branch 'wip-MDL-37572-m25' of git://github.com/samhemelryk/moodle 2013-02-05 15:25:08 +08:00
Rajesh Taneja
791723c34a MDL-30062 Webservices: added update_course webservice 2013-02-05 14:15:53 +08:00
Dan Poltawski
40a008b33c Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle 2013-02-04 11:29:22 +08:00
Sam Hemelryk
4d26b7f6fa MDL-37572 course: cleaned up manage.php bringing it into the 21st century 2013-02-01 08:51:35 +13:00
Marina Glancy
2c49fb4c3e MDL-37572 Course categories are now managed in /course/manage.php
Switching between categories view and edit no longer depend on global editing mode
/course/index.php and /course/category.php do not contain editing code
2013-02-01 08:51:34 +13:00
David Monllao
d780452472 MDL-37661 behat: Test to add activities to courses 2013-01-29 18:19:04 +08:00
David Monllao
a1990e50e8 MDL-37661 behat: Add activities to courses 2013-01-29 18:18:57 +08:00
Dan Poltawski
2a090a1581 Merge branch 'wip-mdl-34190' of git://github.com/rajeshtaneja/moodle 2013-01-29 16:53:49 +08:00
Sam Hemelryk
da810f5816 Merge branch 'MDL-37476-master' of git://github.com/mouneyrac/moodle 2013-01-29 15:24:06 +13:00