Commit graph

77681 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
68f009dfb3 Merge branch 'MDL-53669_master' of git://github.com/markn86/moodle 2016-04-05 22:02:02 +02:00
Eloy Lafuente (stronk7)
1183dfa0f7 Merge branch 'MDL-53647' of git://github.com/timhunt/moodle 2016-04-05 21:59:23 +02:00
Dan Poltawski
cf0f0fc7f4 Merge branch 'MDL-53612-master' of git://github.com/merrill-oakland/moodle 2016-04-05 16:25:05 +01:00
Dan Poltawski
245192accc Merge branch 'MDL-50050-master' of git://github.com/lameze/moodle 2016-04-05 16:23:24 +01:00
Dan Poltawski
9bb87baf18 MDL-53449 mod_feedback: reponses page clean up and behat 2016-04-05 14:46:20 +01:00
Dan Poltawski
f164cab739 Merge branch 'MDL-53104-master' of git://github.com/lameze/moodle 2016-04-05 14:27:25 +01:00
Dan Poltawski
529ea77b13 MDL-53175 upgrade.txt: fix trailing whitespace 2016-04-05 12:23:50 +01:00
Dan Poltawski
393329069d Merge branch 'MDL-53175-master' of git://github.com/jleyva/moodle 2016-04-05 10:47:19 +01:00
Dan Poltawski
88e8e6006f Merge branch 'MDL-53633-master' of git://github.com/andrewnicols/moodle 2016-04-05 09:40:41 +01:00
Dan Poltawski
c56e8bc6ff Merge branch 'MDL-53577_master' of https://github.com/jinhofer/moodle 2016-04-05 09:38:00 +01:00
Dan Poltawski
c019cc57f4 Merge branch 'MDL-53595' of git://github.com/stronk7/moodle 2016-04-05 08:28:48 +01:00
Andrew Nicols
efaf5c0570 MDL-53056 JS: Whitespace fix 2016-04-05 14:58:57 +08:00
Andrew Nicols
2697ece323 Merge branch 'MDL-53056-master' of git://github.com/damyon/moodle 2016-04-05 14:57:26 +08:00
Andrew Nicols
44a72e9bd0 Merge branch 'MDL-53462-master' of git://github.com/jleyva/moodle 2016-04-05 12:54:58 +08:00
Andrew Nicols
0ddddf264b Merge branch 'MDL-53500-master' of git://github.com/cameron1729/moodle 2016-04-05 12:22:42 +08:00
Andrew Nicols
0c21d79627 Merge branch 'MDL-53579-master' of git://github.com/merrill-oakland/moodle 2016-04-05 11:20:45 +08:00
Andrew Nicols
7dbc7a60fc MDL-53588 mod_feedback: Behat scenario verb change 2016-04-05 10:22:01 +08:00
Andrew Nicols
1d51dedb77 Merge branch 'wip-MDL-53588-master' of https://github.com/marinaglancy/moodle 2016-04-05 09:36:16 +08:00
Ben Tindell
a2fb838e82 MDL-53577 repository: Added maxbytes error message
Changing the error message that is displayed to users when they
upload a file that is greater than the maximum upload size. Does not
include all upload cases; focuses on those most used by students.
2016-04-04 15:33:40 -05:00
Eric Merrill
cdb9e8db73 MDL-53612 search: Add book chapter search area 2016-04-04 15:14:22 -04:00
Eloy Lafuente (stronk7)
f8b059f245 MDL-53595 install: update the list of stale files for 3.1
Note I've deleted a couple of files there, 99.99% not problematic
(repository/boxnet) because as a general rule it's better to avoid
adding plugin files in the function and, instead, use core ones that
cannot be "reinstalled". Exception to the rule (what's a rule without
an exception) being forum that cannot be deleted. ;-)
2016-04-04 19:22:08 +02:00
Eloy Lafuente (stronk7)
8cdcf93d83 Merge branch 'MDL-53256-m' of https://github.com/micaherne/moodle 2016-04-04 19:02:44 +02:00
Dan Poltawski
ad6bdd1301 Merge branch 'MDL-53641' of git://github.com/stronk7/moodle 2016-04-04 16:59:46 +01:00
Eric Merrill
2f492364d9 MDL-53272: Fix calls to missing cache def 2016-04-04 15:36:42 +01:00
Dan Poltawski
93c9c9a86b Merge branch 'wip-MDL-49861-master' of git://github.com/abgreeve/moodle 2016-04-04 12:10:17 +01:00
Dan Poltawski
9d6e3cb6c0 Merge branch 'MDL-17955-master' of git://github.com/andrewnicols/moodle 2016-04-04 09:01:46 +01:00
Dan Poltawski
8cdc6f3224 Merge branch 'MDL-53272_master' of git://github.com/dmonllao/moodle 2016-04-04 08:44:17 +01:00
David Monllao
3dab4841e5 MDL-53272 search: Unit tests to discard caching issues 2016-04-04 15:38:03 +08:00
David Monllao
9470e4d1ed MDL-53272 search: Remove search results cache 2016-04-04 15:38:03 +08:00
Dan Poltawski
17ed403974 Merge branch 'm31_MDL-53622_Fix_Missing_Rewrite_Pluginfile_URLs' of https://github.com/scara/moodle 2016-04-04 08:37:22 +01:00
David Monllao
54abd66aca MDL-53272 search: Catch missing record exceptions 2016-04-04 15:36:59 +08:00
Andrew Nicols
a5a70e33f7 Merge branch 'MDL-53661_master' of https://github.com/sam-moodle/moodle 2016-04-04 12:19:12 +08:00
Andrew Nicols
a753407eac Merge branch 'MDL-53397_master' of git://github.com/dmonllao/moodle 2016-04-04 12:12:44 +08:00
Eric Merrill
3744ceb63b MDL-53579 search: Limit general query to certain fields 2016-04-02 22:32:22 -04:00
Tim Hunt
56df6f1992 MDL-53647 quiz summary: keep row class names in synch around headings 2016-04-02 13:22:55 +01:00
Eloy Lafuente (stronk7)
7ca2c19b81 MDL-53641 paging bar: add missing space before last element 2016-04-02 00:13:51 +02:00
Matteo Scaramuccia
2e385e9c57 MDL-53622 mod_forum: Added the file_rewrite_pluginfile_urls() call. 2016-04-01 22:41:25 +02:00
Michael Aherne
f0ed09852e MDL-53256 cache: Prevent overwriting of cache config with invalid data 2016-04-01 08:52:21 +01:00
Simey Lameze
a77e0611a0 MDL-50050 core_deprecated: remove deprecated functions from 2.9 2016-04-01 09:33:30 +08:00
Simey Lameze
221bfffd4e MDL-53104 core_blog: remove deprecated capabilities
This commit removes moodle/blog:associatecourse and moodle/blog:associatemodule deprecated capabilities.
2016-04-01 08:42:09 +08:00
Marina Glancy
0e548b8063 MDL-53588 mod_feedback: always submit checkboxes 2016-03-31 17:21:23 +08:00
Mark Nelson
4981d06dae MDL-53669 tool_recyclebin: removed unused string 2016-03-31 16:02:37 +08:00
Dan Poltawski
aeccf4bd94 weekly release 3.1dev 2016-03-31 14:06:28 +08:00
Dan Poltawski
118756cfe9 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-03-31 14:06:25 +08:00
Dan Marsden
307be23b83 MDL-53500 report_outline: Allow parent role to view all activities.
Parents are not enrolled in the course, use $user to generate modinfo
for uservisible checks.
2016-03-31 13:38:38 +08:00
Dan Poltawski
39fd6b8aa4 Merge branch 'wip-MDL-50941-fix' of https://github.com/marinaglancy/moodle 2016-03-31 09:41:17 +08:00
Marina Glancy
17a6064dd3 MDL-50941 mod_feedback: client validation of maxlength 2016-03-31 09:34:16 +08:00
Sam Chaffee
0c9c466964 MDL-53661 mod_lti: Fix lti_prepare_type_for_save forcessl config 2016-03-30 18:32:34 -06:00
Eric Merrill
7a4a0bc841 MDL-53516 search: Workaround for curl 7.35.0 bug 2016-03-30 15:28:35 -04:00
Juan Leyva
f4fb827ed1 MDL-53462 core_badges: New WS core_badges_get_user_badges 2016-03-30 10:44:55 +01:00