David Monllao
a2ccbae441
Merge branch 'MDL-57685_master' of git://github.com/dmonllao/moodle
2017-03-21 10:54:44 +01:00
Juan Leyva
f4d0909fc0
MDL-57685 mod_lesson: New Web Service mod_lesson_get_pages
2017-03-21 10:53:35 +01:00
Eloy Lafuente (stronk7)
4d505af519
Merge branch 'MDL-55267-master-deprecation' of https://github.com/marcusgreen/moodle
2017-03-21 10:18:56 +01:00
Juan Leyva
e8eb889326
MDL-57162 tool_mobile: Native app banners for Android
2017-03-21 10:07:21 +01:00
Juan Leyva
6d21073b08
MDL-58227 mod_feedback: Delete duplicated completions records
...
This commit also fixes the way the previous completion record was
fetched to avoid the creation of new duplicates.
2017-03-21 09:46:44 +01:00
Dan Poltawski
dca0ea03b1
Merge branch 'MDL-58317-master' of git://github.com/damyon/moodle
2017-03-21 08:03:42 +00:00
David Monllao
67b09d8323
Merge branch 'MDL-37168-master-fix' of git://github.com/xow/moodle
2017-03-21 07:14:05 +01:00
Andrew Nicols
afc8dc90fc
Merge branch 'MDL-40759-master-fix1' of http://github.com/damyon/moodle
2017-03-21 11:31:26 +08:00
Damyon Wiese
dc633a24b9
MDL-40759 fontawesome: lang strings comments
2017-03-21 11:13:43 +08:00
Damyon Wiese
7e8940b544
MDL-40759 fontawesome: Use a cache
...
Cache the callback info.
2017-03-21 10:51:41 +08:00
John Okely
cd9b8f4e57
MDL-37168 mod_lti: Fix rename behat
2017-03-21 10:29:50 +08:00
Eloy Lafuente (stronk7)
79262cb681
Merge branch 'MDL-57840-33-get_users_by_field' of https://github.com/roperto/moodle
2017-03-21 01:05:47 +01:00
Eloy Lafuente (stronk7)
592cdff297
Merge branch 'MDL-57815-master' of git://github.com/jleyva/moodle
2017-03-21 00:48:44 +01:00
Juan Leyva
10948ae133
MDL-57823 mod_feedback: Implement the check_updates callback
...
- added a mini version bump.
- fix some conflicts.
- fix phpdoc @version
2017-03-20 20:12:54 +01:00
Eloy Lafuente (stronk7)
beff62f6ec
Merge branch 'MDL-57814-master' of git://github.com/jleyva/moodle
2017-03-20 18:00:48 +01:00
Eloy Lafuente (stronk7)
74ccc7768e
Merge branch 'MDL-57916-master' of git://github.com/jleyva/moodle
...
Mini bump version in merge...
2017-03-20 17:53:02 +01:00
Eloy Lafuente (stronk7)
d8c8082998
Merge branch 'MDL-57811-master' of git://github.com/jleyva/moodle
2017-03-20 17:39:53 +01:00
AMOS bot
5bc1692b50
Automatically generated installer lang files
2017-03-21 00:04:03 +08:00
Dan Poltawski
7bb2eafe9c
Merge branch 'MDL-58262-master' of git://github.com/merrill-oakland/moodle
2017-03-20 15:19:55 +00:00
Dan Poltawski
230216803c
Merge branch 'wip-mdl-58261-m' of https://github.com/rajeshtaneja/moodle
2017-03-20 13:51:30 +00:00
Dan Poltawski
83a6b8c48c
Merge branch 'MDL-58050-master-msgtrans' of git://github.com/mudrd8mz/moodle
2017-03-20 13:19:22 +00:00
Dan Poltawski
57ee1502fd
Merge branch 'MDL-58121-master' of https://github.com/snake/moodle
2017-03-20 13:15:07 +00:00
Dan Poltawski
7d77fb1421
Merge branch 'MDL-58255-master' of git://github.com/junpataleta/moodle
2017-03-20 13:08:54 +00:00
Dan Poltawski
d4d91727bf
Merge branch 'MDL-58263-master' of git://github.com/jleyva/moodle
2017-03-20 11:39:58 +00:00
Eloy Lafuente (stronk7)
ec116fe676
Merge branch 'MDL-57812-master' of git://github.com/jleyva/moodle
2017-03-20 12:35:43 +01:00
Dan Poltawski
5de6c5dc3b
Merge branch 'MDL-57838-master' of git://github.com/jleyva/moodle
2017-03-20 11:27:04 +00:00
Dan Poltawski
d9b094a31d
Merge branch 'MDL-58273-master-ldapenrol' of git://github.com/mudrd8mz/moodle
2017-03-20 11:09:33 +00:00
David Monllao
2ddcf27219
Merge branch 'MDL-57665_master' of git://github.com/dmonllao/moodle
2017-03-20 11:25:09 +01:00
David Monllao
c12578d3a2
Merge branch 'MDL-57664_master' of git://github.com/dmonllao/moodle
2017-03-20 11:20:22 +01:00
Juan Leyva
f8edef2e58
MDL-57665 mod_lesson: New WS mod_lesson_get_user_timers
2017-03-20 11:18:34 +01:00
Juan Leyva
592c94f3ba
MDL-57665 mod_lesson: New method for get timers
2017-03-20 11:18:29 +01:00
Juan Leyva
ba6b2c11f6
MDL-57664 mod_lesson: New Ws mod_lesson_get_content_pages_viewed
2017-03-20 11:16:55 +01:00
Juan Leyva
b584c49d03
MDL-57664 mod_lesson: New lesson method get_content_pages_viewed
2017-03-20 11:16:46 +01:00
David Monllao
e11d2d87ff
Merge branch 'MDL-37168-master' of https://github.com/xow/moodle
2017-03-20 10:15:36 +01:00
Dan Poltawski
e8f8594244
Merge branch 'MDL-58285' of https://github.com/NeillM/moodle
2017-03-20 08:53:23 +00:00
Dan Poltawski
11e7eb3088
Merge branch 'MDL-58291-master-unoconvlink' of git://github.com/mudrd8mz/moodle
2017-03-20 08:49:54 +00:00
John Okely
ea1d9f7c86
MDL-37168 grade: Debugging if gradebook callbacks are not both present
2017-03-20 16:02:11 +08:00
John Okely
68e1f52814
MDL-37168 mod_lti: Add behat test to cover lti quick edit
2017-03-20 16:02:11 +08:00
Sam Chaffee
77a827e14d
MDL-37168 mod_lti: Fix LTI activity quick edit title
2017-03-20 16:02:11 +08:00
Dan Poltawski
48f5c05019
Merge branch 'wip-MDL-34859-master' of git://github.com/marinaglancy/moodle
2017-03-20 07:54:22 +00:00
Dan Poltawski
5d8d3a8ce2
Merge branch 'MDL-57657-master' of git://github.com/jleyva/moodle
2017-03-20 07:24:54 +00:00
Darko Miletic
fa0029b11d
MDL-58079 core_enrol: Fixed invalid category tag
2017-03-20 04:09:15 -03:00
Marina Glancy
44e86fb3d5
MDL-34859 backup: add restore defaults
2017-03-20 14:59:45 +08:00
Marina Glancy
f840bf03e0
MDL-34859 course: use defaultcustom element for sections
2017-03-20 14:59:45 +08:00
Marina Glancy
b4eb5f0212
MDL-34859 forms: new element defaultcustom
2017-03-20 14:59:45 +08:00
Andrew Nicols
dfa5d22700
MDL-40759 themes: Correct ignore file whitespace
2017-03-20 14:40:37 +08:00
David Monllao
28b1cc19e7
Merge branch 'MDL-57419-master-2' of https://github.com/xow/moodle
2017-03-20 07:33:25 +01:00
Andrew Nicols
2154c9824d
Merge branch 'MDL-40759-master' of git://github.com/damyon/moodle
2017-03-20 13:57:38 +08:00
David Monllao
72005b6daf
Merge branch 'MDL-57254-master' of git://github.com/jleyva/moodle
2017-03-20 06:48:43 +01:00
Damyon Wiese
8626dc99fa
MDL-40759 fontawesome: Add BC for unmapped icons
...
This is yukky but it works. Note: I had to duplicate the standard pix icon template
inside the font-awesome one because the way this is rendered does not support partials.
2017-03-20 13:47:30 +08:00