mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity
74,082 Commits 37 Branches 536 Tags
Commit Graph

74082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
spvickers
01f38dd0e2 MDL-49185 mod_lti: Check for all capabilities 
Added check for explicit and implicit enabled capabilities when parsing
a custom parameter.
 2015-06-23 10:22:41 +08:00
Eloy Lafuente (stronk7)
26adb614ae Merge branch 'MDL-50171-master' of git://github.com/jleyva/moodle 2015-06-23 01:42:47 +02:00
Eloy Lafuente (stronk7)
06ec3e57f1 Merge branch 'MDL-29763_portfolio_description' of git://github.com/davosmith/moodle 2015-06-23 01:39:55 +02:00
Eloy Lafuente (stronk7)
cd1d7c2993 Merge branch 'MDL-50089-master' of git://github.com/merrill-oakland/moodle 2015-06-22 19:58:53 +02:00
Eric Merrill
394ade5f2b MDL-50089 grades: Use grade item min/max in exports 2015-06-22 12:58:40 -04: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
Dan Poltawski
0c689b02fb Merge branch 'MDL-50460_master' of git://github.com/lazydaisy/moodle 2015-06-22 13:29:10 +01:00
Dan Poltawski
bf6395107b Merge branch 'MDL-50091' of git://github.com/timhunt/moodle 2015-06-22 12:06:49 +01:00
David Monllao
15e6543a5f Merge branch 'MDL-50622-master-enfix' of git://github.com/mudrd8mz/moodle 2015-06-22 17:43:56 +08:00
Davo Smith
556e33d77c MDL-49176 gradingform_guide: display newline characters as <br> tags 2015-06-22 10:13:18 +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
502d960528 Merge branch 'wip-MDL-50580-master' of git://github.com/marinaglancy/moodle 2015-06-22 12:48:26 +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
Davo Smith
1a6448fded MDL-29763 portfolio: add helpful description to the page 2015-06-19 14:54:58 +01:00
Tim Hunt
1c733bd604 MDL-50648 grader report: columns misaligned with some permissions 
If a user can see the grader report and singleview report, but not
the user report ($CFG->grade_profilereport) then the colspans
were wrong and so the columns did not line up under the right headers.
 2015-06-19 12:35:54 +01:00
David Mudrák
7e670032bf MDL-50646 admin: Use site default lang as new user's preferred lang 
As a result of MDL-49632, the preferred language is no longer part of
the "Add a new user" form. So the lang property is not passed to the
user_create_user() when creating a new user and the value always falls
back to "en" (which is the default defined in the database for this
column).

This patch makes sure that the site default language is used in such
case.
 2015-06-19 13:25:44 +02:00
Helen Foster
ddef7f7848 MDL-50622 lang: Merge English strings from the en_fix language pack 2015-06-19 12:11:33 +02:00
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
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