mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 07:30:01 +01:00
Code Issues Projects Releases Wiki Activity
82,149 Commits 36 Branches 527 Tags
Commit Graph

22727 Commits

Author SHA1 Message Date
David Monllao
9441af9596 NOBUG: Fixed file access permissions 2016-11-25 15:58:02 +08:00
David Monllao
b4f82837ba Merge branch 'MDL-55324-master-fix' of git://github.com/cameron1729/moodle 2016-11-25 11:11:20 +08:00
David Monllao
92fa8b8fde Merge branch 'MDL-57126-master' of https://github.com/snake/moodle 2016-11-25 09:18:26 +08:00
Jake Dallimore
d714aeb4f5 MDL-57126 core: add 'scss' to list of core filetypes. 
This allows filetype restrictions to work when uploading additional
preset files on the Boost admin settings page.
 2016-11-25 07:53:59 +08:00
Dan Poltawski
9cc9690575 Merge branch 'MDL-57102-master' of git://github.com/jleyva/moodle 2016-11-24 10:43:21 +00:00
Dan Poltawski
304e8a8d0c Merge branch 'wip-MDL-56586-master-2' of git://github.com/marinaglancy/moodle 2016-11-24 09:30:29 +00:00
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
Marina Glancy
bf07b81543 MDL-56586 blocks: use template for non-JS add block selector 2016-11-24 14:24:59 +08:00
Damyon Wiese
be2247fb24 MDL-56586 blocks: Do the addblock in a modal 2016-11-24 14:24:59 +08:00
Marina Glancy
b1e5624ad9 MDL-56586 blocks: Fix mess with links to permissions 
problem 1: links to blocks permissions changes were missing in boost
problem 2: when modifying link from dashboard user is returned to profile ('returnurl' passed but not respected)
problem 3: link to check permissions missing from category management page
fix: instead of respecting both 'return' and 'returnurl' parameter use only 'returnurl'
fix: use 'popup' layout when modifying permissions for a block
 2016-11-24 14:24:59 +08:00
Marina Glancy
b11916d3e7 MDL-56586 blocks: allow theme to manage "Add a block" select 2016-11-24 14:24:56 +08:00
Cameron Ball
4d85886b5f
MDL-55324 atto_media: Reduce maximum height of atto modal 
Previously after adding a few sources or expanding a few fieldsets
the modal would be pushed off the bottom of the screen. Here we
reduce the maximum height to allow it to remain visible.
 2016-11-24 12:31:30 +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
Cameron Ball
e24699cc7a
MDL-55324 atto_media: Preserve help text when adding sources 2016-11-24 10:55:05 +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
Juan Leyva
813320fbb6 MDL-57102 auth: Add new signup_is_enabled function 
And apply the function in:
- login/signup.php
- blocks/login/block_login.php
 2016-11-23 19:35:08 +00: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