20a16512ee
Merge branch 'wip-MDL-49257-master' of git://github.com/marinaglancy/moodle
2015-06-23 11:20:08 +01:00
156d048659
MDL-49257 grades: fix bugs with extra credit weights
...
When we adjust the weights in natural grading (setup screen), the extra credit items
should not depend on other overrides. If extra credit item's weight was overriden, it stays as it is.
Otherwise it is calculated as itemgrademax / totalgrademax (total excludes extra credit items)
2015-06-23 14:25:50 +08:00
866573e02b
Merge branch 'MDL-50491' of git://github.com/stronk7/moodle
2015-06-23 13:31:34 +08:00
54a1ef2655
MDL-50611 testing: Extra http status code checking
2015-06-23 10:34:18 +08:00
8cb6117867
Merge branch 'MDL-50611-master' of git://github.com/LukeCarrier/moodle
2015-06-23 10:25:36 +08:00
7415646bcd
Merge branch 'MDL-50583_master' of git://github.com/dmonllao/moodle
2015-06-22 18:57:35 +02:00
0897e19093
MDL-50611 test: use cURL extension to download Composer
...
The curl binary is nowhere near as common in Windows environments as it is
in Linux and Mac ones. In order to encourage more users to adopt Behat and
PHPUnit for their testing, we should avoid introducing unnecessary
hurdles.
2015-06-22 15:50:01 +01:00
61e4716383
Merge branch 'MDL-50561-master' of git://github.com/jleyva/moodle
2015-06-22 16:02:57 +08:00
336bded4f1
Merge branch 'wip-MDL-50568-master' of git://github.com/marinaglancy/moodle
2015-06-22 15:33:06 +08:00
e15f9c8cad
Merge branch 'MDL-50631-master-clilogo' of git://github.com/mudrd8mz/moodle
2015-06-22 11:19:07 +08:00
2291883052
MDL-50561 messages: Add missing __isset magic method
2015-06-19 09:44:50 +02:00
bf4c3ee0ff
MDL-50481 behat: Press go button for given single select in non-js
...
For non-js mode, ensure we press the go button
for the specified single select, as there can be
multiple single selects on the page with go button
2015-06-19 12:00:11 +08:00
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
a6661ae013
Merge branch 'capabilities_cache' of git://github.com/tlevi/moodle
2015-06-18 07:13:35 +02:00
40d7ef8231
Merge branch 'wip-MDL-50216-master' of git://github.com/abgreeve/moodle
2015-06-18 07:13:34 +02:00
cd27a8608c
MDL-39353 xmlrpc: Add note to upgrde.txt regarding proxybypass
2015-06-18 07:13:34 +02:00
670befcc0b
Merge branch 'wip-MDL-49667-master' of git://github.com/marinaglancy/moodle
2015-06-18 07:13:32 +02:00
d04e408e38
Merge branch 'php7_reserved_words' of git://github.com/tlevi/moodle
2015-06-18 07:10:38 +02:00
0d6f53e8f7
MDL-50491 filters: Some final touches.
...
- Complete the deprecation information to follow the rules.
- Minor tweak to PLAIN tests to have clearer expectations.
- Completely delete get_global_config() from filters, there
was not much utility keeping it there. Note we have opted
for direct deletion because it's private API, not public one
(and searching github/google/docs did not reveal any use
of those functions either, just in case).
2015-06-18 04:11:24 +02:00
85f8fe5e1b
MDL-50631 cli: Add a new function to display Moodle ASCII logo
2015-06-17 22:45:48 +02:00
7d94679ff1
MDL-50491 filters: option to disable some filters in filter_text.
...
This lets you programmatically prevent certain filters running on
certain content.
Also, I created some unit tests for the basic format_text functionality
since there did not seem to be any yet.
2015-06-17 13:48:55 +01:00
a94b2cb873
MDL-50491 admin: new setting class for list of filters.
2015-06-17 13:48:55 +01:00
502561d657
MDL-50491 filters: deprectate old methods & improve comments
...
Two methods relating to the old way of doing format_text caching have
been deprecated.
2015-06-17 13:48:54 +01:00
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
78ee66c097
MDL-50216 JavaScript: Default visibility of M.core.info set to false
2015-06-16 09:50:36 +08:00
459fccb791
Merge branch 'MDL-50219-master' of git://github.com/jleyva/moodle
2015-06-15 11:06:09 +01:00
303936aa57
MDL-50453 core: Replace reserved word usage in progress\null (PHP7)
2015-06-15 12:21:27 +09:30
82cca1ab16
MDL-50583 upgrade: Optimize upgrade_minmaxgrade
...
Reverse join order to use existing database keys. Changed query to use the
more easily read NOT IN.
2015-06-15 10:40:46 +08:00
941420c266
Merge branch 'MDL-50509-master-vartypo' of git://github.com/mudrd8mz/moodle
2015-06-15 09:56:49 +08:00
e9ca711ecc
Merge branch 'MDL-50520-master' of git://github.com/jethac/moodle
2015-06-15 09:08:48 +08:00
32fb60e761
MDL-50219 users: Include add_user_private_files in the mobile service
2015-06-14 22:09:28 +02:00
1d61d56574
MDL-50568 navigation: correct cap check
2015-06-12 10:41:36 +08:00
6bd5ca3db0
MDL-48618 grades: Do not run minmax upgrade for fresh installs
2015-06-11 17:16:34 +08:00
d8ee571298
MDL-48618 upgrade: Matching conditions and upgrade savepoints
2015-06-11 15:02:06 +08:00
408e3812af
MDL-48618 grades: Forcing new upgrade savepoint
2015-06-11 14:37:31 +08:00
e87acc8386
Merge branch 'MDL-48618-master' of git://github.com/FMCorz/moodle
2015-06-11 14:20:56 +08:00
b2521cfa45
Merge branch 'MDL-50250-master' of git://github.com/lameze/moodle
2015-06-11 00:32:11 +02:00
056aeae8d4
MDL-48618 grades: Test for the minmax upgrade step
2015-06-10 12:33:42 +08:00
2eb4a83c29
MDL-48618 grades: Unit tests for grade_grade::get_min/max_grade()
2015-06-10 12:33:41 +08:00
ebea19cb26
MDL-48618 grades: Handling of inconsistencies due to min/max grades
2015-06-10 12:33:41 +08:00
28ddf1e94d
Merge branch 'MDL-47480-master' of git://github.com/ankitagarwal/moodle
2015-06-10 00:32:10 +02:00
75704fe6b8
Merge branch 'wip-MDL-28954-master' of https://github.com/marinaglancy/moodle
2015-06-10 00:23:20 +02:00
39e8ff6226
Merge branch 'MDL-50186-master' of git://github.com/mastnym/moodle
2015-06-09 13:28:16 +01:00
e37d53dac1
MDL-50520 templates: fix helpers not firing inside pix helper
2015-06-09 15:23:04 +08:00
b26f8af988
MDL-48470 strings: Fix unit tests by moving to another string.
2015-06-08 22:53:06 +02:00
6422f03f15
Merge branch 'MDL-50442-master' of git://github.com/jleyva/moodle
2015-06-08 18:21:31 +02:00
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
6218473334
MDL-28954 cohorts: support files in cohort descriptions
2015-06-08 09:18:45 +08:00
208ebc5cd1
Merge branch 'MDL-50456-master' of git://github.com/damyon/moodle
2015-06-07 21:56:18 +02:00
c07775dfff
MDL-48618 gradebook: Only use individual min/max for aggrigate grades
2015-06-05 17:05:24 +08:00
Dan Poltawski