mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity
64,235 Commits 37 Branches 536 Tags
Commit Graph

4624 Commits

Author SHA1 Message Date
Damyon Wiese
5cc2c6662d Merge branch 'MDL-41347-master' of git://github.com/FMCorz/moodle 2013-10-09 12:03:54 +08:00
Dan Poltawski
e521e0724e Merge branch 'MDL-41230-master' of git://github.com/FMCorz/moodle 2013-10-09 11:16:34 +08:00
Dan Poltawski
e9091a28f5 Merge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle 2013-10-09 10:54:24 +08:00
Sam Hemelryk
571781fbf6 Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle 2013-10-09 12:41:36 +13:00
Petr Škoda
6cf2091571 MDL-16073 add test for connection to external database for authentication and enrolments 2013-10-08 21:53:51 +02:00
Dan Poltawski
4f0eaf18f4 Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2013-10-08 16:42:17 +08:00
Damyon Wiese
18ef6201c0 Merge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2013-10-08 10:30:57 +08:00
Sam Hemelryk
cbf34f34cc Merge branch 'MDL-32188' of git://github.com/timhunt/moodle 
Conflicts:
	lib/db/upgrade.php
 2013-10-08 14:43:36 +13:00
Sam Hemelryk
87f28ddceb Merge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle 2013-10-08 11:20:51 +13:00
Petr Škoda
e87214bda7 MDL-42078 multiple uninstall improvements and cleanup 
Includes:
* update checker refactored to \core\update\ namespace
* plugininfo classes refactored to \core\plugininfo\ namespace
* plugin_manager renamed to core_plugin_manager
* redirect back to original page after plugin uninstall
* fixed assign subplugin uninstall
* move assign subplugins under the assignment in admin tree
* fixed plugininfo for all question related plugin types
* auth uninstall support
* added missing block dependencies
* added theme uninstall
* subplugin types are following the plugin on plugin overview page
* several performance improvements in plugin manager
* new warnigns when plugininfo are outdated or missing
* multiple fixes and other improvements
 2013-10-07 13:10:36 +02:00
Peter Bulmer
2f0dd8d5bd MDL-23692 forgotpw: Coding style tidyups. 2013-10-07 20:54:51 +13:00
Damyon Wiese
d4770c9f00 Merge branch '31830-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-10-07 15:28:45 +08:00
Sam Hemelryk
4d00df46b1 Merge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle 2013-10-07 17:38:25 +13:00
Sam Hemelryk
5dc361e16e MDL-31830 core_course: new course category management interface 
* Implemented a new course and category management page.
* Deprecated the old management interface.
* Unit tests to cover the new API and core functions.
* Behat tests to cover the new interface.
 2013-10-07 10:21:41 +13:00
Eric Merrill
cc0bb815ad MDL-41940 files Option to limit legacy course files 
Adding an option that prevents users from adding new files
or directories to legacy course files. Helps with weaning
users from them.
 2013-10-04 13:56:57 -04:00
Tim Hunt
4e3d829350 MDL-42105 questions: let attempts have a max fraction > 1. 
This parallels question_attempt->minfraction, which allows the
fractional mark to go below zere.

This is needed to allow the certainty-base marking behaviours to work
better.
 2013-10-04 17:52:19 +01:00
Peter Bulmer
92de749fc7 MDL-23692 forgotpw: Simplify forgotpw process. 2013-10-04 22:37:56 +13:00
Petr Škoda
38fc013025 MDL-42040 refactor core Moodle shutdown handlers logic 2013-10-04 11:36:46 +02:00
David Monllao
8b30d05557 MDL-42013 behat: Fixing related tests 
We had no false positives because of this
issue, but some checking have been restricted
to specific DOM parts.
 2013-10-04 14:38:11 +08:00
Frederic Massart
97376662df MDL-41230 tool_uploadcourse: Prevent max_execution_time issues 2013-10-03 11:44:54 +08:00
Frederic Massart
7bfc9edd9d MDL-41347 tool_uploadcourse: Invalid restore value handled 2013-10-03 11:22:53 +08:00
Adrian Greeve
4d83abd052 MDL-42089 - Administration: Update to sql to include alternate name fields. 2013-10-03 10:34:07 +08:00
Marina Glancy
0880a52c9a Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle 2013-10-02 16:54:59 +10:00
Frederic Massart
ee2df1a8b2 MDL-40050 webservice: Remove token from events 2013-10-02 13:00:28 +08:00
Damyon Wiese
3d27180e94 MDL-40493 User preference: Allow users to set their preferred text editor. 
This changes the setting htmleditor in the user table from a 0 or 1 column
to a user preference for the name of their preferred html editor.
 2013-10-02 12:49:30 +08:00
