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

87210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
25e9c56117 Merge branch 'MDL-60738-master' of git://github.com/jleyva/moodle 2017-11-28 20:59:22 +01:00
Eloy Lafuente (stronk7)
8000e6af01 Merge branch 'MDL-60838-master' of https://github.com/sammarshallou/moodle 2017-11-28 20:48:15 +01:00
Eloy Lafuente (stronk7)
8c9eecdea7 Merge branch 'MDL-60682' of git://github.com/timhunt/moodle 2017-11-28 20:37:59 +01:00
Jun Pataleta
012398a8c2 Merge branch 'MDL-54693-quiz-override-help-icon' of https://github.com/lucaboesch/moodle 2017-11-28 20:10:08 +13:00
Jun Pataleta
02146e0b21 Merge branch 'MDL-59574-master' of git://github.com/ankitagarwal/moodle 2017-11-28 19:38:23 +13:00
Ankit Agarwal
120a795b4e MDL-59574 analytics: Add model listing to enable_model cli script 2017-11-28 10:52:52 +05:30
Ankit Agarwal
556cb98d16 MDL-59574 tool_analytics: Add model listing to evaluate_model cli script 2017-11-28 10:52:52 +05:30
Damyon Wiese
d87a31d878 Merge branch 'MDL-53004-master' of https://github.com/lucaboesch/moodle 
Conflicts:
	mod/assign/styles.css
 2017-11-28 13:18:03 +08:00
Jun Pataleta
7315358ead Merge branch 'MDL-46768-master' of git://github.com/sarjona/moodle 2017-11-28 17:18:54 +13:00
Damyon Wiese
081ac91526 Merge branch 'MDL-24678-master-chat_get_latest_message' of https://github.com/bozoh/moodle 2017-11-28 12:14:08 +08:00
Damyon Wiese
2c3d8a06c8 Merge branch 'MDL-60669-master' of git://github.com/tobiasreischmann/moodle 2017-11-28 12:05:21 +08:00
Damyon Wiese
bdb157653b Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle 2017-11-28 11:38:40 +08:00
Jun Pataleta
49cbe666a4 Merge branch 'wip-MDL-60478-m35' of git://github.com/amygroshek/moodle 2017-11-28 13:25:51 +13:00
Eloy Lafuente (stronk7)
8edbd642b4 Merge branch 'MDL-60654' of https://github.com/joaociocca/moodle 2017-11-28 01:16:40 +01:00
Eloy Lafuente (stronk7)
9d51d8e81f Merge branch 'MDL-60441_master' of git://github.com/juancs/moodle 2017-11-28 00:55:23 +01:00
Eloy Lafuente (stronk7)
2b6fa07627 Merge branch 'MDL-60249-master' of git://github.com/damyon/moodle 2017-11-28 00:48:41 +01:00
sam marshall
a938e4096c MDL-60174 core_dml: fix miscellaneous incorrect recordset usage 
The new recordset support for Postgres requires transactions and
will cause errors if recordsets are not closed correctly. This
commit fixes problems that were identified during unit tests, and
via some basic code analysis, across all core code. Most of these
are incorrect usage of recordset (forgetting to close them).
 2017-11-27 11:10:33 +00:00
sam marshall
ed00d67c99 MDL-60174 core_dml: get_recordset on Postgres eats all the RAM 
On Postgres, get_recordset_sql loads all the results into memory
(within the Postgres library, which doesn't count towards the PHP
memory limit, but does count towards making your server run out of
memory) as soon as the query completes.

This commit changes the code to use cursors, which in Postgres
allow the results to be returned in smaller chunks (by default
100,000 rows).
 2017-11-27 11:10:29 +00:00
Tobias Reischmann
9bd6807635 MDL-60669 forum: Added duplicate check for restoring forum subscriptions 
Before MDL-59854 it was possible to have duplicate forum subscriptions.
Trying to import backups created from back then, caused a DB exception
due to unqiue key constraints. Now only one of multiple identical forum
subscritions is restored.
 2017-11-27 10:51:34 +01:00
Damyon Wiese
d3fa95abf1 Merge branch 'MDL-60188-master' of git://github.com/rezaies/moodle 2017-11-27 15:57:41 +08:00
Jun Pataleta
417d543aaa Merge branch 'MDL-57569-master' of git://github.com/sarjona/moodle 2017-11-27 19:43:32 +13:00
Jun Pataleta
78a534dde0 Merge branch 'wip-MDL-45068-master' of git://github.com/marinaglancy/moodle 2017-11-27 19:36:00 +13:00
Marina Glancy
ec43371a3f MDL-45068 groups: fixes to group import 
- If 'coursename' is specified in the CSV it should match the course short name - thanks Yusuf Yılmaz for the patch
- If 'idnumber' is specified but 'groupidnumber' is not, idnumber should be used for matching the course idnumber only
- If 'groupingname' is not specified, there should be no notices (regression from MDL-42514)
- If 'coursename' or 'idnumber' column is present, it can contain empty values in some/all lines
 2017-11-27 14:24:58 +08:00
