mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 11:02:38 +01:00
Code Issues Projects Releases Wiki Activity
71,915 Commits 36 Branches 527 Tags
2d78593650
Commit Graph

19634 Commits

Author SHA1 Message Date
Sam Hemelryk
602b281dcb Merge branch 'MDL-14402-master' of git://github.com/andrewnicols/moodle 2014-12-01 11:35:44 +13:00
Sam Hemelryk
930d160bcd Merge branch 'MDL-48384-master' of git://github.com/danpoltawski/moodle 2014-12-01 11:31:29 +13:00
Sam Hemelryk
d125c7d238 MDL-47133 editor_atto: fixed lint errors 2014-12-01 10:36:23 +13:00
Sam Hemelryk
231cb5e3d4 Merge branch 'MDL-47133-master' of git://github.com/FMCorz/moodle 2014-12-01 10:34:18 +13:00
Petr Skoda
e5035ecb3f MDL-48420 test: fix lasttnamephonetic typo 2014-12-01 09:25:55 +13:00
Petr Skoda
1d658535b6 MDL-47830 auth: Add pw rotation restrictions 2014-12-01 08:53:52 +13:00
Andrew Nicols
64e7aa4de1 MDL-28286 JavaScript: Convert all uses of M.str to M.util.get_string 2014-12-01 08:32:04 +13:00
Dan Poltawski
e4d9185e4a MDL-40607 deprecatedlib: final deprecations of 2.0 functions 
These functions are getting final deprecation following our process.
Note that print_arrow() is getting more time due to incorrect
replacement - see MDL-45448
 2014-11-29 12:42:31 +00:00
Adrian Greeve
c35d736a44 MDL-32547 backup: Add setting for backup folder tidy up. 2014-11-28 09:30:03 +08:00
Frederic Massart
3af5725b74 MDL-40419 blocks: Function to get page type patterns from pattern 2014-11-27 15:28:51 +08:00
Jetha Chan
92037ec8c8 MDL-48394 core_renderers: remove role=presentation on user picture links 2014-11-27 15:24:33 +08:00
Dan Poltawski
16fadd4be7 MDL-48384 thirdpartylibs: correct location of yui 2014-11-26 12:12:03 +00:00
Frederic Massart
04b12fc1b3 MDL-47133 editor_atto: Use strict validation of keyboard shortcuts 2014-11-26 17:41:05 +08:00
Dan Poltawski
1e7e4d5f01 Merge branch 'MDL-48210-master-checker-caching' of git://github.com/mudrd8mz/moodle 2014-11-26 08:20:36 +00:00
David Mudrák
26f72b0058 MDL-48210 updates checker: Fix empty return type 
Credit goes to Marina Glancy for catching during the testing.
 2014-11-26 09:10:04 +01:00
Andrew Nicols
29ac5a6bce MDL-14402 blocks: Do not show assign roles on my home 2014-11-26 13:39:44 +08:00
Sam Hemelryk
686d05619b MDL-27548 comments: component now recorded 2014-11-26 13:31:37 +13:00
Sam Hemelryk
ac8c153862 Merge branch 'MDL-22309_master' of git://github.com/dmonllao/moodle 2014-11-26 09:06:08 +13:00
Heiko Schach
000f1488f0 MDL-48036 course: change multilang cache key 2014-11-25 14:34:45 +00:00
Eloy Lafuente (stronk7)
f34996256d Merge branch 'MDL-48210-master-checker-caching' of git://github.com/mudrd8mz/moodle 2014-11-25 13:21:47 +01:00
Dan Poltawski
3e8fe4baef Merge branch 'MDL-46416-master-bare' of git://github.com/FMCorz/moodle 2014-11-25 11:21:19 +00:00
Frederic Massart
21449d01b7 MDL-46416 group: Use a revision number for group pictures 2014-11-25 11:58:13 +08:00
Sam Hemelryk
159928822c MDL-23839 navigation: fixed php5.5ism 2014-11-25 14:35:30 +13:00
Sam Hemelryk
328e4e4c77 Merge branch 'MDL-23839-master' of git://github.com/andrewnicols/moodle 2014-11-25 14:07:08 +13:00
Eloy Lafuente (stronk7)
f62b278a91 Merge branch '48304-29' of git://github.com/samhemelryk/moodle 2014-11-25 00:23:42 +01:00
Sam Hemelryk
4cbf997db0 Merge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle 2014-11-25 11:02:19 +13:00
Sam Hemelryk
9e65f9160a Merge branch 'MDL-48259' of git://github.com/timhunt/moodle 2014-11-25 10:49:54 +13:00
Dan Poltawski
1f182f95e7 Merge branch 'MDL9443_Filter_XHTML_files.2014-11-19' of git://github.com/Dave-B/moodle 2014-11-24 17:26:30 +00:00
Dan Poltawski
1d9eb92ff3 Merge branch 'MDL-45867-master' of https://github.com/dthies/moodle 2014-11-24 17:11:14 +00:00
Dan Poltawski
1d79061651 Merge branch 'wip-MDL-48252-master' of git://github.com/abgreeve/moodle 2014-11-24 16:29:25 +00:00
Dan Poltawski
e378e6b397 Merge branch 'wip-mdl-48063' of https://github.com/rajeshtaneja/moodle 2014-11-24 12:03:14 +00:00
Dan Poltawski
927da85285 Merge branch 'wip-mdl-48302' of https://github.com/rajeshtaneja/moodle 2014-11-24 11:56:56 +00:00
Dan Poltawski
3111b66fbd Merge branch 'wip_MDL-47834_m29_concurrentlogins' of https://github.com/skodak/moodle 2014-11-24 11:07:20 +00:00
David Mudrák
32c670c8c2 MDL-48210 updates checker: Improve cron notifications processing 
These are cosmetic improvements spotted while working on the issue.

