mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-17 14:10:08 +01:00
Code Issues Projects Releases Wiki Activity
81,443 Commits 36 Branches 527 Tags
Commit Graph

12704 Commits

Author SHA1 Message Date
Andrew Nicols
11bafc2b21 Merge branch 'MDL-56641-master' of git://github.com/damyon/moodle 2016-11-03 15:07:01 +08:00
Andrew Nicols
bc378b50ec Merge branch 'wip-MDL-44467-master' of git://github.com/abgreeve/moodle 2016-11-03 14:08:21 +08:00
Damyon Wiese
2a7c540c48 MDL-56641 admin: Managers can access search page 2016-11-03 09:36:33 +08:00
Dan Poltawski
f2263f7c06 Merge branch 'MDL-56542-master-enfix' of git://github.com/mudrd8mz/moodle 2016-10-31 15:15:09 +00:00
Simey Lameze
343ba16c31 MDL-56501 message: introduce new manageallmessaging capability 2016-10-31 14:09:03 +08:00
Adrian Greeve
25ea0caaa2 MDL-44467 lib: Move lang string to admin file. 
AMOS BEGIN
 MOV [allowattachments,message_email],[allowattachments,admin]
 MOV [allowusermailcharset,message_email],[allowusermailcharset,admin]
 MOV [configallowattachments,message_email],[configallowattachments,admin]
 MOV [configallowusermailcharset,message_email],[configallowusermailcharset,admin]
 MOV [configmailnewline,message_email],[configmailnewline,admin]
 MOV [confignoreplyaddress,message_email],[confignoreplyaddress,admin]
 MOV [configsitemailcharset,message_email],[configsitemailcharset,admin]
 MOV [configsmtpauthtype,message_email],[configsmtpauthtype,admin]
 MOV [configsmtphosts,message_email],[configsmtphosts,admin]
 MOV [configsmtpmaxbulk,message_email],[configsmtpmaxbulk,admin]
 MOV [configsmtpsecure,message_email],[configsmtpsecure,admin]
 MOV [configsmtpuser,message_email],[configsmtpuser,admin]
 MOV [doesnotfit,message_email],[doesnotfit,admin]
 MOV [doesnotfitdetail,message_email],[doesnotfitdetail,admin]
 MOV [mailnewline,message_email],[mailnewline,admin]
 MOV [none,message_email],[none,admin]
 MOV [noreplyaddress,message_email],[noreplyaddress,admin]
 MOV [noreplydomain,message_email],[noreplydomain,admin]
 MOV [noreplydomaindetail,message_email],[noreplydomaindetail,admin]
 MOV [sitemailcharset,message_email],[sitemailcharset,admin]
 MOV [smtp,message_email],[smtp,admin]
 MOV [smtpauthtype,message_email],[smtpauthtype,admin]
 MOV [smtpdetail,message_email],[smtpdetail,admin]
 MOV [smtphosts,message_email],[smtphosts,admin]
 MOV [smtpmaxbulk,message_email],[smtpmaxbulk,admin]
 MOV [smtppass,message_email],[smtppass,admin]
 MOV [smtpsecure,message_email],[smtpsecure,admin]
 MOV [smtpuser,message_email],[smtpuser,admin]
AMOS END
 2016-10-28 13:27:00 +08:00
Adrian Greeve
9715f61a26 MDL-44467 lib: Fix return path to noreply. 
Added code to show emails from users on controlled domains.
Moved admin settings from message_email to admin.
 2016-10-28 13:27:00 +08:00
Simey Lameze
253ae23058 MDL-44467 core: always send email from noreplyaddress 2016-10-28 13:04:09 +08:00
Simey Lameze
0ab8b33754 MDL-29110 enrol_self: improve send course welcome message setting 
This commit change send course welcome message to a drop-down that now supports sending emails from:
- Course contact
- Enrolment key holder
- No reply address
Also moves part of the logic of handling send welcome email from to a new method get_welcome_email_contact() and unit test for this new method.
 2016-10-26 09:38:09 +08:00
