mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 10:32:40 +01:00
Code Issues Projects Releases Wiki Activity
71,493 Commits 36 Branches 527 Tags
Commit Graph

5183 Commits

Author SHA1 Message Date
Sam Hemelryk
559d6c0046 MDL-34684: fixed whitespace issues 2014-12-08 11:16:19 +13:00
Sam Hemelryk
8b0876cc10 Merge branch 'MDL-34684_master' of git://github.com/dmonllao/moodle 2014-12-08 11:15:32 +13:00
Dan Poltawski
13e0300961 Merge branch '26226-48304-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:06:04 +00:00
Sam Hemelryk
6c4e70a6d8 Merge branch 'wip_MDL-47830_m29_pwrotation' of https://github.com/skodak/moodle 2014-12-04 12:03:15 +00:00
Dan Poltawski
f9fae51704 Merge branch 'wip-MDL-32547-master-v2' of git://github.com/abgreeve/moodle 
Conflicts:
	version.php
 2014-12-04 11:37:48 +00:00
David Monllao
a1ceaf894b MDL-34684 tool_health: Course categories checking refinements 
Minor changes:
- Updating all course categories that are part of a loop
- Moved functions to tool_health scope
- Moved tests to tool_health scope
- Raised issue importance
- Minor coding style changes

Thanks to Marko Vidberg.
 2014-12-04 11:37:16 +08:00
Logan Reynolds
8db188c8cc MDL-34684 tool_health: Added health check for course category structure 
And corresponding unit test. Work by Marko Vidberg.
 2014-12-04 10:42:58 +08:00
Sam Hemelryk
91bae397b4 Merge branch 'MDL-18183-master' of git://github.com/FMCorz/moodle 2014-12-01 14:45:50 +13:00
Sam Hemelryk
b5e8781465 Merge branch 'MDL-46618_master' of git://github.com/kordan/moodle 2014-12-01 13:11:32 +13:00
Sam Hemelryk
e2f7da2a80 Merge branch 'MDL-34867-master' of https://github.com/tbannister/moodle 2014-12-01 10:45:04 +13:00
Petr Skoda
1d658535b6 MDL-47830 auth: Add pw rotation restrictions 2014-12-01 08:53:52 +13:00
Sam Hemelryk
1eded976e5 Merge branch 'wip-mdl-48192' of https://github.com/rajeshtaneja/moodle 2014-12-01 08:33:53 +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
Tyler Bannister
b175341ed5 MDL-34867 report_log: Improved download speed and memory usage. 2014-11-28 09:06:16 -05:00
Adrian Greeve
c35d736a44 MDL-32547 backup: Add setting for backup folder tidy up. 2014-11-28 09:30:03 +08:00
Dan Poltawski
853b6cff9b Revert "Merge branch 'MDL-43127-master' of git://github.com/FMCorz/moodle" 
This reverts commit 4e75dd78e6c93f7c341bca703d292606436610d5, reversing
changes made to f376c2ffd7d8304bafff851ead3ed10dee34c805.
 2014-11-27 09:33:52 +00:00
Dan Poltawski
e6f5a4b268 Revert "Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle" 
This reverts commit 7bd780835b2e9ff8002da218a5ca42de8dc321b4, reversing
changes made to 1e7e4d5f01c7eaa2278aa38f8abd8c04197d51cc.
 2014-11-27 09:33:48 +00:00
Rajesh Taneja
2b51813b11 MDL-48192 tool_monitor: check output buffer and not ignore it. 
Check what is thrown in output buffer and
make sure output is expected output.
 2014-11-27 17:02:26 +08:00
Frederic Massart
18edf3a325 MDL-43127 tool_uploadcourse: Empty enrolment method is acceptable 
Without the patch a course would not be created if it contained
an enrolment method column with an empty value. e.g.:

shortname,fullname,category,enrolment_1,enrolment_1_disable
courserestored,Course restored,1,,
courserestored2,Course restored 2,manual,1
 2014-11-26 17:11:35 +08:00
