Commit graph

3972 commits

Author SHA1 Message Date
Damyon Wiese
9a84376d4b Merge branch 'w44_MDL-42110_m26_addoninstaller' of https://github.com/skodak/moodle 2013-10-28 12:39:30 +08:00
Adrian Greeve
c00252fbed MDL-40683 administration: Include alternate name fields in CSV user import.
Removal of firstname and lastname from STD_FIELDS
2013-10-28 09:14:44 +08:00
Adrian Greeve
6f4ece9f57 MDL-40683 libraries: Include alternate name fields in CSV user import. 2013-10-28 09:08:48 +08:00
Marina Glancy
7cff3faa94 MDL-42400 tool_generator: save db query in module generation 2013-10-26 14:00:24 +11:00
Petr Škoda
a635424f88 MDL-42110 use parent directory permissions when installing add-ons 2013-10-25 21:23:40 +02:00
David Monllao
a068887e3d MDL-42538 behat: Fixing wrong number of users 2013-10-25 11:22:34 +08:00
Dan Poltawski
276c451b2a Merge branch 'MDL-42343_master' of git://github.com/dmonllao/moodle 2013-10-23 15:12:22 +08:00
Marina Glancy
c5df0a63bc Merge branch '42170-26' of git://github.com/samhemelryk/moodle 2013-10-23 11:43:23 +11:00
Petr Škoda
d5814f4e22 MDL-41811 simplify the admin tree detection logic and fix navigation in multiple areas 2013-10-21 14:17:55 +08:00
David Monllao
4338c6fc53 MDL-42408 behat: Setting the site summary 2013-10-21 14:17:54 +08:00
Petr Škoda
e56c107da8 MDL-41811 tweak custom admin pages to force loading of admin tree 2013-10-21 14:17:53 +08:00
David Monllao
98d72f12af MDL-42343 tool_generator: Using the new session manager 2013-10-21 11:14:14 +08:00
David Monllao
a0e89a8fe3 MDL-42408 behat: Setting the site summary 2013-10-21 11:09:39 +08:00
Eloy Lafuente (stronk7)
3745472f63 Merge branch 'MDL-42241-master' of git://github.com/ankitagarwal/moodle 2013-10-15 01:58:51 +02:00
Damyon Wiese
35d7ba167a Merge branch 'MDL-42198_master' of git://github.com/dmonllao/moodle 2013-10-14 16:14:38 +08:00
David Monllao
8f50ec7db6 MDL-42198 tool_generator: Changing test plan default values
To achieve more stability on test results we
switch to less users and more loops.
2013-10-14 12:46:02 +08:00
David Monllao
9a79e456c2 MDL-42151 behat: Adding the version to the testplan 2013-10-14 12:43:52 +08:00
Ankit Agarwal
96e991631d MDL-42241 tool_uploadcourse: Fix incorrect urls 2013-10-10 17:59:41 +08:00
Sam Hemelryk
c80ef689d5 Merge branch 'wip-mdl-41744' of https://github.com/rajeshtaneja/moodle 2013-10-10 14:40:02 +13:00
Marina Glancy
44cd0b03af Merge branch 'wip-mdl-38155' of git://github.com/rajeshtaneja/moodle 2013-10-10 11:23:06 +11:00
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
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
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
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
James Henestofel
6afe875edd MDL-38155 Enrolments: User can be suspended by bulk upload
Added ability to suspend user enrolment during bulk upload,
this can be done by setting enrolstatus field in csv file
2013-10-07 15:24:14 +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
Sam Hemelryk
5a26fb204e MDL-42170 tool_behat: simple OR patterns now shown as select boxes 2013-10-07 10:17:04 +13: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
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
Rajesh Taneja
b650fe6a8e MDL-41744 Users: Convert key to value in bulk upload
Menu profile field expects value, during bulk upload if value is passed by form
then options key is passed. So converting key to value if passed though form
2013-10-03 10:16:31 +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
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
Marina Glancy
7375d9eb1f Merge branch 'MDL-41421_master' of git://github.com/dmonllao/moodle 2013-09-25 11:53:48 +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)
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
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