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

81104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
3ea1fa18cc Merge branch 'mdl56466-master' of https://github.com/tlock/moodle 2016-10-24 15:23:51 +08:00
David Monllao
1b14f1a497 Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle 2016-10-24 14:06:17 +08:00
Andrew Nicols
5fe4bd6422 MDL-55981 core: Correct availability tests to use editingteacher 2016-10-24 13:59:33 +08:00
Andrew Nicols
33492029de Merge branch 'MDL-56321-master' of git://github.com/damyon/moodle 2016-10-24 13:29:31 +08:00
David Monllao
c10cd185a9 Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle 2016-10-24 13:20:42 +08:00
David Monllao
0c6cf86925 MDL-55074 theme_boost: Deleting old file 2016-10-24 13:11:38 +08:00
David Monllao
947970fc49 MDL-55074 boost: Fixing issues reported by stylelint 2016-10-24 12:40:40 +08:00
David Monllao
48f43096e0 Merge branch 'MDL-55074-master' of git://github.com/damyon/moodle 2016-10-24 12:33:51 +08:00
Damyon Wiese
df25a884e8 MDL-56321 theme_boost: Remove extra styling from context_header 2016-10-24 12:11:13 +08:00
Frédéric Massart
e9a009dcd6 MDL-56321 theme_boost: Profile page adjustments 
- Removed the border overlapping a user's avatar. This only affected
  course profiles and the default preset.
- Do not break the sections when they wrap from one column to another
- Sneaked in a change to remove left/right padding on .box. I've been
  wanting to change that since I added it. The padding on top and bottom
  is sometimes useful to separate boxes, but the left/right padding
  should be applied by the general structure.
 2016-10-24 12:11:12 +08:00
Andrew Nicols
49b78f21b4 Merge branch 'MDL-56533-master' of git://github.com/crazyserver/moodle 2016-10-24 12:07:40 +08:00
Damyon Wiese
4b937932a2 MDL-55074 theme_behat: Behat fixes for user_grade_navigation 2016-10-24 12:00:23 +08:00
David Monllao
aaa2788e42 Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle 2016-10-24 11:56:06 +08:00
Andrew Nicols
c823bfee62 MDL-56129 core: Set a timeout on the session cookie 
This is primarily because iOS has changed something under the hood which
means that only session cookies which have an expiry are passed around the
OS.

In order to make media playable outside of the browser (e.g. a video), we
must set a session cookie timeout.

Since the session timeout is configurable, this patch sets the cookie
timeout to the session timeout plus a period of one week.

This ensures that videos continue to work, and that the expired session
message is shown on the login page, but without requiring excessively long
session times.
 2016-10-24 11:47:06 +08:00
David Monllao
80b74762c9 DML-53048 forms: Remove conflict resultion remaining bit 
Change wrong alternative references as well.
 2016-10-24 11:16:53 +08:00
David Monllao
8f68e0343a Merge branch 'MDL-53048-master' of git://github.com/andrewnicols/moodle 2016-10-24 11:12:25 +08:00
Damyon Wiese
3f1fa45771 MDL-55074 theme_boost: Phantomjs robustness 
Raj was seeing some fails with phantomjs because the action menus were not open after clicking
on the link to open them. Make sure we look for the open menu before continuing.
 2016-10-24 10:38:43 +08:00
