David Monllao
4de871f4ca
Merge branch 'MDL-57001-master' of git://github.com/damyon/moodle
2016-11-24 15:29:04 +08:00
Damyon Wiese
2fedc0da7c
MDL-57001 roles: Do access check for switchroles
...
Put it in the API so it can't be skipped.
2016-11-24 15:11:19 +08:00
Damyon Wiese
22b8c5b842
MDL-57001 user_menu: Fixes for unit tests
...
We added a link to the user menu so we have to adjust the tests.
2016-11-24 15:11:19 +08:00
Damyon Wiese
70b03eff02
MDL-57001 switchroles: Move to user menu
...
Take this out of the navigation and force it in the user menu.
2016-11-24 15:11:19 +08:00
Andrew Nicols
2ecb3ffa97
Merge branch 'wip-mdl-56898-fix3' of https://github.com/rajeshtaneja/moodle
2016-11-24 11:08:55 +08:00
David Monllao
55f8edfdf2
Merge branch 'MDL-56993-master' of git://github.com/damyon/moodle
2016-11-24 09:50:31 +08:00
Rajesh Taneja
8c35e49b37
MDL-56898 behat: No need to trigger error, as it sometimes hangs behat
2016-11-24 07:31:38 +08:00
Damyon Wiese
9d44510d60
MDL-57100 JS: Exceptions give exceptions
...
Exceptions returned from ajax are not in the format expected by the JS, so
an error occurs and the exception popups are not appearing.
2016-11-23 18:07:26 +00:00
Andrew Nicols
a954685767
Merge branch 'MDL-56988-master' of git://github.com/lameze/moodle
2016-11-23 15:53:49 +08:00
Damyon Wiese
ea5084f7f1
MDL-56993 boost: Fix navigation for singleactivity format
...
The single activity course format has no course front page, so we need
to make a special case for it so it's possible to get to the course
admin menu and put the course nodes in the flat navigation.
2016-11-23 15:31:27 +08:00
Simey Lameze
270b2e443c
MDL-56988 report: review and apply boosty styles to all reports
2016-11-23 15:30:32 +08:00
Andrew Nicols
5bda9fe900
Merge branch 'MDL-55324-master' of git://github.com/cameron1729/moodle
2016-11-23 12:09:46 +08:00
Cameron Ball
28e93cc41b
MDL-55324 atto_media: Implement HTML compliant media plugin
...
This patch completely reworks the atto media plugin to allow
insertion of HTML media elements.
2016-11-23 11:57:33 +08:00
David Monllao
d5c2829b06
MDL-56902 version: Triggering a major upgrade
2016-11-23 11:50:26 +08:00
Damyon Wiese
1ac36fa9f7
MDL-56902 blocks: No theme blocks if fake blocks only
...
When showing only fake blocks, never auto create the blocks for the
theme. This would give you double blocks.
2016-11-23 11:07:32 +08:00
Dan Poltawski
3fd840072f
MDL-56988 report: attempt to improve styling of reports
2016-11-23 08:50:06 +08:00
David Monllao
44c3d0775c
Merge branch 'MDL-56902-master' of git://github.com/damyon/moodle
2016-11-23 08:29:41 +08:00
Dan Poltawski
0484a0d511
Merge branch 'MDL-57075-master' of git://github.com/ryanwyllie/moodle
2016-11-22 21:14:20 +00:00
Dan Poltawski
03f450c10d
Merge branch 'MDL-56987-master' of git://github.com/damyon/moodle
2016-11-22 18:01:38 +00:00
Damyon Wiese
45ed4271b7
MDL-56902 blocks: no nav / settings in boost
...
Upgraded sites switching to boost should not see nav/settings blocks.
2016-11-22 15:02:51 +08:00
Damyon Wiese
51718b752d
MDL-56902 blocks: Prevent blocks returning when switching themes.
...
Now if the current theme requires some blocks that don't exist, they
will be created - but with a new flag that indicates this block should
only be returned if the current theme requires it. This allows flipping back
and forth between boost and clean without restoring the nav and settings blocks
in boost.
2016-11-22 14:53:24 +08:00
Damyon Wiese
95210c6650
MDL-56987 bootstrapbase: Center align in page modals
2016-11-22 13:31:50 +08:00
Ryan Wyllie
a6a277f06c
MDL-57075 message: notification popover see all link
...
The "see all" link in the notification popover should link to the full
notifications page similar to how the "see all" link in the message
popover links to the messaging page.
2016-11-22 03:44:26 +00:00
Andrew Nicols
282f0437f1
Merge branch 'wip-mdl-56898-fixup' of https://github.com/rajeshtaneja/moodle
2016-11-22 11:33:25 +08:00
Andrew Nicols
873a7e1e86
Merge branch 'MDL-56683-master' of git://github.com/damyon/moodle
2016-11-22 11:27:28 +08:00
Rajesh Taneja
45e862c4bd
MDL-56898 behat: Wait for pending JS after setting password
2016-11-22 11:20:30 +08:00
Damyon Wiese
52a51514f6
MDL-56683 theme_boost: Popovers on dynamic content
2016-11-22 10:28:25 +08:00
Andrew Nicols
d10ca75b8c
Merge branch 'MDL-56407-master-2' of git://github.com/junpataleta/moodle
2016-11-22 09:06:09 +08:00
Dan Poltawski
4b631c2d87
Merge branch 'wip-mdl-56898-fix2' of https://github.com/rajeshtaneja/moodle
2016-11-21 15:07:49 +00:00
Rajesh Taneja
26fef01b6b
MDL-56898 behat: Go to a non html page to avoid any unwanted ajax calls
...
After scenario is finished, go to README.txt, so
there is no JS/AJAX calls pending and site is ready
for reset before next scenario
2016-11-21 14:16:49 +08:00
Andrew Nicols
51e8968635
Merge branch 'MDL-56612_master' of git://github.com/dmonllao/moodle
2016-11-21 13:40:00 +08:00
David Monllao
57c01bca0e
MDL-56612 navigation: Remove redundant load_courses_enrolled call
2016-11-21 12:42:09 +08:00
Rajesh Taneja
65eb39c0b4
MDL-56898 behat: Increase autosavefrequency for behat tests
...
We don't need editor to autosave, as this cause
unwanted ajax request
2016-11-21 09:25:35 +08:00
Rajesh Taneja
1bce723292
MDL-56898 behat: Try data reset if it fails because of pending process
2016-11-21 09:25:35 +08:00
Jake Dallimore
0a5cafcbe9
MDL-57049 libraries: update jqueryui version in requirejs path
2016-11-21 08:57:53 +08:00
Frederic Massart
755b013fdf
MDL-56959 output: Prevent notice when csstreepostprocess is undefined
2016-11-18 15:47:32 +08:00
Dan Poltawski
099a2aee68
Merge branch 'MDL-56959-master' of git://github.com/FMCorz/moodle
2016-11-17 18:01:58 +00:00
Frederic Massart
493ef66ecd
MDL-56959 theme: Inherit the parent CSS tree post processor
2016-11-17 15:18:29 +08:00
Frederic Massart
41b973bcbb
MDL-56959 theme: SCSS file is inherited from parent
...
Also added support for the SCSS property to be a Closure
and return content rather than simply being the name of a file.
2016-11-17 15:18:29 +08:00
Andrew Nicols
79f15159da
Merge branch 'wip-MDL-57007-master' of git://github.com/marinaglancy/moodle
2016-11-17 14:36:02 +08:00
David Monllao
98f43f1b08
Merge branch 'MDL-56826-master' of git://github.com/damyon/moodle
2016-11-17 14:24:59 +08:00
Damyon Wiese
12d6dfc1ce
MDL-56826 questions: Add styling for boost theme
...
Changes include:
* question: Add bootstrap classes to buttons and selects so they look consistent.
* mod_quiz: Add bootstrap styles to report form elements
* question: Add bootstrap classes to question form elements
* And remove the success/fail styles from boost because they conflict badly
with the quiz plugin styles (making unreadable text).
* quiz: nav block buttons had black background
* quiz: Add bootstrap styles to quiz navigation buttons
* qtype_ddmarker: Remove bullets from list
Edit form coordinates preview had list bullets for each coordinate.
* boost: Prevent menu scrolling on quiz edit
* mod_quiz: Add bootstrap styles to edit quiz fields
Pagination and max grades forms.
* quiz: Undo some custom styles on review options
These checkboxes were laid out in a fake grid with no responsiveness
that conflicts with the bootstrap form-inline templates. Reset the
custom style to bootstrap default.
* quiz: Fix unit tests for boost changes
* qtype_ddwtos: Accurate positioning of drop targets
* questions: Make the review page responsive
* question: bootstrap 4 compatibility
.alert in bs4 contains no colours by default, you need to mix it with
one of the context classes to get some change in colours, borders etc.
2016-11-17 14:20:52 +08:00
Marina Glancy
e938ea398c
MDL-57007 behat: assume all capabilities during installation
2016-11-17 13:07:09 +08:00
David Monllao
9ecf0674ff
Merge branch 'MDL-56870-master-v2' of https://github.com/snake/moodle
2016-11-17 12:18:26 +08:00
Andrew Nicols
76acac80eb
Merge branch 'MDL-56978_iconv' of https://github.com/mrmark/moodle
2016-11-17 11:20:39 +08:00
Jake Dallimore
a428cf4ac8
MDL-56870 lib: block access to deleted module in require_login
2016-11-17 10:57:13 +08:00
David Monllao
75166d0627
Merge branch 'wip-mdl-56865' of https://github.com/rajeshtaneja/moodle
2016-11-17 10:35:38 +08:00
David Monllao
6dc3a5b699
Merge branch 'MDL-56915-master' of git://github.com/FMCorz/moodle
2016-11-17 10:32:00 +08:00
Jun Pataleta
26dca05d02
MDL-56407 message: Indicate user is blocked in message area
2016-11-17 09:11:37 +08:00
Rajesh Taneja
920d7ffadd
MDL-56865 behat: Don't set error handler for behat install
2016-11-17 08:56:54 +08:00
