Git merges in Moodle 3.3.0 by Andrew Nicols
commit 2c69d24037089c060b1937425aa4c1d676a2b5d3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 12 May 2017 12:32:23 +0800
Tag: v3.3.0-rc3
Merge branch 'MDL-58898-master' of https://github.com/xow/moodle
commit d9d2c2f86f49f6a818f53dd672064f8649e05a13
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 12 May 2017 10:22:19 +0800
Tag: v3.3.0-rc3
Merge branch 'MDL-58904' of git://github.com/stronk7/moodle
commit 865e2bc7dc09b018b3840c7f456fcd2ba1764906
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 10 May 2017 11:48:40 +0800
Tag: v3.3.0-rc3
Merge branch 'MDL-58780-master' of git://github.com/junpataleta/moodle
commit 381db2fe8df5c381f633fa2a92e61c6f0d7308cb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 09 May 2017 13:55:20 +0800
Tag: v3.3.0-rc2
Merge branch 'MDL-58822-master' of git://github.com/ryanwyllie/moodle
commit 5d9c1b2f8eaa11595baccb7b2ed5786ce75a621f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 08 May 2017 12:30:59 +0800
Tag: v3.3.0-rc2
Merge branch 'MDL-58684-master-rerun-upgrade-step' of https://github.com/snake/moodle
commit 1d5a3664888af0666f6dc3413f814243ea0b09a5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 08 May 2017 11:20:39 +0800
Tag: v3.3.0-rc2
Merge branch 'MDL-58684-master-fix1' of https://github.com/snake/moodle
commit 7167d25f5f494daadad395f5b82473ff58ab05f5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 08 May 2017 09:32:58 +0800
Tag: v3.3.0-rc2
Merge branch 'MDL-58823-master' of git://github.com/jleyva/moodle
commit 529d52f39a5d4e9b414b02734db63f653842e4ca
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 05 May 2017 14:55:22 +0800
Tag: v3.3.0-rc1
Merge branch 'wip-MDL-50670-master-fix' of https://github.com/marinaglancy/moodle
commit fbc15bb977523b3a990f93e7c7d947ac3e0b5bb3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 05 May 2017 09:57:40 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-55371-master' of git://github.com/jleyva/moodle
commit c428f58a3abd093be6dabc856981b9c16dbde7b7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 05 May 2017 08:26:26 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58772' of git://github.com/stronk7/moodle
commit 5e7de08be505246c0417c8190b95f38997565830
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 05 May 2017 08:23:27 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58749' of git://github.com/stronk7/moodle
commit 6628153eb348cef0afb298ba9ca2cea445265948
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 04 May 2017 14:33:27 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58736-master' of git://github.com/cameron1729/moodle
commit 641af8d17ce7478dd23c42af45a5a202498712c4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 04 May 2017 14:11:23 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58803-master-fix' of git://github.com/junpataleta/moodle
commit 2e3c23b25f27727115c7266d4ec79d5d09160113
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 04 May 2017 11:42:38 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58707-master' of git://github.com/jleyva/moodle
commit f8633212ee386123c76248e94551e6b755c71907
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 04 May 2017 11:07:37 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58803-master' of git://github.com/junpataleta/moodle
commit edf1ea10ca701643e94ff49a9dfdf392b8a7499f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 04 May 2017 11:01:39 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58431-master' of git://github.com/jleyva/moodle
commit 680ad78cf074387dbb3834e98a70c7a9460715c9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 04 May 2017 10:14:41 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle
commit b1517237ad3da5ad872a5916aa074ac9d2c9b785
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 04 May 2017 08:49:48 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle
commit 4270ebea382a493b140e7a301322adbe5158ea75
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 02 May 2017 10:35:46 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-57704-master' of https://github.com/xow/moodle
commit db2c66e700e44b4f07f0d0fa9eb2ec099a9cac66
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 02 May 2017 09:00:07 +0800
Tag: v3.3.0-rc1
Merge branch 'wip-MDL-58665-master' of git://github.com/marinaglancy/moodle
commit 2a87d81c5a0203e5de7badb3d77e7e293bb6599d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 01 May 2017 15:22:53 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58732-master' of git://github.com/ryanwyllie/moodle
commit 8374422402e52afa749c627cbce3ccc7736585b8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 28 Apr 2017 11:46:02 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58573-master' of git://github.com/junpataleta/moodle
commit e6c0e75ed8d58aa59eba16dd251ecda3116447dd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 28 Apr 2017 10:29:50 +0800
Tag: v3.3.0-rc1
Merge branch 'wip-MDL-58731-master' of git://github.com/marinaglancy/moodle
commit ae068eb1454851e638f65bc8676ca77b1d624d12
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 27 Apr 2017 13:55:02 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58644-master' of git://github.com/ankitagarwal/moodle
commit 14ed05c0dcce39c01815244de00fdcd9acca342f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 27 Apr 2017 11:25:35 +0800
Tag: v3.3.0-rc1
Merge branch 'MDL-58691-master' of git://github.com/ankitagarwal/moodle
commit 7125b4f17c89969aa8ec279c3146438bbe102431
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 21 Apr 2017 10:39:41 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58490-master-fix' of https://github.com/lameze/moodle
commit 470781609590fed14ed17e1001a34b141ab753d9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 21 Apr 2017 08:52:15 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58490-master' of git://github.com/lameze/moodle
commit e44400ceca7a61a562c6f7d192a8b946d56609f2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 20 Apr 2017 15:23:50 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58494-master' of git://github.com/ryanwyllie/moodle
commit d1131cd8b6058bd9d78e038d4b8c7ca505be078f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 20 Apr 2017 13:54:43 +0800
Tag: v3.3.0-beta
Merge branch 'wip-MDL-58138-fix' of https://github.com/marinaglancy/moodle
commit 9517ea662d575328872b4b8f7dcb33a04dd272a1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 20 Apr 2017 13:03:34 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58515-master' of https://github.com/lucisgit/moodle
commit d41402a046883ec5028895693d63c7a84573504d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 20 Apr 2017 12:58:48 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58370-master' of git://github.com/damyon/moodle
commit 5ca4dbe6f635cc0c6f47ed66e70120bc418fc53a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 20 Apr 2017 12:38:05 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57456_master-fix' of git://github.com/dmonllao/moodle
commit 07e5b34c955637c72793a6a26373de83f33e045d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 19 Apr 2017 13:50:28 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58536-master' of git://github.com/ryanwyllie/moodle
commit 442908a1000e1815aa3f4c51fb3624be3694130d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 19 Apr 2017 11:53:40 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58138-master-v2' of git://github.com/snake/moodle
commit a1b98c934c7f33475bedafc42967223c49ea5e7a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 18 Apr 2017 10:23:03 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58551-master' of git://github.com/lameze/moodle
commit 2660f7dabec4ce75bf7c27d02150e733a7d33ec4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 18 Apr 2017 09:42:36 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58559-master' of git://github.com/lameze/moodle
commit 80483bf3ccbb03ceff8479a32ceb864d43e77718
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 18 Apr 2017 09:20:10 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58582-master' of https://github.com/Dagefoerde/moodle
commit d4be750a7ccf82a9bd8a053fe23e1272cc42f147
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 18 Apr 2017 08:41:59 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58539_master' of https://github.com/dmonllao/moodle
commit e4a090c1056829262806f97cec8e0c5ac163b2c2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 13 Apr 2017 13:21:42 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58501_master' of git://github.com/markn86/moodle
commit 20026ab3c163bc596c2f79f05c5784b54f55aec7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 13 Apr 2017 12:10:45 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58356-master' of git://github.com/damyon/moodle
commit 270d5c1cc5e738360dc992917a33fb7523c4d8b0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 13 Apr 2017 10:00:58 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-46929' of https://github.com/andrewhancox/moodle
commit 28b966a5f9a40c0974bf24aaef3a62f31fdfc23d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 13 Apr 2017 08:44:15 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-39913-master-new-validation' of https://github.com/xow/moodle
commit 4041ac0c4dc38e1c05f175b308ade73e66b4a174
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 13 Apr 2017 08:36:20 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58537-master' of git://github.com/damyon/moodle
commit 1ad2ff0404127911b9d6ac268b799e587fd3314b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 11 Apr 2017 11:51:59 +0800
Tag: v3.3.0-beta
Merge branch 'wip-MDL-57616-master' of git://github.com/marinaglancy/moodle
commit 9b18c0e075beb71912c9e838e7ef1a46723fae20
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 11 Apr 2017 11:15:32 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58461-master' of git://github.com/damyon/moodle
commit f669ad5ca75b15770c6582b44debce800a136b31
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 11 Apr 2017 09:46:04 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58552-master' of git://github.com/damyon/moodle
commit 23605e9fbc103a971961a553da8617c36efa5527
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 11 Apr 2017 08:57:30 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58504_master' of git://github.com/markn86/moodle
commit 18baa6c9566116f7688ffb848360f7edb9dac333
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 11 Apr 2017 08:43:36 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57290_master' of https://github.com/nadavkav/moodle
commit 137ea0572da07803b1360c0076827c42890dfdc7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 10 Apr 2017 13:37:06 +0800
Tag: v3.3.0-beta
Merge branch 'wip-MDL-58180-master' of git://github.com/marinaglancy/moodle
commit 17cc2842a774e53a8be589df6ace90c45a592c38
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 10 Apr 2017 13:35:36 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58359-master' of git://github.com/damyon/moodle
commit 3afd529013d5860faaedde8ce777174814fa3748
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 10 Apr 2017 13:20:13 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57393-master' of git://github.com/jleyva/moodle
commit 04e45e8e25b0b4380d1aaad0965dfcd76cce9270
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 10 Apr 2017 13:16:29 +0800
Tag: v3.3.0-beta
Merge branch 'master' of https://github.com/tniessen/moodle
commit 3de074e4bf455e1cbd033cbe139efe35204ae743
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 10 Apr 2017 12:00:59 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58311_master' of https://github.com/sk-unikent/moodle
commit 1adae8544816907f2093f768cb51049096940237
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 10 Apr 2017 11:54:09 +0800
Tag: v3.3.0-beta
Merge branch 'wip-mdl-58068' of https://github.com/rajeshtaneja/moodle
commit b140b13c251a0574d3b5ace5945a7be6cd42e4ee
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 10 Apr 2017 11:23:37 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58453-master' of git://github.com/jleyva/moodle
commit ffc4b7e4af3b78a51da4991ebe766d7b5bb80993
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 06 Apr 2017 13:24:05 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-55611_master' of git://github.com/markn86/moodle
commit 97f17c049058572fb59a72c5feed11b766973bb4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 06 Apr 2017 11:54:58 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58220-master-fix4' of http://github.com/damyon/moodle
commit 3e577638332a87a3f7c4c48cae536e24acd461a0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 06 Apr 2017 09:02:36 +0800
Tag: v3.3.0-beta
Merge branch 'wip-MDL-23919-master' of https://github.com/marinaglancy/moodle
commit 00aa58eb5fc8e134c5d58fd0ad214e73ad508b1c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 05 Apr 2017 15:49:49 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle
commit c254588732175ea8d2f17ee365adce44d18e6252
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 05 Apr 2017 15:19:58 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58361-master' of https://github.com/xow/moodle
commit c46ae2fbc113a843359294bb1b8d20a7a7f37662
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 05 Apr 2017 15:04:44 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58361-master' of https://github.com/xow/moodle
commit 3aa424703b95a10d98cabc8c84f9fb9cee52d749
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 05 Apr 2017 14:43:13 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58220-master-fix2' of http://github.com/damyon/moodle
commit 941cb7ce3c0692f6ec9a819630c0c6db081caabc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 05 Apr 2017 14:22:39 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle
commit 2a44422e54c6314d991e3d1328354f7dd128fdeb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 05 Apr 2017 12:56:01 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58220-master-fix1' of http://github.com/damyon/moodle
commit 038db9734f3dc5f2895b718f07ab94426e0aa9f2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 05 Apr 2017 12:29:13 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58444-master' of git://github.com/jleyva/moodle
commit e31dba2c8ded05daacdbf19b5d608c1ae2277b27
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 05 Apr 2017 11:13:31 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-12689_master' of https://github.com/markn86/moodle
commit 04056e715b5f560312bc8c5efd3a1d7b6eb8de69
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 05 Apr 2017 09:56:29 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-51998_master' of https://github.com/nadavkav/moodle
commit 930cab683d5bc5f9dab6f835bcb71fa464329248
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 04 Apr 2017 11:48:50 +0800
Tag: v3.3.0-beta
Merge branch 'master' of https://github.com/koennys/moodle
commit a9bca28400da360d68a4f622e93988c610203cfe
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 04 Apr 2017 10:43:41 +0800
Tag: v3.3.0-beta
Merge branch 'wip-MDL-41809-master' of git://github.com/marinaglancy/moodle
commit 23f1f5211ef56b7db7fdb2acf5cbd4b048f98994
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 04 Apr 2017 10:37:26 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-48771-squashed' of git://github.com/timhunt/moodle
commit 6fdf167b0f2c9dd4e3accd951faeaf874d2ebc5d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 03 Apr 2017 15:38:53 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-50970-master' of git://github.com/jleyva/moodle
commit 3d85d1685d43126c1e582784b96b40845b24a35e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 23 Mar 2017 11:51:50 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57429-master-fix' of https://github.com/snake/moodle
commit 85ead19b34a241488fd9b366ef1c3c433d83a328
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 23 Mar 2017 11:33:11 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-40759-master-fix3' of http://github.com/damyon/moodle
commit afc8dc90fc446b1576de11de0449e75a784a1b5e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 21 Mar 2017 11:31:26 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-40759-master-fix1' of http://github.com/damyon/moodle
commit 2154c9824d6231ad084b6e65e6cd7b15f92a663d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 20 Mar 2017 13:57:38 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-40759-master' of git://github.com/damyon/moodle
commit 640b8efad85ca2e4b54e3c7f5568d6b08f97ec20
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 20 Mar 2017 08:16:07 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57429-master' of https://github.com/snake/moodle
commit 9c2ca400417f5f1b3654d19966a5848d456298ba
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 16 Mar 2017 07:58:08 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57643-master' of git://github.com/jleyva/moodle
commit eb6f04732aaa1b8a061c8d073a4cd4e836801796
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 16 Mar 2017 07:39:48 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57913_auth_db_sync_task_master' of git://github.com/gthomas2/moodle
commit 6fcdbc79121dded630b9e7070dd0caf971251cfd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 15 Mar 2017 14:44:17 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57658-master-integration-fix-2' of git://github.com/junpataleta/moodle
commit 5fba3bd7af3461cd301aa93b2ce359d356c77fb6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 15 Mar 2017 14:31:49 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-55528-master-fix' of git://github.com/andrewnicols/moodle
commit 484eeebc4866c2f04aae36a87fda7c05aed7f4c2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 15 Mar 2017 11:42:28 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57658-master-integration-fix' of git://github.com/junpataleta/moodle
commit ef452d9cbc3ab45d5a0d1692c5d6c18e8bba5251
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 15 Mar 2017 11:17:49 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-47354_gradereport_singleview_perpage' of git://github.com/davosmith/moodle
commit 594ada13c23e82835e705d6f4484a1647f5e18a5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 14 Mar 2017 13:31:43 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57751-master' of https://github.com/xow/moodle
commit ada10e7c185c3a8a616ab41892e6463396910618
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 14 Mar 2017 12:28:52 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57583-master' of https://github.com/snake/moodle
commit 224853595c255d880bf424bdf994bb007dbc141f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 14 Mar 2017 12:10:56 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58217-master' of git://github.com/jleyva/moodle
commit 0c6435838a88b456dfaed2ab179e5821ce239ad0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 14 Mar 2017 11:25:01 +0800
Tag: v3.3.0-beta
Merge branch 'wip-mdl-58250' of https://github.com/rajeshtaneja/moodle
commit 4c6edf9dd8f811a5a0e75d23206a55eea5f539e5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 13 Mar 2017 08:40:45 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-51853_m33v3' of https://github.com/sbourget/moodle
commit aabe41f35997ffa053659b1cf7dc323d1c2cd5da
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 10 Mar 2017 12:18:20 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-55956-master-integration' of git://github.com/junpataleta/moodle
commit 5286837617974454c4e13e69c74278cf4500aca7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 08 Mar 2017 16:32:33 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle
commit ef607980cfb11e37c5562f3c33e3181cafadd136
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 08 Mar 2017 15:59:25 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57914-master' of git://github.com/jleyva/moodle
commit c742c61956449d7fc4b335421f9f7cddc62cfdb1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 08 Mar 2017 12:02:17 +0800
Tag: v3.3.0-beta
Merge branch 'wip-mdl-57940' of https://github.com/rajeshtaneja/moodle
commit e2310e4361b244813d8698cdfc79ba4f3b8792a1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 08 Mar 2017 11:54:24 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57975-master' of git://github.com/ryanwyllie/moodle
commit 0c90bfe39bde89f51bd2d55ec25b9624461b9d4c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 07 Mar 2017 14:35:00 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57972-master' of git://github.com/ryanwyllie/moodle
commit 342af35ab8c755a903590cd6b3f17eacf90958c1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 07 Mar 2017 12:07:50 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle
commit 7b0a41447aa17d0af13eaa555e0d71a7e31ee1b0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 01 Mar 2017 11:09:38 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58072_master_tabtree_mustache' of https://github.com/mchurchward/moodle
commit e890de55313819437ec0d7ab5a8f7dc7817a93ae
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 01 Mar 2017 09:31:45 +0800
Tag: v3.3.0-beta
Merge branch 'm33_MDL-57789_Add_Cache_Control_Immutable_Support' of https://github.com/scara/moodle
commit b6cab2b50515d15fdc48eb541625f2bd7d6dd3b1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 28 Feb 2017 12:19:33 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58038-master-3' of https://github.com/snake/moodle
commit 3c395fe4865c380fd15f20a0a5aa5a5e3e585118
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 28 Feb 2017 10:33:40 +0800
Tag: v3.3.0-beta
Merge branch 'master' of git.in.moodle.com:moodle/integration; branch 'MDL-35980-master' of git://github.com/snake/moodle
commit d28357fbca36229652c96360b1e4c4d8cee8e743
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 28 Feb 2017 09:43:14 +0800
Tag: v3.3.0-beta
Merge branch 'wip-MDL-55547-master' of git://github.com/marinaglancy/moodle
commit d9a5f820861a71a8c36600ca03787ae358e245fd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 27 Feb 2017 15:20:28 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-53978-render-callbacks' of https://github.com/brendanheywood/moodle
commit 71cc1e529d8670ac19330705a92e9f822f178a3b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 27 Feb 2017 13:42:55 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-50719-fast-locks' of https://github.com/brendanheywood/moodle
commit 696099b94f662fce70808ddeee1808b57d4087b5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 27 Feb 2017 11:58:23 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-35980-master' of git://github.com/snake/moodle
commit 50d567767cf64bca3ad15fda92cd317f4fcd3617
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 27 Feb 2017 11:45:30 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-58032-master' of git://github.com/ankitagarwal/moodle
commit eccbea3dd0042fc6f3fed2d6fe67aaca10e93b8e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 27 Feb 2017 10:40:21 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-33483_m33v2' of https://github.com/sbourget/moodle
commit ea6eb1cc482b71bbfb1915dd0346442cc1e5e16e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 02 Feb 2017 09:18:17 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57630-m' of https://github.com/micaherne/moodle
commit 22f93579fa7c08e13705f3170dff7cbade0f33ea
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 31 Jan 2017 13:21:35 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57638_rss_skip' of git://github.com/davosmith/moodle
commit 7a2121d7f2847b694035668f1115786595d2326e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 31 Jan 2017 12:19:13 +0800
Tag: v3.3.0-beta
Merge branch 'wip-MDL-57785-master' of git://github.com/amygroshek/moodle
commit ca12fb5458be2325d5d4e0b376c5c16c5f1ba978
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 31 Jan 2017 12:10:48 +0800
Tag: v3.3.0-beta
Merge branch 'master_MDL-56808' of git://github.com/danmarsden/moodle
commit 88107dc944b206557c4b0985d03258f36557ca22
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 31 Jan 2017 11:43:38 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-35978-master-blockfix' of https://github.com/snake/moodle
commit b462c655dcfddab8a7d0ffb7d80bf42ee2aa1177
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 31 Jan 2017 09:00:34 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57410-master' of git://github.com/jleyva/moodle
commit f417416cf11631b14109aca0fdddeaecf4709bd6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 31 Jan 2017 08:35:41 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57296-master' of git://github.com/ankitagarwal/moodle
commit 746372776104c548dc67602c52cb24053985265a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 30 Jan 2017 13:56:16 +0800
Tag: v3.3.0-beta
Merge branch 'wip-MDL-57568-master' of git://github.com/abgreeve/moodle
commit ae099a2a1dbaa2dc78d48bc6afd49f571d883288
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 25 Jan 2017 08:48:27 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57273-master' of git://github.com/damyon/moodle
commit 34dc92849f7116192ab3e805f7e5a37c9b3186a7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 24 Jan 2017 14:57:53 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57550-master' of git://github.com/danpoltawski/moodle
commit d68d5ce33740449a623ff089847d58143a026277
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 24 Jan 2017 13:26:47 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-50547-master' of git://github.com/jleyva/moodle
commit 6b8e5ce30787843ef94d4900b580efa3108e2bcb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 24 Jan 2017 13:01:45 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57408-master' of git://github.com/jleyva/moodle
commit 214eef2e1aef63eea02a4191bf3a3e38ae485274
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 24 Jan 2017 08:47:54 +0800
Tag: v3.3.0-beta
Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle
commit 80409ac1b5254d5a58b5a28a9a605185e1338042
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 19 Jan 2017 12:17:44 +0800
Tag: v3.3.0-beta
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
commit 22f1426b447a00c079152a8e07a44d0e12d53cab
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 18 Jan 2017 16:00:06 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle
commit 93c15c77d777897930afc7e04c68258b2333c459
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 18 Jan 2017 12:51:59 +0800
Tag: v3.3.0-beta
Merge branch 'wip-mdl-45821' of https://github.com/rajeshtaneja/moodle
commit 81c226d451017aa5e560a3a3c788a2da55f41bdb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 18 Jan 2017 12:36:45 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57634-m' of https://github.com/micaherne/moodle
commit 40566af6d5b70d033ecaf2ab0c477d0277132fe1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 18 Jan 2017 12:09:20 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57490-master' of git://github.com/danpoltawski/moodle
commit 3dc330593694eb117b14ff499c19f5049acc1150
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 18 Jan 2017 08:36:58 +0800
Tag: v3.3.0-beta
Merge branch 'wip_MDL-57590_master_forum_search' of https://github.com/mchurchward/moodle
commit 2156bb454cd6e52f5cf619d8cd313f4202118b8b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 18 Jan 2017 07:46:02 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-42266_m33v2' of https://github.com/sbourget/moodle
commit 703b6debe62445aa1c1210a1454dee725acdbb88
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 15 Dec 2016 11:34:48 +0800
Tag: v3.3.0-beta
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
commit 374d7af2ebffa1dde3c322408e89b978c85e6b58
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 14 Dec 2016 09:55:34 +0800
Tag: v3.3.0-beta
Merge branch 'wip-mdl-57380' of https://github.com/rajeshtaneja/moodle
commit 428e18ed2b9fbd8737be49b6d3667f733e532c37
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 14 Dec 2016 09:26:10 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-55062_master' of git://github.com/markn86/moodle
commit 01c7c3d8fb347675ee3b4c19432b90f0cb30fb8b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 13 Dec 2016 13:06:18 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57213-master-2' of git://github.com/junpataleta/moodle
commit 08f96ac9d718d7e9d4e6ba6672bfeb5774dd9585
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 13 Dec 2016 10:37:38 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57056_master' of https://github.com/nadavkav/moodle
commit 106c8026d1c75adc42dab25f288ecf8e65157a3e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 13 Dec 2016 10:25:30 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57222_master' of git://github.com/markn86/moodle
commit c8c3df53bb9d5f0e14bb4c09ee486c5725119249
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 12 Dec 2016 12:51:19 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-46714-master-nadav' of git://github.com/FMCorz/moodle
commit d52a665eea619fe2106d4b9c0729a477bde56f0d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 08 Dec 2016 13:50:34 +0800
Tag: v3.3.0-beta
Merge branch 'wip-MDL-56614-fix2' of https://github.com/marinaglancy/moodle
commit 64ad7319abf4a4e5fb7d6a090a71ab247093b7d2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 08 Dec 2016 10:44:49 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57278-master-5' of https://github.com/xow/moodle
commit 86f4236cc250b087df80522cff69fcdc28a0f567
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 07 Dec 2016 14:56:49 +0800
Tag: v3.3.0-beta
Merge branch 'wip-MDL-56614-fix' of https://github.com/marinaglancy/moodle
commit 4b2bcd2376e1cbdcade1e9ec18bab660d33c5c98
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 07 Dec 2016 11:53:34 +0800
Tag: v3.3.0-beta
Merge branch 'wip-mdl-56353' of https://github.com/rajeshtaneja/moodle
commit e4621f077580d18c4d051ee4928ec212df3ccfd6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 07 Dec 2016 10:00:30 +0800
Tag: v3.3.0-beta
Merge branch 'wip-MDL-56642-master' of git://github.com/marinaglancy/moodle
commit 75af0aa680ad1b6aed2135d891d382595f4e47bf
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 07 Dec 2016 09:53:16 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57266' of git://github.com/stronk7/moodle
commit 3e9f3e30b2bc5940e1186a1e0082998ee8897098
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 07 Dec 2016 09:50:16 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-56240' of git://github.com/stronk7/moodle
commit 3b8cf77689cc6ba9bf8a6c522daf4e35d13dc22e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 07 Dec 2016 09:42:20 +0800
Tag: v3.3.0-beta
Merge branch 'wip-mdl-56614' of https://github.com/rajeshtaneja/moodle
commit 00f6e2cc52f1c926e7682cdf25debc535dd94480
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 07 Dec 2016 09:00:22 +0800
Tag: v3.3.0-beta
Merge branch 'wip-mdl-57137' of https://github.com/rajeshtaneja/moodle
commit 3bb4ad75215f05de425abc00ae5fbdd216baf1d7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 06 Dec 2016 14:52:32 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57137_question_category_with_parent_category' of https://github.com/melihovv/moodle
commit afecb4dfd511b558e51fcbc3a27d1b6ce7a240e2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 06 Dec 2016 14:34:06 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle
commit 7586a360226042a50ccf1a70625a4acc2c4945c5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 06 Dec 2016 14:10:40 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-56301-master' of https://github.com/snake/moodle
commit 5b67c9ecd173a51c640b93cbaae5b58fc81b47fe
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 06 Dec 2016 13:37:33 +0800
Tag: v3.3.0-beta
Merge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle
commit f3666a1a56c113b55e77b3c00b16b444e4f8f6ff
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 06 Dec 2016 13:06:39 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57161-master' of git://github.com/lameze/moodle
commit 80a35e6d1fa6116d8d8d5048bafa8dbaf545e1c3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 06 Dec 2016 10:16:38 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57255-master' of git://github.com/jleyva/moodle
commit 2e0e081b609dcf5421a79d0565e4fbfb95d2486b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 06 Dec 2016 08:56:27 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-56759-master' of git://github.com/lameze/moodle
commit 8e9cb9b1dd79a6aa6f4a2e9ae5b1400b2aff525c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 05 Dec 2016 15:13:47 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-54921-master' of https://github.com/xow/moodle
commit 405666d3718d187041d52424ada812f7fff1f74f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 05 Dec 2016 13:01:31 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-52840_master' of https://github.com/rezaies/moodle
commit 0dcbbbaa7eb728f2d98db2158b34dfa2f3405261
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 05 Dec 2016 12:26:20 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57084_master' of git://github.com/markn86/moodle
commit feda939e2fa57821a2bdcbc6584d962835954ec1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 05 Dec 2016 12:04:43 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-56893-MOODLE_master-edit-grade-item-bug' of https://github.com/mspall/moodle
commit 8c71e91cdb0044dc54d88e229f0ed4358c5913c1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 05 Dec 2016 08:51:21 +0800
Tag: v3.3.0-beta
Merge branch 'MDL-57265' of git://github.com/stronk7/moodle