David Monllao
055cc7d037 Merge branch 'MDL-56252-master' of git://github.com/ryanwyllie/moodle 2016-10-24 10:25:32 +08:00
Andrew Nicols
ab00bf59a5 Merge branch 'MDL-56341-master' of git://github.com/damyon/moodle 2016-10-24 10:11:20 +08:00
David Monllao
40e342718b Merge branch 'MDL-56380_master' of git://github.com/markn86/moodle 2016-10-24 10:04:45 +08:00
Damyon Wiese
8387614051 MDL-55074 theme_boost: Undefined variable in perf footer 2016-10-24 10:03:04 +08:00
Andrew Nicols
c071a83c94 Merge branch 'MDL-56355-master' of git://github.com/ryanwyllie/moodle 2016-10-24 09:47:43 +08:00
David Monllao
8cf4139074 Merge branch 'MDL-56090_master' of git://github.com/markn86/moodle 2016-10-24 09:35:28 +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
Andrew Nicols
ac157b0bbe MDL-53048 forms: Deprecate prevent_form_autofill_password 2016-10-24 08:19:44 +08:00
Eloy Lafuente (stronk7)
bf6cfca285 Merge branch 'MDL-56529-master' of git://github.com/junpataleta/moodle 2016-10-21 13:03:56 +02:00
Pau Ferrer Ocaña
28ff87bec1 MDL-56533 course: Add outcome scale information on get_course_module WS 2016-10-21 10:37:44 +02:00
Mark Nelson
1f64514def MDL-56090 core_message: added API unit tests 2016-10-21 16:22:03 +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
Frédéric Massart
c9c1e4baf6 MDL-56272 theme_boost: Differentiate between freeze and hardFreeze 2016-10-21 12:41:33 +08:00
Damyon Wiese
245d354c6c MDL-55074 theme_boost: Unit test fixes for all these changes 2016-10-21 12:40:06 +08:00
Damyon Wiese
6e79ea5846 MDL-55074 theme_boost: Styling for grade reports 2016-10-21 12:40:06 +08:00
Damyon Wiese
c6d9d29da1 MDL-55074 theme_boost: Improve the display of the menus in the footer 2016-10-21 12:40:06 +08:00
Damyon Wiese
d430a7c336 MDL-55074 navigation: Menu and nav changes 
"Grades" belongs in the navigation block, not the settings block.
Course / Activity menus should not include a link to the full settings page list, if it is the same as the menu.
Competencies belongs in the navigation block not the settings block.
 2016-10-21 12:40:05 +08:00
Damyon Wiese
70fda55e85 MDL-55074 theme_boost: Make dropdowns consistent 
Links in drop down menu items should fill the entire row and be
displayed as normal text color (they are like buttons).
 2016-10-21 12:40:05 +08:00
Damyon Wiese
b45fdc6838 MDL-55074 theme_boost: Move the custom menu into the footer 
On mobile screen sizes only.
 2016-10-21 12:40:05 +08:00
Damyon Wiese
7f20e8e7cb MDL-55074 theme_boost: Custom renderer fails on book 
Handle nav tree nodes with action_links in them.
 2016-10-21 12:40:05 +08:00
Damyon Wiese
fe009bdeaa MDL-55074 theme_boost: Workaround for popovers 
The custom-interaction events have a bug where if they are used twice, they fire 2 events.

The bug still exists - this is a workaround.
 2016-10-21 12:40:05 +08:00
Damyon Wiese
c13115cbfa MDL-55074 blocks: Remove default blocks from course and site 2016-10-21 12:40:05 +08:00
Damyon Wiese
6afd1c60c0 MDL-55074 theme_boost: Fix weird text wrapping in block titles 2016-10-21 12:40:05 +08:00
Damyon Wiese
e85d09635d MDL-55074 theme_boost: Rename default only block region 2016-10-21 12:40:05 +08:00
Damyon Wiese
a42a065a20 MDL-55074 theme_boost: Do not show flatnav by default before login 2016-10-21 12:37:33 +08:00
Damyon Wiese
c9d6a04743 MDL-55074 nav: Put the course nav above the site nav 2016-10-21 12:37:33 +08:00
Damyon Wiese
cbdbe7d812 MDL-55074 theme_boost: Current flat nav node should be subtle 2016-10-21 12:37:33 +08:00
Damyon Wiese
0a58ec243d MDL-55074 theme_boost: Move blocks back into the page 2016-10-21 12:37:33 +08:00
Damyon Wiese
5004baaad4 MDL-55074 theme_boost: Only show activity edit menu on first page 2016-10-21 12:37:33 +08:00
Damyon Wiese
e226461dab MDL-55074 navigation: Add editing links back to nav 
In theme boost - don't support edit_buttons in the page.
 2016-10-21 12:37:33 +08:00
Damyon Wiese
598b3f095f MDL-55074 theme_boost: Make sections different in flat nav 2016-10-21 12:37:33 +08:00
Damyon Wiese
8a2ab5f72d MDL-55074 navigation: Always show dashboard/home in flat nav 2016-10-21 12:37:33 +08:00
Damyon Wiese
0f73f3ab42 MDL-55074 blocks: navigation and settings blocks optional 
This is a theme config setting.
They are forced on for behat always.
 2016-10-21 12:37:33 +08:00