ca5cb4ccac
Merge branch 'MDL-35615' of git://github.com/rwijaya/moodle
2013-03-12 15:55:17 +08:00
5ecb87a9a2
MDL-38352 behat: Updating tests
...
According to latest language strings
changes
2013-03-07 13:56:49 +08:00
c65e7fcbc8
Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle
2013-03-07 10:41:52 +08:00
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
9af30e60b5
Merge branch 'MDL-38252-master' of git://github.com/danpoltawski/moodle
2013-03-05 18:12:55 +01:00
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
c2b40106d3
Merge branch 'wip-MDL-38251-m25' of git://github.com/samhemelryk/moodle
2013-03-05 13:09:37 +08:00
dc8e7116a7
Merge branch 'wip-MDL-37901_master' of git://github.com/gjb2048/moodle
2013-03-05 15:23:46 +13:00
dafa91279f
MDL-37901 format_topics & format_weeks: Fix drag icon tooltip after move.
2013-03-02 12:38:29 +00:00
7ae7c3cf9a
MDL-38101 Completion: Error when teacher/admin marks activity complete
2013-03-01 11:18:31 +00:00
79137823fa
MDL-38251 course: fixed add category button on top level
2013-03-01 10:12:02 +13:00
b22b74035c
MDL-38252 - course: fix typo
2013-02-28 11:04:30 +08:00
9515c34ee6
Merge branch 'wip-MDL-30669-master' of git://github.com/abgreeve/moodle
2013-02-26 09:46:13 +01:00
07ccb35731
Merge branch 'wip-MDL-38144-master' of git://github.com/marinaglancy/moodle
2013-02-26 15:43:26 +13:00
b7d3bb0fc6
MDL-30669 - blocks: Unit tests for course_page_type_list()
2013-02-26 10:21:45 +08:00
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
b1ed9f6970
Merge branch 'MDL-38141-m' of git://github.com/andrewnicols/moodle
2013-02-26 01:19:29 +01:00
2a80528fd6
Merge branch 'wip-MDL-38146-master' of git://github.com/marinaglancy/moodle
2013-02-25 23:52:20 +01:00
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
f0b137c5b8
MDL-38146 fixing navigation when adding/editing course category
2013-02-23 12:06:56 +11:00
db1eed7012
MDL-38144 categories are created in reverse sort order in externallib
2013-02-23 12:06:39 +11:00
005c6c203f
MDL-38141 JavaScript: Remove unused dependency in module chooser
2013-02-20 21:37:43 +00:00
ca1774aea4
Merge branch 'wip-MDL-34298-m25' of git://github.com/samhemelryk/moodle
2013-02-20 00:45:50 +01:00
26581a7420
Merge branch 'wip-MDL-37987-master' of git://github.com/marinaglancy/moodle
2013-02-20 00:10:35 +01:00
8337ed1e69
Merge branch 'MDL-38033_dnd_uppercase_extn' of git://github.com/davosmith/moodle
2013-02-19 12:23:41 +01:00
b27fc5b64f
Merge branch 'wip-MDL-33774-master' of git://github.com/marinaglancy/moodle
2013-02-19 12:36:40 +08:00
93a2d4e1a6
Merge branch 'MDL-37858_master' of git://github.com/dmonllao/moodle
2013-02-19 10:33:50 +08:00
79a809ba44
MDL-34298 course: fixed course search output validation issue
2013-02-19 11:03:58 +13:00
7d579b1e61
MDL-37987 bugfix: swapped column headings in the category management table
2013-02-18 13:24:06 +11:00
3f61e4cbf3
MDL-37939 Course: Add additional unit tests to confirm that module move occurs correctly
2013-02-15 21:28:50 +00:00
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
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
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
6065652f24
Merge branch 'wip-MDL-37976-master' of git://github.com/marinaglancy/moodle
2013-02-12 16:13:48 +08:00
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
f49ec42973
Merge branch 'MDL-37750_master-fix' of git://github.com/dmonllao/moodle
2013-02-12 14:47:50 +08:00
333cb91fbf
MDL-37750 behat: Removing (now) collapsed elements
2013-02-12 14:06:51 +08:00
6904688967
Merge branch 'MDL-37654_master' of https://github.com/markn86/moodle
2013-02-12 13:09:18 +08:00
501bdad2b9
Merge branch 'wip-MDL-34798_master-2' of git://github.com/gjb2048/moodle
2013-02-12 10:34:07 +08:00
2333bfa7e8
MDL-37976 fixed missing global
2013-02-12 12:59:35 +11:00
cbddba1887
MDL_34798 format_topics and format_weeks: Adjust section names when moving up.
2013-02-11 13:43:42 +00:00
bf4fa29980
MDL-37750 behat: Adding tests for the rest of the steps definitions
2013-02-08 17:11:27 +08:00
1f9ffbdbde
MDL-37750 behat: Using base find* methods
2013-02-08 17:11:27 +08:00
785e09a7e3
MDL-32456 mod_label - support course drag and drop upload images to create labels
2013-02-08 08:13:24 +00:00
9d093b71af
MDL-37572 small bug fix with misplaced assignment
2013-02-07 15:22:29 +13:00
e6a3f4ae27
MDL-37572 course: fixed bug when moving categories
2013-02-07 12:29:03 +13:00
79949c1ba3
MDL-30098 core_course: adding webservice functions to allow the deletion of module instances
2013-02-06 16:56:17 +08:00
ef5a82104c
MDL-37572 - fix typo in has_any_capability()
2013-02-06 14:47:29 +08:00
9a9cb74118
MDL-37654 core_course: ensure exceptions return static error codes for debugging purposes
2013-02-06 12:10:10 +08:00
e2adaaf788
MDL-30062 - Fix whitespace
2013-02-05 16:07:08 +08:00
Aparup Banerjee