Commit graph

75230 commits

Author SHA1 Message Date
Juan Leyva
2291883052 MDL-50561 messages: Add missing __isset magic method 2015-06-19 09:44:50 +02:00
Juan Leyva
3c4d2965de MDL-50171 data: Fixed incorrect text formatting in external functions 2015-06-19 09:43:51 +02:00
David Monllao
a939ae6da7 MDL-50283 gradingform_rubric: Minor styling fixes 2015-06-19 12:44:07 +08:00
Syxton
e22c8d2ae3 MDL-50283 rubric: Add duplicate row button
Adds the ability to duplicate a row in a rubric.
2015-06-19 12:00:23 +08:00
Rajesh Taneja
77f1778c40 MDL-50481 core_grades: Fixed behat feature and step to work with non-js
xPath used in step is not using proper oring
and fails with goutee driver. Also, feature don't
really need to be executed in js, so setting that
as non-js
2015-06-19 12:00:11 +08: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
Mary Evans
3078b980f5 MDL-50460 theme_bootstrapbase: Profile image overlays docked blocks. 2015-06-19 02:46:15 +01:00
AMOS bot
1920f3a35a Automatically generated installer lang files 2015-06-19 00:04:06 +08:00
Dan Poltawski
f4bfbd5aa2 weekly release 3.0dev 2015-06-18 14:03:02 +01:00
Dan Poltawski
096ca66866 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-06-18 14:03:00 +01:00
Skylar Kelty
f936c2a9fa MDL-50637 calendar: Fix subscription table layout 2015-06-18 13:21:33 +01:00
Eloy Lafuente (stronk7)
c13b7bca50 Merge branch 'MDL-50004-M30' of git://github.com/lazydaisy/moodle 2015-06-18 07:25:29 +02:00
Eloy Lafuente (stronk7)
51a09cb43e Merge branch 'MDL-50107-master' of git://github.com/jleyva/moodle 2015-06-18 07:13:40 +02:00
Dan Poltawski
bceaa941c8 Merge branch 'MDL-49959_course_dnd_message' of https://github.com/barrysspace/moodle 2015-06-18 07:13:39 +02:00
Martin Mastny
25bfc7cfc0 MDL-49744 JavaScript: Glossary term window is draggable 2015-06-18 07:13:38 +02:00
Dan Poltawski
4b22fa7996 Merge branch 'MDL-42192-simpledata-unit-test' of git://github.com/dmonllao/moodle 2015-06-18 07:13:37 +02: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
4265cfa557 Merge branch 'MDL-39353' of https://github.com/rtcn2/moodle 2015-06-18 07:13:33 +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
Eloy Lafuente (stronk7)
33e8095d94 Merge branch 'MDL-48283-master' of git://github.com/xow/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
2015-06-18 07:13:10 +02:00
Andrew Nicols
d04e408e38 Merge branch 'php7_reserved_words' of git://github.com/tlevi/moodle 2015-06-18 07:10:38 +02:00
Andrew Nicols
7512af87d4 Merge branch 'MDL-50380-master' of git://github.com/lameze/moodle 2015-06-18 07:10:37 +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
394034ec6e MDL-50631 cli: Display the Moodle ASCII logo in the CLI installer header 2015-06-17 22:48:14 +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
41e5e524f9 MDL-50491 filters: Eliminate un-resettable static caching.
This was breaking unit tests. I think it is no longer necessary since
get_config now has good caching of its own.
2015-06-17 13:48:56 +01: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
Tim Hunt
2ebeeeaf0a MDL-50091 grade singleview: use standard API to build the link
Acutally the necessary code was already there. There was just some
unnecessary code that was added with the issue number MDL-47746. I have
just stripped out the unused code, which fixes the bug where a missing
activity caused a fatal error.
2015-06-17 13:46:04 +01:00
Marina Glancy
5e91f96c92 MDL-50580 signup: move recaptcha outside of category 2015-06-17 11:17:32 +08:00
M Kassaei
ef0a59ab7c MDL-47494 ddimageortext: Fix drag and drop on Android touch devices. #85108
The initial suggestion for how to do this fix came from Davo Smith.
2015-06-16 18:38:56 +01:00
M Kassaei
3f6905b410 MDL-47494 ddwtos: Fix drag and drop on Android touch devices. #85101
The initial suggestion for how to do this fix came from Davo Smith.
2015-06-16 18:25:53 +01:00
M Kassaei
e76deaac51 MDL-47494 ddmarker: Fix drag and drop on Android touch devices. #85111
The original idea for this fix came from Davo Smith.
2015-06-16 18:20:40 +01:00
AMOS bot
f506c4b3bb Automatically generated installer lang files 2015-06-17 00:03:59 +08:00
AMOS bot
34fcf06cae Automatically generated installer lang files 2015-06-17 00:03:58 +08:00
Jetha Chan
affa8c035c MDL-50533 theme_bootstrapbase: retarget collapse styles 2015-06-16 16:28:27 +08: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
28887344d6 Merge branch 'MDL-49368' of git://github.com/timhunt/moodle 2015-06-15 12:14:35 +01:00
Dan Poltawski
846dade5ab Merge branch 'MDL-49098-master' of git://github.com/xow/moodle 2015-06-15 12:12:07 +01:00
Dan Poltawski
459fccb791 Merge branch 'MDL-50219-master' of git://github.com/jleyva/moodle 2015-06-15 11:06:09 +01:00
Andrew Nicols
9cd9a27422 Merge branch 'MDL-50459-master' of git://github.com/jleyva/moodle 2015-06-15 16:02:53 +08:00
Andrew Nicols
951bd98f73 Merge branch 'wip-MDL-50222-master' of git://github.com/marinaglancy/moodle 2015-06-15 15:16:30 +08: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
d0d93a769d Merge branch 'MDL-50438-master' of git://github.com/mastnym/moodle 2015-06-15 10:20:19 +08:00