mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity
79,580 Commits 37 Branches 536 Tags
Commit Graph

2431 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
bdce994c5f Merge branch 'MDL-50267-master' of git://github.com/junpataleta/moodle 2016-07-27 00:59:19 +02:00
Eloy Lafuente (stronk7)
f9c46195e4 Merge branch 'MDL-54657_m32v1' of https://github.com/sbourget/moodle 2016-07-26 19:56:20 +02:00
Jun Pataleta
fb77333453 MDL-50267 lang: Remove deprecated strings in 2.9 2016-07-26 16:03:32 +08:00
Dan Poltawski
eab9f3d32e Merge branch 'wip-mdl-54977' of https://github.com/rajeshtaneja/moodle 2016-07-18 13:27:48 +01:00
Stephen Bourget
25d8a63a4e MDL-54657 Behat: Add tests for section_links block 2016-07-13 21:38:31 -04:00
JD
560cea838b MDL-54977 blocks_navigation: Use html_writer::random_id for id 
uniqid() may returns the same id for faster machines (seen on iis)
so use html_writer::random_id(), to ensure id is different and
navigation don't break
 2016-07-13 14:04:16 +08:00
David Monllao
b60d4fca13 Merge branch 'MDL-55048-master' of git://github.com/danpoltawski/moodle 2016-07-12 12:20:35 +02:00
Dan Poltawski
9b62a3eb71 MDL-55048 js: rebuilt files with new version of uglifyjs 2016-07-11 15:53:10 +01:00
Stephen Bourget
03064d6a89 MDL-54891 Block_activity_results: Allow admin defaults 2016-07-08 05:10:27 +00:00
Eloy Lafuente (stronk7)
0f20bf7507 Merge branch 'wip-mdl-54589-mac' of https://github.com/rajeshtaneja/moodle 2016-06-22 01:42:15 +02:00
Eloy Lafuente (stronk7)
e822312af3 Merge branch 'MDL-54939-master' of git://github.com/danpoltawski/moodle 2016-06-21 20:00:36 +02:00
Rajesh Taneja
f55d87c55c MDL-54589 behat: Fixed failures for phantomjs standalone 2016-06-20 16:03:36 +08:00
Dan Poltawski
c96f55e6f9 MDL-54939 amd: fix lint issues 
Mostly correcting jsdoc, some other line wrapping rules and empty
functions.
 2016-06-17 09:03:18 +01:00
Dan Poltawski
f3ac852859 MDL-54652 block_community: remove unused css 
Fixing lint errors
 2016-06-16 20:49:04 +01:00
Dan Poltawski
35be582696 MDL-54939 amd: Fix lint issues fixable with eslint --fix 2016-06-16 19:33:00 +01:00
Dan Poltawski
0fd08fc7e5 Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle 2016-06-16 09:04:12 +01:00
Dan Poltawski
7d78a2eee2 Merge branch 'MDL-54563-master' of git://github.com/cameron1729/moodle 2016-06-16 09:04:12 +01:00
Dan Poltawski
435fb13814 Merge branch 'MDL-54617-master' of git://github.com/cameron1729/moodle 2016-06-16 09:04:10 +01:00
Dan Poltawski
b08523598b Merge branch 'MDL-54622_m32v1' of https://github.com/sbourget/moodle 2016-06-16 09:04:09 +01:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible. 
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
 2016-06-10 08:06:49 +10:00
Eloy Lafuente (stronk7)
31220d5a26 Merge branch 'MDL-54739-master' of git://github.com/lameze/moodle 2016-06-07 00:04:59 +02:00
Frederic Massart
ac032e0e09
MDL-41922 mod_quiz: Don't report quiz due when an attempt was finished 2016-06-03 14:52:34 +08:00
Simey Lameze
f49a3e1791 MDL-54739 blocks: fix activity chooser link alignment 
Thanks Ryan Wyllie for the help.
 2016-06-03 10:55:52 +08:00