Sam Hemelryk
53be2d782a Merge branch 'MDL-41926_master' of git://github.com/dmonllao/moodle 2013-10-01 12:07:22 +13:00
Eloy Lafuente (stronk7)
94211c02c3 Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle 2013-09-30 21:55:41 +02:00
Marina Glancy
9e11059326 Merge branch 'MDL-12403-master' of git://github.com/danpoltawski/moodle 2013-09-30 18:04:38 +10:00
Dan Poltawski
99d5203824 MDL-12403 backup: ability configure default for question bank excludes 2013-09-26 09:55:13 +08:00
Dan Poltawski
6507aaeaff MDL-12403 backup: configure question bank in automated backups 2013-09-26 09:55:12 +08:00
Eloy Lafuente (stronk7)
c72cad1f85 Merge branch 'int_uninstall' of https://github.com/skodak/moodle 2013-09-25 13:36:40 +02:00
Petr Škoda
a707a0b461 MDL-41437 fix non-functional message processor uninstall 2013-09-25 09:39:36 +02:00
David Monllao
6427c7d54e MDL-41421 tool_generator: Fixing help text 
- p.e. replaced by e.g. which sounds more English-friendly
- Adding an extra line break as markdown don't like
p and li together
 2013-09-25 15:06:35 +08:00
Petr Škoda
a31e0b40c9 MDL-41437 fix and cleanup filter uninstall 2013-09-25 08:41:33 +02:00
Marina Glancy
7375d9eb1f Merge branch 'MDL-41421_master' of git://github.com/dmonllao/moodle 2013-09-25 11:53:48 +10:00
Eric Merrill
4ed604996f MDL-41845 Activity Completion: Make default selection an option. 
Makes an option to either default to the activity default, or default
to COMPLETION_TRACKING_NONE. This leaves open the possibility of
allowing activities to pick an actual default, instead of just on/off.
 2013-09-25 11:41:07 +10:00
David Monllao
35aa018208 MDL-41421 tool_generator: Adding a CLI tool to generate the test plan 2013-09-25 09:23:37 +08:00
David Monllao
1325d493cd MDL-41421 tool_generator: Adding a test plan generator to feed JMeter 
Also changing course_backend.php coding style
according to codechecker.
 2013-09-25 09:19:11 +08:00
Eloy Lafuente (stronk7)
75c7c41283 Merge branch 'MDL-41827_master' of git://github.com/dmonllao/moodle 
Conflicts:
	admin/tool/generator/classes/site_backend.php
 2013-09-25 02:38:34 +02:00
Eloy Lafuente (stronk7)
a18daae62b Merge branch 'MDL-41342_master' of git://github.com/dmonllao/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-09-25 02:11:51 +02:00
Eloy Lafuente (stronk7)
ae67f8201f MDL-41889 Use moodle collator for NATURAL sort 2013-09-25 01:46:53 +02:00
Sam Hemelryk
4b005d8751 Merge branch 'MDL-41889_master' of git://github.com/dmonllao/moodle 2013-09-25 09:49:29 +12:00
Petr Škoda
394372b7da MDL-41437 fix plugin install issues 
This patch prevents inclusion of settings from plugin that or not yet installed or upgraded,
this matches the original logic where we were using the modules table.
 2013-09-24 22:43:46 +02:00
Eloy Lafuente (stronk7)
161f995849 Merge branch 'w39_MDL-41437_m26_mia' of https://github.com/skodak/moodle 
Conflicts:
	admin/auth.php
	lib/db/upgrade.php
	version.php
 2013-09-24 20:18:03 +02:00
Frederic Massart
d733a8ccc3 MDL-40050 webservice: Replace add_to_log() with new events 2013-09-24 15:20:18 +08:00
Petr Škoda
1a4621d8e5 MDL-31501 fake requried globals in both installers 2013-09-23 21:46:05 +02:00
David Monllao
21b0a62fc4 MDL-41926 tool_generator: Removing unused vars 2013-09-23 17:50:46 +08:00
David Monllao
c43ef6c624 MDL-41889 tool_generator: Fixing problem detecting the last used course shortname 2013-09-23 16:33:29 +08:00
David Monllao
53e6d79c39 MDL-41827 tool_generator: Adding a file size limit 2013-09-23 16:20:11 +08:00
David Monllao
09373a5a62 MDL-41827 tool_generator: New unit test checking the generated files size 2013-09-23 16:16:47 +08:00