Commit Graph

530 Commits

Author SHA1 Message Date
David Monllao
3dd89357d4 Merge branch 'MDL-53772-master' of git://github.com/damyon/moodle
Conflicts:
	lib/upgrade.txt
2016-04-14 14:01:16 +08:00
Marina Glancy
787ec240c1 MDL-53772 inplace_editable: set context in callbacks 2016-04-14 13:58:29 +08:00
Marina Glancy
9ca0420e93 MDL-45064 course: mod callback get_shortcuts()
also deprecate callback get_types()
2016-04-13 08:30:04 +08:00
Dan Poltawski
0b14d8612b Merge branch 'MDL-51214-master' of git://github.com/andrewnicols/moodle 2016-02-17 07:58:15 +00:00
Eloy Lafuente (stronk7)
642a4fde4b Merge branch 'wip-MDL-51802-master4' of https://github.com/marinaglancy/moodle 2016-02-16 23:22:35 +01:00
Andrew Nicols
265a9bf769 MDL-51214 mod_forum: Update News forum => Announcements 2016-02-16 10:05:24 +08:00
Marina Glancy
f26481c2dc MDL-51802 course: allow to edit section names on the course page 2016-02-13 11:07:46 +08:00
Tim Hunt
028044707f MDL-49146 single-activity course format: key activity must be visible
With a single-activity course, visibility to students is controlled by
course visibility. There is no sense in having the key activity not
visible to students, and, if you did, the symptoms were almost
incomprehensible. It was very hard to work out what you had done wrong.
2016-02-06 14:55:46 +00:00
Paul Nicholls
6d1ee59af2 MDL-52773 course: Fix section return from single section page
When editing a section from a single section page, you should be returned
to the section you were viewing/editing, not always to section 1.
2016-01-15 11:49:51 +13:00
David Monllao
19a1973a9a MDL-52347 format_social: Replicate wait between new discussions 2015-12-30 14:47:45 +08:00
Marina Glancy
a4269b45bc MDL-52347 behat: fix random failures on fast computer 2015-12-24 14:14:58 +08:00
Eloy Lafuente (stronk7)
2e144835bb MDL-52059 versions: bump all versions and requires near release
version = planned 2015111600 release version
requires= current 2015111000 rc3 version
2015-11-10 12:33:52 +01:00
Cameron Ball
c47b6f97d7 MDL-51993 course: Set valid default for section_edit_control_menu
Thank you to Gareth Barnard for originally providing this patch.
2015-11-03 10:29:38 +08:00
Eric Merrill
d76acdbc17 MDL-51610 course: Change section menu to "Edit" and order buttons 2015-10-12 11:53:33 -04:00
Jun Pataleta
f1bfc8971f MDL-51250 course: Display the default section name
This patch makes the default section name appear in brackets
beside the 'Use default section name' checkbox.
2015-10-05 14:03:07 -05:00
David Monllao
5b9718928a MDL-48947 course: Adding the new extra span after dropping a section 2015-10-02 11:12:24 +08:00
Dan Poltawski
331315a4c1 Merge branch 'MDL-48947_v3_patch' of https://github.com/Syxton/moodle 2015-10-01 16:12:09 +01:00
Syxton
c73fd11e86 MDL-48947 patch - fix unclickable menu issues
remove z-index fix and instead keep the header from gaining the opacity
change on hide
2015-10-01 10:54:23 -04:00
Dan Poltawski
ebadc15c1f Merge branch 'MDL-48947_v3' of https://github.com/Syxton/moodle 2015-09-28 15:06:21 +01:00
Syxton
60cf074239 MDL-48947 course: Section button cleanup
Creates a new method of handling all the section related icons.
Including a new method that places these actions in a menu for topic and
weeks course formats. (This version replaces "Edit" with "Topic/Week/or
Section menu")
2015-09-17 10:40:31 -04:00
Cameron Ball
fdb5d62660 MDL-49973 behat: Update delete button names 2015-09-14 17:46:35 +08:00
Marina Glancy
3bacf558d1 MDL-50391 format_singleactivity: fix activity_has_subtypes() 2015-08-13 14:13:02 +01:00
Eloy Lafuente (stronk7)
26ea380d24 MDL-50102 versions: bump all versions and requires near release
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
2015-05-05 17:43:19 +02:00
Andrew Nicols
b3b6588262 Merge branch 'MDL-34921_master_unwanted-sitehome-redirects' of https://github.com/colin-umn/moodle 2015-04-23 11:49:16 +08:00
Rajesh Taneja
0fe86bbdbb MDL-49799 behat: replaced asd.com with example.com
asd.com is a valid domain, we should use reserved domain names for testing
2015-04-20 11:21:20 +08:00
Colin Campbell
6825560889 MDL-34921 course/format: Fix unwanted redirects from Site home 2015-04-04 21:31:35 -05:00
Mark Nelson
5962f0df5d MDL-49182 core_course: minor changes to deleting section strings 2015-02-12 17:16:56 -08:00
Marina Glancy
330e51fa14 MDL-10405 course: CSS classname correction 2015-02-10 13:05:51 +08:00
Marina Glancy
bb01883867 MDL-10405 course: auto delete sections when numsections changed 2015-02-09 16:46:19 +08:00
Marina Glancy
ca9cae84ad MDL-10405 course: deleting sections 2015-02-09 16:46:07 +08:00
Andrew Nicols
85099b388f MDL-46755 format_social: Minor corrections during integration
* Add additional checks in behat tests to ensure ordering of information
  does not give false positives
* Typo in lang pack
* Comment correction
2015-01-27 12:14:24 +08:00
Stephen Bourget
7ce40bcb97 MDL-46755 format_social: behat test 2015-01-21 11:08:43 -05:00
Stephen Bourget
0d67ac8ea2 MDL-46755 format_social: Make discussion count configurable 2015-01-21 11:08:01 -05:00
Dan Poltawski
13e0300961 Merge branch '26226-48304-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:06:04 +00:00
Sam Hemelryk
53623a70f0 MDL-26226 course: new setting for sections as links
This commit adds a new setting to always display course sections
as links (if possible).
2014-11-20 15:41:24 +13:00
Sam Hemelryk
701772c0e8 MDL-47434 format_topics: section 0 navigation tweak
Section 0 is now only shown in the navigation block if it contains
activities.
If there are no activities then the section is removed.
This mimicks the display on the course page.
2014-11-14 11:40:17 +13:00
Sam Hemelryk
f9745259b7 MDL-47434 format_weeks: section 0 navigation tweak
Section 0 is now only shown in the navigation block if it contains
activities.
If there are no activities then the section is removed.
This mimicks the display on the course page.
2014-11-14 11:40:17 +13:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
2014-11-04 17:52:35 +01:00
Sam Hemelryk
45ad1693cd MDL-47183 post-integration fixes
* Fixed typo with context_module::instance
* Fixed use of $mod->get_context()
2014-10-28 15:59:59 +13:00
Andrew Nicols
f67b5c995e MDL-47183: viewhiddenactivities should use the module context
Thanks to Paulo Matos for the forum part of this change.
2014-10-06 12:21:49 +08:00
Marina Glancy
daad1b4b97 MDL-46937 modinfo: Allow course format to overwrite section availability 2014-09-18 16:18:22 +08:00
Syxton
60df67878b MDL-46428 course: Remove confirm when duplicating
A confirm dialog is given when Javascript is off but not when it is on.
This aligns the two so that they neither have a confirm when duplicating
an activity.
2014-09-04 15:19:17 -04:00
Andrew Nicols
b791ee3d89 MDL-34737 Course: Modchooser should use coursebase to determine the section class 2014-05-22 12:30:32 +08:00
Tim Hunt
5bcfd504df MDL-45618 Fix @since PHPdoc tags. 2014-05-19 17:03:04 +01:00
Marina Glancy
f094167bef MDL-45486 Bump all versions to planned release 2014-05-09 10:50:39 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Sam Hemelryk
a5f4213939 MDL-45248 course: fixed assumptions when logging a course view 2014-04-28 08:12:35 +12:00
Sam Hemelryk
0a293483e8 MDL-39833 format: tidied up API improvement to allow for future backport 2014-04-09 10:09:44 +12:00
Sam Hemelryk
da98185a58 Merge branch 'MDL-39833' of https://github.com/shashirepo/moodle 2014-04-09 10:09:02 +12:00
sam marshall
00c832d7a1 MDL-44070 Conditional availability enhancements (8): display
Includes theme and renderer changes required for the new feature.
There are two parts: style required for the display as part of the
course page (when showing the list of conditions for an activity),
and style required for the settings form.

This change supports both the bootstrapbase theme (which was the
main theme used during development) and the old base theme.
2014-04-07 20:11:56 +01:00