Damyon Wiese
24d7efcec3
Merge branch 'MDL-45029-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE
...
Conflicts:
course/modlib.php
2014-08-20 13:59:45 +08:00
Simey Lameze
66dbc14778
MDL-45029 core_course: set aggregationcoef while creating a new course module
2014-08-20 12:07:40 +08:00
Mark Nelson
ec5fda6d6f
MDL-46188 core_course: use correct hide/show icon
2014-08-20 12:05:25 +08:00
Damyon Wiese
cb86d02348
Merge branch 'MDL-45029-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE
2014-08-20 10:22:08 +08:00
Simey Lameze
fe845dd3c2
MDL-45029 core_course: set aggregationcoef while creating a new course module
2014-08-19 17:08:18 +08:00
Marina Glancy
f09f95fefa
Merge branch 'MDL-43197-26-2nd' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-08-19 13:26:19 +08:00
Frederic Massart
0eef41f639
MDL-43197 gradereport_user: Parents/mentors can see all the relevant grades
2014-08-19 10:49:09 +08:00
shashirepo
b8d5bd3da0
MDL-46188 course:show/hide button disappears after action
2014-08-14 20:36:03 +05:30
Sam Hemelryk
3a8a3bc3f9
MDL-42909 course: fixed whitespace
2014-07-21 11:43:08 +12:00
Sam Hemelryk
e8b0dadd6b
Merge branch 'MDL-42909-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE
2014-07-21 11:35:50 +12:00
Willy Lee
d8d64eef11
MDL-46159 course: Add search box to course management pages
2014-07-21 10:56:27 +12:00
Jason Fowler
8ed407023d
MDL-42909 Course: Fix title for move-targets
2014-07-18 14:43:11 +08:00
Sam Hemelryk
dc9363a651
MDL-45209 course: fixed navbar when creating,editing courses
2014-06-27 09:39:43 +12:00
Eloy Lafuente (stronk7)
1510a9d6a1
MDL-39883 events: fix tests to avoid warning
...
Only needed in 26 and older, we are handling those
changes automatically in 27 and up.
2014-06-24 02:06:08 +02:00
Eloy Lafuente (stronk7)
32b48768d4
Merge branch 'MDL-39883-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE
2014-06-24 00:50:05 +02:00
Ankit Agarwal
90db0fb726
MDL-39883 events: Trigger a module created event when duplicating a module
2014-06-18 16:02:43 +08:00
Ankit Agarwal
fd554631f8
MDL-39883 events: Create a new api create_from_cm for module create event
2014-06-18 16:02:42 +08:00
Eloy Lafuente (stronk7)
9a5044fa5c
Merge branch 'MDL-44620_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-06-03 18:11:56 +02:00
David Monllao
94ba162660
MDL-44620 behat: Automates MDLQA-6
...
- MDLQA-6: By default, a new course contains a news
forum in which only teachers can post and subscription
is forced
2014-05-27 13:13:48 +07:00
Marina Glancy
5638eb7c35
MDL-45688 added missing library requirement
2014-05-24 18:30:28 +08:00
Sam Hemelryk
b1cb63b24f
MDL-44711 course: fixed navigation expansion in course tests
2014-05-21 20:58:35 +12:00
Damyon Wiese
f6f25e4040
Merge branch 'MDL-45304-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE
2014-05-08 10:04:03 +08:00
Simey Lameze
b6c8f92f0b
MDL-45304 events: Triggering event course module update actions.
2014-05-07 17:30:13 +08:00
Marina Glancy
9b33dd001f
Merge branch 'MDL-45201-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE
2014-05-07 13:07:18 +08:00
Dan Poltawski
e8d36cbc1a
Merge branch 'MDL-45376-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE
2014-05-06 11:16:40 +08:00
Ankit Agarwal
78995d63a3
MDL-45201 recent_activity: Fix set type notice in recent activity form
2014-05-05 13:31:20 +08:00
sam marshall
62e02e583f
MDL-45376 Completion: Form locking is still not working right
...
On submit of the form, it called 'freeze' on the completion-related
fields (even though they shouldn't have been frozen because you
already clicked the unlock button).
2014-05-01 18:16:14 +01:00
Dan Poltawski
8cc974000b
Merge branch 'MDL-45365-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
2014-05-01 14:52:06 +08:00
Damyon Wiese
cd999ba175
MDL-45365 Courselib unit tests: cmid -> instanceid confusion
...
Yet again an instanceid is being passed instead of a cmid.
2014-05-01 14:03:25 +08:00
Marina Glancy
049c8ed4d1
Merge branch 'MDL-27459-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE
2014-04-30 09:54:27 +08:00
Marina Glancy
cb5260014a
Revert "Merge branch 'MDL-45229-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE"
...
This reverts commit d6eb354664
, reversing
changes made to 93b2d3baca
.
2014-04-29 17:29:01 +08:00
Frederic Massart
0d84ac90bf
MDL-45229 event: Validate sectionnum in course_section_updated
2014-04-28 11:40:54 +08:00
Dan Poltawski
53318d684a
Merge branch '45046-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-04-24 10:00:59 +08:00
Andrew Nicols
6930901d9e
MDL-45124 dndupload: Lowercase types when comparing
...
IE helpfull uses a mixed-case version of 'Text' which fails the string
comparison. All other browsers use lowercase for their mime-types.
2014-04-22 16:10:39 +08:00
sam marshall
9deb25b785
MDL-27459 Completion: When ratings off, disallow grade completion
...
For activities that use ratings, there is no grade unless ratings
are enabled. The completion system still lets you select 'complete
when user gets a grade', which leads to later errors.
This change simply disables the 'completion on grade' field if
ratings are enabled for the activity, but not turned on in the form.
2014-04-16 15:06:00 +01:00
Sam Hemelryk
6c334f7875
MDL-45046 output: reviewed standard/base layouts and converted where a better option was available
2014-04-11 09:30:55 +12:00
Damyon Wiese
b2b6b83028
Merge branch 'wip-MDL-40843-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-04-07 16:27:37 +08:00
Damyon Wiese
55a65aed19
Merge branch 'wip-MDL-43021-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-04-07 15:21:34 +08:00
Marina Glancy
b0bbb673e0
MDL-40843 recent_activity: corrections to grouping and user fields
2014-04-04 17:05:20 +08:00
Marina Glancy
6815afcc89
MDL-43021 course: corrections to the shortname and idnumber uniqueness validation
2014-04-03 11:07:56 +08:00
Dan Poltawski
720b69eca6
MDL-44590 behat: Add test for course category idnumber duplication
2014-03-13 10:06:33 +08:00
Dan Poltawski
6bc5172b88
MDL-44590 category: correct get_string component
2014-03-13 10:06:32 +08:00
Dan Poltawski
e5636247a1
Revert "MDL-43852 Filters Fixed naked-OR conditions."
...
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.
This reverts commit edf55404ff
.
2014-03-06 09:05:27 +08:00
Damyon Wiese
abfc156859
Merge branch 'MDL-44370-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE
2014-03-05 14:00:57 +08:00
Dan Poltawski
730440dcf4
Merge branch 'MDL-44065-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE
2014-03-05 10:52:50 +08:00
Ankit Agarwal
bdff56f737
MDL-44370 calendar: Fix calendar url in reports
2014-03-04 16:13:59 +08:00
Dan Poltawski
5b2f2af6cd
Merge branch 'MDL-44272-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE
2014-03-04 16:00:01 +08:00
Gordon Bateson
edf55404ff
MDL-43852 Filters Fixed naked-OR conditions.
2014-02-28 23:56:35 +01:00
Ankit Agarwal
0483a5ad93
MDL-44272 events: Fix incorrect urls in course module events
2014-02-24 17:05:02 +08:00
Damyon Wiese
28ac492db3
Merge branch 'MDL-43802_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-02-18 14:05:32 +08:00