Dan Poltawski
a360594259 Merge branch 'MDL-56136' of git://github.com/timhunt/moodle 2016-10-25 20:44:42 +01:00
Helen Foster
c9636ddd51 MDL-56542 lang: Merge English strings from the en_fix language pack 2016-10-25 20:12:52 +02:00
Dan Poltawski
ad07960d89 Merge branch 'wip-MDL-56395-master' of https://github.com/Beedell/moodle 2016-10-25 09:30:46 +01:00
Dan Poltawski
3b89ce210d Merge branch 'MDL-56442-master' of https://github.com/StudiUM/moodle 2016-10-25 06:56:44 +01:00
John Beedell
89eacee7a2 MDL-56395 Gradebook: Make long item titles more accessible 2016-10-24 10:51:59 +01:00
David Monllao
48f43096e0 Merge branch 'MDL-55074-master' of git://github.com/damyon/moodle 2016-10-24 12:33:51 +08:00
Andrew Nicols
ca25005c69 MDL-53048 form: Rewrite passwordunmask 
This version:
* should work with the Behat Goutte driver
* should not suffer from password autofill anxiety
* should allow unmasking (and masking) of a password
* should allow editing of passwords in either masked, or unmasked form

AMOS BEGIN
 MOV [revealpassword,core_form],[passwordunmaskrevealhint,core_form]
AMOS END
 2016-10-24 09:24:39 +08:00
Damyon Wiese
ba5c5083c5 MDL-55074 theme_boost: Behat fixes for latest theme changes 
Fix I edit profile steps
Apply fixed header in css
Remove transitions from menus for behat
Be more specific about some "I follow" steps
Navigation path changes
"Current course" node removed from nav tree
Adapt tests because there are no default blocks
Force some space between action menu items
 2016-10-21 16:06:54 +08:00
Damyon Wiese
99061152af MDL-55074 theme_boost: Navigation and blocks 
This patch includes a big set of changes that are all designed to work together to provide
a better way to navigate in the new theme, and a different way of working with blocks.

Blocks have been moved to a "drawer" that can be opened and closed (this is remembered in a user pref).

A new "flat navigation" element is also available in a drawer - which should let you do 90% of things
without needing to open the "blocks" drawer.

The flat navigation is build from specific parts of the nav tree - the top nodes like "calendar, dashboard" are
hand picked. There is a mycourses node listing your enrolled courses.

There is a node for the current course, built from the top nodes in the current course node in the nav tree.

Administrators have a link to the Site admin settings here too.

These nav elements are used by the templates for the new theme, which also has a resigned layout for login and signup.

There have also been some additional fixes / improvements to the scss for the new theme which goes along with these
layout changes.

This set of changes is a collaboration between Martin, Damyon and Alberto (thanks!).
 2016-10-21 12:37:33 +08:00
David Ligne
f2510387e5 MDL-56442 administration: Display hours in maintenance mode messages 2016-10-20 13:17:07 -04:00
Eloy Lafuente (stronk7)
8c88830a43 Merge branch 'MDL-43230-master' of git://github.com/ryanwyllie/moodle 2016-10-18 22:35:53 +02:00
Juan Leyva
80e0f0b85b MDL-56159 webservice: Improve not fully setup and missing pwd checks 
Removing the check in login/token.php is secure since the
auth_forcepasswordchange is checked in require_login that is called via
validate_context.
The user must be able to get a token even if that setting is on. With
that token we’ll redirect the user to the site or we’ll change the
password when a new WS for that is available.
 2016-10-18 09:44:09 +01:00
Matt Davidson
b7374faca6 MDL-43230 badges: manually revoke awarded badges 
A user can be manually awarded a badge, but if given by mistake an
awarded badge cannot be removed.
 2016-10-12 05:06:38 +00:00
