20379 Commits

Author SHA1 Message Date
Dan Poltawski
1b80849856 Merge branch 'MDL-47787-master' of https://github.com/tbannister/moodle 2015-06-30 09:52:52 +02:00
Eloy Lafuente (stronk7)
0339f2c4c1 MDL-50688 lib: small cleanup + http/https coverage. 2015-06-29 17:12:55 +02:00
Petr Skoda
5c1f41f058 MDL-50688 lib: fix local url validation bug
Change-Id: I350bb8c9ace5cc0403f083f728c100097be7aa7e
Reviewed-on: https://review.totaralms.com/8101
Tested-by: Jenkins Automation <jenkins@totaralms.com>
Reviewed-by: Sam Hemelryk <sam.hemelryk@totaralms.com>
Reviewed-by: Alastair Munro <alastair.munro@totaralms.com>
2015-06-29 16:44:03 +02:00
Ankit Agarwal
2149326b8c MDL-50049 deprecation: Remove usage of deprecated api and cleanup 2015-06-29 17:15:50 +05:30
Skylar Kelty
56af0fbda8 MDL-50663 blocks: Fix /my/ page when in non-user context 2015-06-29 11:37:10 +01:00
Ankit Agarwal
8322ed4a66 MDL-50049 deprecation: Rearrange deprecated apis for better future management 2015-06-29 11:36:36 +05:30
Ankit Agarwal
33c46db574 MDL-50049 deprecation: Group together long term deprecated apis 2015-06-29 11:36:36 +05:30
Ankit Agarwal
1ac1d29b6d MDL-50049 deprecation: Final deprecation of old apis 2015-06-29 11:36:36 +05:30
Tyler Bannister
7f7144fd50 MDL-47787 course: Added question delete to cm delete. 2015-06-25 16:35:22 -04:00
David Monllao
ed0fd1f6ec MDL-43949 groups: Add idnumber to web services
Thanks to Vitor Martins for his contribution.
2015-06-25 16:55:14 +08:00
Eloy Lafuente (stronk7)
9a1adda585 MDL-49497 curl: keep api private and test it using reflection.
While strictly we should not be testing private APIs, in order
to get this backported to stables without changing visibility
we use reflection to access to such private properties and methods.

Also added one exttest to verify user agent is properly sent.

Finally, fix some wrong whitespace and changed the helper class name
to better alternative.
2015-06-23 17:20:20 +02:00
Dave Cooper
cbb7c6a905 MDL-49497 curl: Add configurable User-Agent unit tests. 2015-06-23 15:59:59 +02:00
Dave Cooper
300fcae31d MDL-49497 curl: Allow configurable User-Agent.
Thanks to Kartik Yadav for assistance with this patch.
2015-06-23 15:59:59 +02:00
Dan Poltawski
20a16512ee Merge branch 'wip-MDL-49257-master' of git://github.com/marinaglancy/moodle 2015-06-23 11:20:08 +01:00
Marina Glancy
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
David Monllao
866573e02b Merge branch 'MDL-50491' of git://github.com/stronk7/moodle 2015-06-23 13:31:34 +08:00
David Monllao
54a1ef2655 MDL-50611 testing: Extra http status code checking 2015-06-23 10:34:18 +08:00
David Monllao
8cb6117867 Merge branch 'MDL-50611-master' of git://github.com/LukeCarrier/moodle 2015-06-23 10:25:36 +08:00
Eloy Lafuente (stronk7)
7415646bcd Merge branch 'MDL-50583_master' of git://github.com/dmonllao/moodle 2015-06-22 18:57:35 +02:00
Luke Carrier
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
David Monllao
61e4716383 Merge branch 'MDL-50561-master' of git://github.com/jleyva/moodle 2015-06-22 16:02:57 +08:00
David Monllao
336bded4f1 Merge branch 'wip-MDL-50568-master' of git://github.com/marinaglancy/moodle 2015-06-22 15:33:06 +08:00
David Monllao
e15f9c8cad Merge branch 'MDL-50631-master-clilogo' of git://github.com/mudrd8mz/moodle 2015-06-22 11:19:07 +08:00
Juan Leyva
2291883052 MDL-50561 messages: Add missing __isset magic method 2015-06-19 09:44:50 +02:00
Rajesh Taneja
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
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
Eloy Lafuente (stronk7)
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
David Mudrák
85f8fe5e1b MDL-50631 cli: Add a new function to display Moodle ASCII logo 2015-06-17 22:45:48 +02:00
Tim Hunt
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
Tim Hunt
a94b2cb873 MDL-50491 admin: new setting class for list of filters. 2015-06-17 13:48:55 +01:00
Tim Hunt
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
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
GeekSmith
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
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
Marina Glancy
1d61d56574 MDL-50568 navigation: correct cap check 2015-06-12 10:41:36 +08: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