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

81115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Damyon Wiese
4a3d8169f3 MDL-55074 theme_boost: Prevent page scrolling when scrolling in a drawer 2016-10-21 12:37:33 +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
Jun Pataleta
0766dd669b MDL-56529 enrol_lti: Fix for tool_provider_test 
* Use -1 for simulating a non-existent tool for
  tool_provider_testcase::test_constructor_with_non_existent_tool()
 2016-10-21 12:34:00 +08:00
Andrew Nicols
4ceed4dfa6 MDL-55981 core: Remove site:accessallgroups from teacher 2016-10-21 08:55:58 +08:00
Eloy Lafuente (stronk7)
919b9dfabd weekly release 3.2dev 2016-10-20 17:52:33 +02:00
Eloy Lafuente (stronk7)
42b5234209 NOBUG: Fixed file access permissions 2016-10-20 17:52:32 +02:00
Eloy Lafuente (stronk7)
f8e7143fca Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-10-20 17:52:29 +02:00
Mark Nelson
fcc13c6527 MDL-56380 core_message: prevent default behaviour for links 2016-10-20 16:36:59 +08:00
Dan Poltawski
9876856dca Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle 2016-10-20 08:02:08 +01:00
Andrew Nicols
31c3b7a2e1 MDL-52777 tool_usertours: Stop testing pending upgrades 2016-10-20 14:51:57 +08:00
Andrew Nicols
aea13e1c26 MDL-52777 tool_usertours: Fix matching tour test 2016-10-20 14:51:57 +08:00
Ryan Wyllie
54d83992b4 MDL-56252 message: clean message text in message area 
Remove the HTML tags from any message in the message area when updating
the last message on the contact otherwise the styling breaks and also
allows <script> tags to be added to the page.
 2016-10-20 06:49:26 +00:00
David Monllao
c6509ee31d Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle 2016-10-20 14:09:57 +08:00
Andrew Nicols
55dba8058f MDL-52777 tool_usertours: Only return tours with steps 2016-10-20 13:44:18 +08:00
Frédéric Massart
a89cf23744 MDL-56341 mustache: JS engines handles strings wrapped in quote 
Prior to the patch the strings wrapped as the following one
where not found and replaced when rendering the template via Javascript

{{#quote}}{{#str}}string,component{{/str}}{{/quote}}
 2016-10-20 12:13:42 +08:00
David Monllao
1b07e80edf Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle 2016-10-20 11:50:32 +08:00
David Monllao
664b637101 Merge branch 'wip-mdl-55926' of https://github.com/rajeshtaneja/moodle 2016-10-20 11:48:53 +08:00
Rajesh Taneja
48cf062595
MDL-55926 behat: Fixed undefined steps 2016-10-20 11:26:27 +08:00
Andrew Nicols
c4d5fb53ce MDL-52777 tool_usertours: Only check plugin for needs update 
The moodle_needs_upgrade() function includes every version.php in Moodle
which poses a performance issue, especially when called on every page.
 2016-10-20 11:16:54 +08:00
David Monllao
04ec8f6ef8 Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle 2016-10-20 10:09:28 +08:00
Andrew Nicols
a8dded9bfc MDL-52777 tool_usertours: Correct & to && in test 2016-10-20 09:54:26 +08:00
Eloy Lafuente (stronk7)
ed971b90eb Merge branch 'MDL-53832-master-review-fixes' of https://github.com/junpataleta/moodle 2016-10-20 02:25:59 +02:00
Dan Poltawski
2d13900f6d Merge branch 'MDL-55823_master' of git://github.com/markn86/moodle 2016-10-19 10:47:35 +01:00
Mark Nelson
6aa019682c MDL-55823 core_message: added WS unit tests 2016-10-19 17:07:58 +08:00
Jun Pataleta
b75d0f0de2 MDL-53832 enrol_lti: Update codes to use the new DB field names 2016-10-19 17:01:34 +08:00
Jun Pataleta
fa015abf7b MDL-53832 enrol_lti: Update data_connector to use the new DB field names 2016-10-19 17:01:30 +08:00
Jun Pataleta
d1e85a0045 MDL-53832 enrol_lti: Make DB column names more moodle-ish 2016-10-19 17:01:22 +08:00
Andrew Nicols
68855baecd MDL-52777 tool_usertours: Prepare target data when displaying form 2016-10-19 15:40:53 +08:00
David Monllao
c24a410f43 Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle 2016-10-19 15:02:44 +08:00
Andrew Nicols
42bb3f8b66 MDL-52777 tool_usertours: Less strict comparison for tour ID 2016-10-19 14:57:13 +08:00
Ryan Wyllie
4788031edf MDL-56337 message: fix behat for phantomjs 2016-10-19 06:35:12 +00:00
Andrew Nicols
a42a5e21eb MDL-52777 tool_usertours: Remove unused template 2016-10-19 13:26:54 +08:00
Jun Pataleta
6092bbc07a MDL-53832 enrol_lti: Map consumer to tool and handle instance deletion 2016-10-19 11:14:28 +08:00
Jun Pataleta
c314d6ed8e MDL-53832 enrol_lti: Unit tests for tool_provider 
Original subtask: MDL-55647.
 2016-10-19 11:14:27 +08:00
Jun Pataleta
daebcd2801 MDL-53832 enrol_lti: Improve provider logic 
* onRegister
  - Validate returnUrl and consumer object.
  - Use moodle_url for the returnURL.
  - Set success message on successful registration.
  - Reorganise code.
* Constructor
  - Remove required params we don't need (Original sub-task: MDL-56035)
* onLaunch
  - Validate consumer object.
  - Set appropriate values for OK flag and message.
* Import classes.
 2016-10-19 11:14:27 +08:00
John Okely
0b72caebac MDL-53832 enrol_lti: Allow multiple LTI1 consumers with the same key 2016-10-19 11:14:27 +08:00
John Okely
a618c707f2 MDL-53832 enrol_lti: Support user images 
Original subtask MDL-55718.
 2016-10-19 11:14:27 +08:00
John Okely
8e0038f9ea MDL-53832 enrol_lti: Only allow certain consumers for each shared tool 
Original subtask: MDL-55753.
 2016-10-19 11:14:27 +08:00
John Okely
f8307a4b57 MDL-53832 enrol_lti: Unit test more of helper 2016-10-19 11:14:26 +08:00
John Okely
098ee549ee MDL-53832 enrol_lti: Split launch and proxy registration end points 
Original subtask: MDL-55752.
 2016-10-19 11:14:26 +08:00