Dan Poltawski
c8303131be Merge branch 'MDL-54682_master' of git://github.com/markn86/moodle 2016-10-11 12:53:11 +01:00
Ryan Wyllie
6b5d0e976a MDL-56087 message: change conversations to messages 2016-10-11 14:39:24 +08:00
David Monllao
886207f70e Merge branch 'MDL-55923-master' of git://github.com/jleyva/moodle 2016-10-10 22:57:34 +08:00
David Monllao
e8cd446ecd Merge branch 'MDL-45388-master' of git://github.com/danpoltawski/moodle 2016-10-10 16:59:06 +08:00
Ryan Wyllie
a038fcf5d6 MDL-55635 message: create notifications page 2016-10-07 16:37:56 +08:00
Mark Nelson
48e8bdba13 MDL-55942 core_message: renamed the term 'people' to 'user' 2016-10-07 16:37:56 +08:00
Ryan Wyllie
7b477f5982 MDL-55813 message: add online/offline help icons on preferences page 2016-10-07 16:26:40 +08:00
Ryan Wyllie
fadb831658 MDL-56028 message: change forced to locked on preferences page 2016-10-07 16:26:40 +08:00
Ryan Wyllie
9d8f6f4af0 MDL-55972 message: confirmation modal when deleting conversation 2016-10-07 16:26:40 +08:00
Ryan Wyllie
eeee7bca80 MDL-55822 message: accessibility improvements for popovers 2016-10-07 16:26:40 +08:00
Ryan Wyllie
99c7f0a731 MDL-55801 message: responsive styling for message app 2016-10-07 16:26:40 +08:00
Ryan Wyllie
0b19d04836 MDL-55812 message: simplify notification popover items 2016-10-07 16:26:40 +08:00
Mark Nelson
89a70ba1a5 MDL-55623 core_message: indicate who the message is from 2016-10-07 16:26:40 +08:00
Mark Nelson
658d0b2fd7 MDL-55770 core_message: remove the send message pop-up 
Revert "MDL-48933 core_message: New dialog to send a message to a user"
Revert "MDL-48933 core_message: Behat tests to cover messenger dialogs"
 2016-10-07 16:26:40 +08:00
Mark Nelson
dd0c1403a1 MDL-55637 core_message: display icon for blocked users 2016-10-07 16:26:40 +08:00
Ryan Wyllie
b6723f5b22 MDL-55595 message: fix message preferences for multiple processors 2016-10-07 16:26:40 +08:00
Mark Nelson
4d1b76ee36 MDL-55638 core_message: add message when there are no contacts 2016-10-07 16:26:40 +08:00
Mark Nelson
812cc6f63f MDL-54698 core_message: moved 'disable/enable' notifications setting 2016-10-07 16:26:40 +08:00
Ryan Wyllie
8c125526f1 MDL-54698 message: move notifications prefs into own page 2016-10-07 16:26:40 +08:00
Mark Nelson
cd03b8d7f2 MDL-54687 core_message: added search functionality 2016-10-07 16:26:40 +08:00
Ryan Wyllie
4d0fa50125 MDL-54687 message: messaging widget styling 2016-10-07 16:26:40 +08:00
Ryan Wyllie
efa079072c MDL-54698 message: change preferences to on/off text 2016-10-07 16:26:40 +08:00
Ryan Wyllie
34eb5fcb60 MDL-54698 message: move general settings from preference page 2016-10-07 16:26:40 +08:00
Ryan Wyllie
643b015db2 MDL-54698 message: make processor settings dialogue 2016-10-07 16:26:40 +08:00
Ryan Wyllie
406243381c MDL-54701 message: add message notification popover 2016-10-07 16:26:40 +08:00
Ryan Wyllie
a0eabdd3c8 MDL-54698 message: make preferences page ajax save 2016-10-07 16:26:40 +08:00
Ryan Wyllie
a0e358a64a MDL-54708 message: add notification popover to nav bar 2016-10-07 16:26:40 +08:00
Ryan Wyllie
12d8c7b222 MDL-54700 message: added toggle contact button to user profile 2016-10-07 16:20:51 +08:00