1. Do not waste time if there are no changes to notify about.
2. Fix the legacy plugin manager's get_plugins() call.
 2014-11-24 11:44:13 +01:00
David Mudrák
c9f1b3a0c3 MDL-48210 plugin_manager: Invalidate caches after fetching updates info 2014-11-24 11:44:02 +01:00
David Monllao
a8e60d97d9 MDL-22309 accesslib: Preventing incorrect get_role_users() uses 2014-11-24 10:46:04 +08:00
Sam Hemelryk
6d84f28553 Merge branch 'MDL-48064-master' of https://github.com/dthies/moodle 2014-11-24 14:54:16 +13:00
David Monllao
655f737187 MDL-22309 accesslib: Adding unit test to expose the issue 2014-11-24 09:45:50 +08:00
Adrian Greeve
67eb7d7804 MDL-48252 scheduled tasks: Unit test for file_temp_cleanup_task. 2014-11-24 09:41:42 +08:00
Adrian Greeve
bdead76ea4 MDL-48252 scheduled tasks: file_temp_cleanup_task does full delete. 
This scheduled task was previously only doing a partial delete
due to the fact that the directory modification time would be
updated when a child file was deleted. It would then have to
wait another week before that directory could be deleted.
 2014-11-24 09:41:42 +08:00
Frederic Massart
93539c44dc MDL-18183 mnet: Option to verify peer and host of MNet peer using HTTPS 2014-11-21 11:33:16 +08:00
Rajesh Taneja
2ca7f4e649 MDL-48063 behat: Fixed JS Exception 
M is not created on all pages, like cron and
Steps which check for exported data. So we need
to ensure M is defined, before using it in
behat_hooks::wait_for_pending_js()
 2014-11-21 11:01:35 +08:00
Rajesh Taneja
ab25d8a7f7 MDL-48302 behat: Reset all data, before starting behat suite 2014-11-21 10:23:07 +08:00
Rajesh Taneja
97d0445a7b MDL-48302 behat: Make sure to clear php file cache 2014-11-21 10:22:56 +08:00
Rajesh Taneja
ef1d45b394 MDL-48302 behat: Reset cache before scenario 2014-11-21 10:22:56 +08:00
Petr Skoda
89e9321f96 MDL-47834 auth: Allow enforcing of login limits 2014-11-21 10:00:01 +13:00
Dan Poltawski
17d4ff23ee Revert "MDL-46531 Make atto foreground colors and background colors configurable" 
This reverts commit cb6e1d527093bb955946498850ef8a51276a13a4.

This reverts commit 7a5e6054248ef18f05a228ab0db4d05e5d782180, reversing
changes made to 7b9fb265d20e53580a64dcd2be8546ff5b49bd26.

This reverts commit 06404b01180a2965804fab9e47715fdc2b6bdfb4, reversing
changes made to 0f87473fed2da15a8ba72ac9a578734fe2548f10.

Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-20 07:04:41 +00:00
Andrew Nicols
cb6e1d5270 MDL-46531 editor_atto: fontcolor -> backcolor 2014-11-20 10:46:04 +08:00
Sam Hemelryk
9915109268 MDL-48304 moodle_url: compare now considers anchor 2014-11-20 15:38:34 +13:00
Adrian Greeve
b49964f7fc MDL-48252 scheduled tasks: Unit test for file_temp_cleanup_task. 2014-11-20 10:35:47 +08:00