Dan Poltawski
4e75dd78e6 Merge branch 'MDL-43127-master' of git://github.com/FMCorz/moodle 2014-11-25 11:18:50 +00:00
Frederic Massart
61380ed2a2 MDL-43127 tool_uploadcourse: Add support for more enrolment methods 2014-11-25 11:00:56 +08:00
Eloy Lafuente (stronk7)
e445e28d6c Merge branch '48334-29' of git://github.com/samhemelryk/moodle 2014-11-25 01:18:11 +01: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
Sam Hemelryk
b52e55bb47 Merge branch 'MDL-25763_master' of git://github.com/dmonllao/moodle 2014-11-24 15:53:56 +13:00
David Monllao
06bb6478fd MDL-25763 tool_replace: Returning correct error code 2014-11-24 09:30:06 +08:00
Sam Hemelryk
365c4edc92 MDL-48334 tool_messageinbound: phpdoc cleanup 2014-11-22 11:02:46 +13:00
Sam Hemelryk
04f2d13b4a MDL-48334 tool_messageinbound: cleanup @package @category 2014-11-22 11:02:40 +13: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
Jonathon Fowler
ee4b11e0a6 MDL-25763 tool_replace: cli version 2014-11-21 10:38:04 +08:00
Petr Skoda
89e9321f96 MDL-47834 auth: Allow enforcing of login limits 2014-11-21 10:00:01 +13:00
Kordan
2313504186 MDL-46618 tool_xmldb: added styles_bootstrapbase.css 2014-11-20 10:40:32 +01:00
Sam Hemelryk
53623a70f0 MDL-26226 course: new setting for sections as links 
This commit adds a new setting to always display course sections
as links (if possible).
 2014-11-20 15:41:24 +13:00
Petr Skoda
866f03de46 MDL-47800 auth: Add option to logout on pw change 2014-11-18 09:51:52 +13:00
Dan Poltawski
271045e5d4 MDL-48174 tool_langimport: info about skipped update 
So admins can work out why the task might not be having an effect.
 2014-11-12 11:24:21 +00:00
Rajesh Taneja
ac19f245bf MDL-48174 core_lang: support for ->skiplangupgrade in lang cron task 
Similar to upgrade_language_pack(), update_langpacks_task should
respect skiplangupgrade config. Also, this should be added to behat
whitelist, so it can be disabled during on-sync period, when lang
pack for master is not available.
 2014-11-11 16:52:20 +08:00
Eloy Lafuente (stronk7)
147bae8f7c MDL-48144 upgrade: add v2.8.0 sep lines 2014-11-10 18:08:15 +01:00
Mark Nelson
8145ab3372 MDL-48107 tool_monitor: extended automated tests 
Also adjusted them so they will pass with these changes.
 2014-11-08 00:50:51 -08:00
Mark Nelson
884652378a MDL-48107 tool_monitor: prevent site rule removal when deleting a course 2014-11-08 00:49:00 -08:00
Mark Nelson
cbc4ecc7f9 MDL-48107 tool_monitor: added total subs to the delete rule string 
Also made some minor language string changes.
 2014-11-08 00:26:56 -08:00
Damyon Wiese
f2e5a435a6 MDL-47900 Event monitor: Fix name of cache lang string for event monitor 
AMOS BEGIN
 MOV [cachedef_rules, tool_monitor],[cachedef_eventsubscriptions, tool_monitor]
AMOS END
 2014-11-07 17:40:21 +08:00
Damyon Wiese
d04803595c Merge branch 'MDL-47900_master' of https://github.com/markn86/moodle 2014-11-07 16:58:52 +08:00
Marina Glancy
293f1b4d85 Merge branch 'MDL-47869-master' of git://github.com/lameze/moodle 2014-11-07 15:03:32 +08:00
Mark Nelson
c490ede369 MDL-47900 tool_monitor: expanded unit tests 
Expanded the unit tests to ensure unnecessary events are not
saved in the DB and altered existing tests so they pass with
the introduction of this feature.
 2014-11-06 18:46:45 -08:00
Mark Nelson
475635f52d MDL-47900 tool_monitor: created list of rules MUC 2014-11-06 18:46:44 -08:00
Simey Lameze
7c2a2e1a93 MDL-47869 tool_monitor: Add sorting on event monitor pages 2014-11-06 14:53:10 +08:00
Ankit Agarwal
e53a4b88d6 MDL-47922 tool_monitor: Update strings 2014-11-06 07:42:24 +05:30
John Okely
9aa9a1c70a MDL-47862 tool_monitor: Fix tool monitor navigation tree 
Added event monitor rules link to the frontpage navigation tree, when
editing the frontpage rules. Added hack so that when viewing the site
context subscriptions, the link in navigation is correct, allowing the
breadcrumbs to appear
 2014-11-06 12:27:51 +13:00
John Okely
8f6b6982fa MDL-47862 event_monitor: Fix context for capability check on subscription page 2014-11-06 12:27:51 +13:00
Dan Poltawski
5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle 
Conflicts:
	admin/tool/monitor/version.php
	mod/lesson/version.php
 2014-11-05 12:11:16 +00:00
Dan Poltawski
90de57db26 Merge branch 'MDL-48068-master' of git://github.com/FMCorz/moodle 2014-11-05 12:03:48 +00:00