Andrew Nicols
05263307d7 MDL-54722 javascript: Add YUI depend wrapper to global event 2016-06-02 10:07:56 +08:00
Andrew Nicols
69dcebb04d Merge branch 'MDL-54722-master' of git://github.com/cameron1729/moodle 2016-06-01 12:24:14 +08:00
Stephen Bourget
5b40141f6d MDL-54563 Block: Only Allow completion blocks on course pages 2016-06-01 10:42:01 +08:00
Cameron Ball
fd5466af99 MDL-54722 navigation: Properly overflow expanded nav trees 2016-06-01 10:15:22 +08:00
Andrew Nicols
e68dabc756 Merge branch 'MDL-53598-master' of git://github.com/marinaglancy/moodle 2016-06-01 08:02:32 +08:00
Marina Glancy
9c3710854b MDL-53598 block_glossary_random: do not fail if glossary was deleted 
This commit refactors how associated glossary is searched for and removes
unnecessary DB queries. Also prevents from situations when the global glossary or course have
been deleted
 2016-05-31 15:30:41 +08:00
Andrew Nicols
b29d2b2aa8 Merge branch 'MDL-54655_m32v1' of https://github.com/sbourget/moodle 2016-05-31 13:29:48 +08:00
David Monllao
ba4cd26414 Merge branch 'MDL-53851-master' of https://github.com/blckct/moodle 2016-05-31 11:46:09 +08:00
Andrew Nicols
73b0dcb106 Merge branch 'MDL-54579_m31v1' of https://github.com/sbourget/moodle 2016-05-31 11:18:27 +08:00
David Monllao
abd5f819d0 Merge branch 'MDL-54002_m32v3' of https://github.com/sbourget/moodle 2016-05-30 16:08:53 +08:00
David Monllao
7e93c2e6f6 Merge branch 'MDL-54577-master' of git://github.com/cameron1729/moodle 2016-05-30 15:45:47 +08:00
Stephen Bourget
18875f811a MDL-54655 Behat: Tests for the online_users block 2016-05-27 18:21:25 -04:00
Daniel Neis Araujo
4b2dbdecd1 MDL-54617 block_online_users: Always show count of online users 2016-05-26 10:24:30 +08:00
Stephen Bourget
71b1761337 MDL-54577 Behat: Add tests for messages block 2016-05-26 10:21:07 +08:00
Marina Glancy
c0e3e9da37 MDL-54116 block_comments: warnings when commenting outside of a course 2016-05-26 10:19:31 +08:00
Stephen Bourget
f2778cc5d6 MDL-54116 block_comments: behat test 2016-05-26 10:19:31 +08:00
Jakub Kania
10186fe83d MDL-53851 news block: Display news from all the accessible groups 2016-05-25 16:54:45 +02:00
Stephen Bourget
1633ec89ad MDL-54002 Behat: tests for recent blogs block 2016-05-24 12:42:31 -04:00
David Monllao
170402cb4e Merge branch 'MDL-54664-master' of git://github.com/junpataleta/moodle 2016-05-23 09:50:44 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
Jun Pataleta
16fb3f4505 MDL-54664 blocks_lp: Set the layout of to review pages to standard 2016-05-20 16:58:54 +08:00
David Monllao
3d562d19b9 Merge branch 'MDL-54609-master' of git://github.com/junpataleta/moodle 2016-05-20 09:22:07 +08:00
David Monllao
c879ff69f4 Merge branch 'MDL-54640_master' of git://github.com/dmonllao/moodle 2016-05-20 09:04:05 +08:00
Rajesh Taneja
442a3651ec MDL-54640 behat: add 1 sec delay before running tasks 
Also just execute task, as running whole cron is not
required
 2016-05-20 09:02:11 +08:00
Stephen Bourget
195b9ebb7c MDL-54579 Behat: tests for the private_files block 2016-05-19 20:01:55 -04:00
Jun Pataleta
d4b91dab8a MDL-54609 blocks_navigation: Fix display of navigation nodes 
* Used jQuery.append() instead of jQuery.text() to append the node's
  name so that it won't be escaped twice since the name is already being
  escaped in the server side via htmlentities.
 2016-05-19 20:43:54 +08:00
David Monllao
ca7b16fa70 Merge branch 'MDL-54638' of git://github.com/stronk7/moodle 
Conflicts:
	mod/lti/version.php
 2016-05-19 13:47:22 +08:00