Shamim Rezaie
0897d6588e MDL-60188 groups: cache user's groups and groupings 
The function groups_get_user_groups is called too often both before rendering the page and after the page is rendered (using ajax).
The function was executing a query joining 3 tables in each call. The plementation of the function has now modified to store the
query result in a request cache.
 2017-11-27 10:46:35 +08:00
Jake Dallimore
d735cb5230 Merge branch 'MDL-60830-master' of git://github.com/sarjona/moodle 2017-11-27 10:29:55 +08:00
Jun Pataleta
d470de673c Merge branch 'MDL-58887-master' of git://github.com/ryanwyllie/moodle 2017-11-27 15:05:46 +13:00
Jake Dallimore
29abde4709 Merge branch 'MDL-27230-master' of https://github.com/lucaboesch/moodle 2017-11-27 09:43:44 +08:00
Jun Pataleta
84ae267c56 Merge branch 'MDL-60904' of git://github.com/stronk7/moodle 2017-11-27 11:27:57 +13:00
Eloy Lafuente (stronk7)
2fdd9eed54 MDL-60904 behat: Update master to use 3.35.0 behat extension tag 2017-11-26 20:27:00 +01:00
Carlos Alexandre S. da Fonseca
38e7a9525f MDL-24678 mod_chat: Fixed race condition on chat module 2017-11-24 10:36:42 -02:00
sam marshall
411b5f3a02 MDL-60838 core_search: File upload does not honour timeout 2017-11-24 11:00:45 +00:00
Sara Arjona
6820f36bda MDL-57569 core_files: Fix to let show generated f3 image 2017-11-24 11:48:32 +01:00
Sara Arjona
d77a6026d2 MDL-46768 core_badges: changed badge name type from FILE to TEXT 2017-11-24 11:34:15 +01:00
Luca Bösch
b4fcf278c2 MDL-54693 quiz: Info for attempts allowed in user and group override. 2017-11-23 19:11:11 +01:00
Luca Bösch
409758c035 MDL-53004 assignment: Separate label and pulldown in grading (Clean) 2017-11-23 16:42:26 +01:00
Luca Bösch
99618f89bf MDL-27230 quiz: remove and update group overrides in calendar 2017-11-23 16:42:20 +01:00
David Monllao
5bde2c2b62 weekly release 3.5dev 2017-11-23 13:35:10 +01:00
Damyon Wiese
07a91fd4cc Merge branch 'wip-MDL-27886-master' of https://github.com/marinaglancy/moodle 2017-11-23 12:25:31 +08:00
Marina Glancy
dc9353a07b MDL-27886 backup: When setting is unlocked set it to original value 2017-11-23 12:21:03 +08:00
Jake Dallimore
1cce91b1bb Merge branch 'MDL-60831-master' of git://github.com/ankitagarwal/moodle 2017-11-22 13:24:34 +01:00
Ankit Agarwal
7e6ef63e5f MDL-60831 search: add BS classes to block elements 2017-11-22 13:24:34 +01:00
Jun Pataleta
ddb3857cdf Merge branch 'wip-MDL-60546-master' of git://github.com/abgreeve/moodle 2017-11-22 13:24:33 +01:00
Jun Pataleta
9ff02b52b2 Merge branch 'MDL-60813-master' of git://github.com/jleyva/moodle 2017-11-22 13:24:33 +01:00
Jun Pataleta
fd64ae3140 Merge branch 'MDL-60526-master-fix1' of http://github.com/damyon/moodle 2017-11-22 13:24:32 +01:00
Damyon Wiese
992c5ccfbf MDL-60526 forms: Button elements should have type 
The mform "buttons" should be of type "button", instead it's not specified so they get
the default of "submit". This is causing behat fails.
 2017-11-22 13:24:32 +01:00
David Monllao
63469571c8 Merge branch 'm34_MDL-60745_Bump_ComposerLock_ToPHPUnit_6d4d4' of https://github.com/scara/moodle 2017-11-22 13:24:31 +01:00
David Monllao
e968cf1def MDL-59512 version: Following 2 digits scheme 2017-11-22 13:24:31 +01:00
David Monllao
eee87c8a24 Merge branch 'MDL-59512-master' of git://github.com/Dagefoerde/moodle 2017-11-22 13:24:31 +01:00
Jun Pataleta
4b560e4a8e Merge branch 'mdl58817-master' of https://github.com/tlock/moodle 2017-11-22 13:24:30 +01:00
Jun Pataleta
6472ad5600 Merge branch 'MDL-60637-master' of git://github.com/lameze/moodle 2017-11-22 13:24:30 +01:00