David Monllao
e15f9c8cad
Merge branch 'MDL-50631-master-clilogo' of git://github.com/mudrd8mz/moodle
2015-06-22 11:19:07 +08:00
Dan Poltawski
a0dffaa946
MDL-42192 accesslib: tweak get_all_capabilities
...
Tony thinks its bike shed painting, I think its a bit more readable
and memory efficient. I am using integrator dictatorship for sure.
2015-06-18 07:13:37 +02:00
Dan Poltawski
a6661ae013
Merge branch 'capabilities_cache' of git://github.com/tlevi/moodle
2015-06-18 07:13:35 +02:00
Andrew Nicols
40d7ef8231
Merge branch 'wip-MDL-50216-master' of git://github.com/abgreeve/moodle
2015-06-18 07:13:34 +02:00
Andrew Nicols
cd27a8608c
MDL-39353 xmlrpc: Add note to upgrde.txt regarding proxybypass
2015-06-18 07:13:34 +02:00
Andrew Nicols
670befcc0b
Merge branch 'wip-MDL-49667-master' of git://github.com/marinaglancy/moodle
2015-06-18 07:13:32 +02:00
Andrew Nicols
d04e408e38
Merge branch 'php7_reserved_words' of git://github.com/tlevi/moodle
2015-06-18 07:10:38 +02:00
David Mudrák
85f8fe5e1b
MDL-50631 cli: Add a new function to display Moodle ASCII logo
2015-06-17 22:45:48 +02:00
Marina Glancy
034fed3edc
MDL-49667 navigation: allow items without branches in the settings menu
...
also remove the code that adds a "return to XXX user" link that was
supposed to be removed in MDL-23911 , otherwise the link would become
visible after the bug fix (but not functional).
2015-06-16 10:19:52 +08:00
Martin Mastny
78ee66c097
MDL-50216 JavaScript: Default visibility of M.core.info set to false
2015-06-16 09:50:36 +08:00
Dan Poltawski
459fccb791
Merge branch 'MDL-50219-master' of git://github.com/jleyva/moodle
2015-06-15 11:06:09 +01:00
Tony Levi
303936aa57
MDL-50453 core: Replace reserved word usage in progress\null (PHP7)
2015-06-15 12:21:27 +09:30
Andrew Nicols
941420c266
Merge branch 'MDL-50509-master-vartypo' of git://github.com/mudrd8mz/moodle
2015-06-15 09:56:49 +08:00
Andrew Nicols
e9ca711ecc
Merge branch 'MDL-50520-master' of git://github.com/jethac/moodle
2015-06-15 09:08:48 +08:00
Juan Leyva
32fb60e761
MDL-50219 users: Include add_user_private_files in the mobile service
2015-06-14 22:09:28 +02:00
Frederic Massart
6bd5ca3db0
MDL-48618 grades: Do not run minmax upgrade for fresh installs
2015-06-11 17:16:34 +08:00
David Monllao
d8ee571298
MDL-48618 upgrade: Matching conditions and upgrade savepoints
2015-06-11 15:02:06 +08:00
David Monllao
408e3812af
MDL-48618 grades: Forcing new upgrade savepoint
2015-06-11 14:37:31 +08:00
David Monllao
e87acc8386
Merge branch 'MDL-48618-master' of git://github.com/FMCorz/moodle
2015-06-11 14:20:56 +08:00
Eloy Lafuente (stronk7)
b2521cfa45
Merge branch 'MDL-50250-master' of git://github.com/lameze/moodle
2015-06-11 00:32:11 +02:00
Frederic Massart
056aeae8d4
MDL-48618 grades: Test for the minmax upgrade step
2015-06-10 12:33:42 +08:00
Frederic Massart
2eb4a83c29
MDL-48618 grades: Unit tests for grade_grade::get_min/max_grade()
2015-06-10 12:33:41 +08:00
Frederic Massart
ebea19cb26
MDL-48618 grades: Handling of inconsistencies due to min/max grades
2015-06-10 12:33:41 +08:00
Eloy Lafuente (stronk7)
28ddf1e94d
Merge branch 'MDL-47480-master' of git://github.com/ankitagarwal/moodle
2015-06-10 00:32:10 +02:00
Eloy Lafuente (stronk7)
75704fe6b8
Merge branch 'wip-MDL-28954-master' of https://github.com/marinaglancy/moodle
2015-06-10 00:23:20 +02:00
Dan Poltawski
39e8ff6226
Merge branch 'MDL-50186-master' of git://github.com/mastnym/moodle
2015-06-09 13:28:16 +01:00
Jetha Chan
e37d53dac1
MDL-50520 templates: fix helpers not firing inside pix helper
2015-06-09 15:23:04 +08:00
Eloy Lafuente (stronk7)
b26f8af988
MDL-48470 strings: Fix unit tests by moving to another string.
2015-06-08 22:53:06 +02:00
Eloy Lafuente (stronk7)
6422f03f15
Merge branch 'MDL-50442-master' of git://github.com/jleyva/moodle
2015-06-08 18:21:31 +02:00
David Mudrák
cdc6938bf9
MDL-50509 datalib: Fix the typo in the variable name
...
The line is supposed to sanitize the function parameter.
2015-06-08 11:14:08 +02:00
Marina Glancy
6218473334
MDL-28954 cohorts: support files in cohort descriptions
2015-06-08 09:18:45 +08:00
Eloy Lafuente (stronk7)
208ebc5cd1
Merge branch 'MDL-50456-master' of git://github.com/damyon/moodle
2015-06-07 21:56:18 +02:00
Eric Merrill
c07775dfff
MDL-48618 gradebook: Only use individual min/max for aggrigate grades
2015-06-05 17:05:24 +08:00
Juan Leyva
ceac202f64
MDL-50442 ws: Add core_user_get_users_by_field to the mobile service
2015-06-04 22:02:04 +02:00
Rajesh Taneja
7deb61e7c0
MDL-47995 lib: encode title properly, before additing it to image title
2015-06-04 11:13:00 +08:00
Dan Poltawski
21313019d9
Merge branch 'MDL-46294-master' of git://github.com/ankitagarwal/moodle
2015-06-03 08:53:19 +01:00
Damyon Wiese
2139d7995b
MDL-50456 Javascript: Fix simple logic error in core/url amd module
2015-06-03 14:21:03 +08:00
Ankit Agarwal
28ac49c899
MDL-46294 completion: Final deprecation of get_incomplete_criteria
2015-06-03 07:36:40 +05:30
Dan Poltawski
38414e965c
Merge branch 'MDL-50009-m' of https://github.com/micaherne/moodle
2015-06-02 14:42:21 +01:00
Dan Poltawski
f272503420
Merge branch 'MDL-50260-remove-code-optional_param' of git://github.com/tmuras/moodle
2015-06-02 14:22:59 +01:00
Dan Poltawski
09bc038674
Merge branch 'MDL-49793-master' of git://github.com/jleyva/moodle
2015-06-02 14:01:05 +01:00
Dan Poltawski
356fd5bae7
Merge branch 'm29_MDL-49628a' of https://github.com/totara/moodle
2015-06-02 13:54:01 +01:00
Dan Poltawski
ca5c7d7535
Merge branch 'MDL-30960_master' of https://github.com/danielneis/moodle
2015-06-02 11:42:10 +01:00
Dan Poltawski
554dedf6a6
Merge branch 'MDL-46927_master' of git://github.com/markn86/moodle
2015-06-02 09:03:43 +01:00
Tomasz Muras
88661686aa
MDL-50250 core_lib: Remove obsolete param from p() method.
...
Obsolete param $obsolete is not used anywhere and can be removed.
Also small fix in wording in related documentation.
2015-06-02 15:51:13 +08:00
Mark Nelson
94f78b0d15
MDL-46927 core_files: fixed issue with system course restores
...
When clicking on 'Restore' next to a file in the 'Course
backup area' in the system context the message 'Sorry,
the requested file could not be found' was displayed.
This fix adds missing functionality to the class
'file_info_context_system' so that the file information
is correctly returned.
2015-06-01 23:08:40 -07:00
Ankit Agarwal
c44b4213e6
MDL-47480 tasks: Define order for getting tasks
2015-06-02 08:08:04 +05:30
Dan Poltawski
6395168b67
Merge branch 'MDL-50304_master' of https://github.com/jinhofer/moodle
2015-06-01 13:21:54 +01:00
Juan Leyva
752036b826
MDL-49793 url: New Web Service mod_url_view_url
2015-06-01 13:46:22 +02:00
Dan Poltawski
0800e9637c
Merge branch 'MDL-46479-master' of git://github.com/ankitagarwal/moodle
2015-06-01 12:36:25 +01:00