mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 10:32:40 +01:00
Code Issues Projects Releases Wiki Activity
72,523 Commits 36 Branches 527 Tags
Commit Graph

2200 Commits

Author SHA1 Message Date
Andrew Nicols
8721ed57a4 MDL-49144 blocks: Add behat test to ensury sanity of block title 2015-03-02 12:09:45 +00:00
Helen Foster
428330da1c MDL-49241 lang: Merge English strings from the en_fix language pack 2015-02-24 11:15:15 +01:00
Eloy Lafuente (stronk7)
438193ef45 Merge branch 'MDL-48910_block_my' of https://github.com/andyjdavis/moodle 2015-02-10 13:14:59 +01:00
Andrew Davis
b6d7cff65f MDL-48910 core_block: user_can_addto() respects applicable formats 2015-02-10 08:07:23 +01:00
Dan Poltawski
c874c3c455 Merge branch 'MDL-48544-master' of git://github.com/andrewnicols/moodle 2015-02-09 22:42:01 +00:00
Eloy Lafuente (stronk7)
bd308dd09f Merge branch '36296-29' of git://github.com/samhemelryk/moodle 2015-02-09 18:09:15 +01:00
Andrew Nicols
4b410a6875 MDL-48544 blocks: Only add docked tags if all blocks are docked 
Previously, if all blocks were hidden, then the region was reported as
being docked eroniously and it was not possible to unhide the blocks.

Docking should have no relation to the presence of block content.
 2015-02-09 20:55:10 +08:00
Sam Hemelryk
892e21aadd MDL-36296 block_navigation: consistency fixes 
This change fixes a couple of consistency issues in the navigation block.
At the same time it fixes it the CSS for the navigation block as it had
really degraded over the last years.
Notable points about this change:

* Fixed icon display by wrapping content in a span allowing columns to
  be styled.
* Re-wrote the CSS entirely as it could be done much better.
* Fixed inconsistencies between the php and JS for rendering nodes.
 2015-02-04 09:04:50 +13:00
Dan Poltawski
8c506dfacd Merge branch 'MDL-48933-master' of git://github.com/FMCorz/moodle 2015-02-03 15:09:33 +00:00
Neill Magill
f95b1e85fb MDL-48865 core_block: Show regions with only hidden blocks when editing 
Before this patch if all the blocks in a block region are set to hidden the region will be docked even when editing is enabled.
This meant that as a user I would need to add a new block to the page and move it to that region via the configuration
menu before I could manipulate the hidden blocks again.
 2015-02-03 16:14:20 +08:00
Frederic Massart
cf4a17cb9b MDL-48933 core_message: New dialog to send a message to a user 2015-02-02 11:03:38 +08:00
Andrew Nicols
557f44d970 MDL-48620 JavaScript: Updated shifted files to comply with coding style 2015-01-23 14:51:24 +08:00
Dan Poltawski
157e267fdd MDL-45295 blocks: added a bit more info to upgrade.txt 2014-12-16 10:49:53 +00:00
Dan Poltawski
a2c3649ecd Merge branch 'MDL-45295-master' of git://github.com/FMCorz/moodle 2014-12-16 10:48:33 +00:00
Frederic Massart
faf87da886 MDL-48496 block_rss_client: Deleting unused string errorloadingfeed 2014-12-11 00:24:07 +01:00
Frederic Massart
b58d8d23f3 MDL-48496 block_rss_client: Do not display curl error messages 2014-12-11 00:24:07 +01:00
Frederic Massart
2c2171bdce MDL-45295 core_block: Removing obsolete method preferred_width() 2014-12-09 15:29:12 +08:00
Sam Hemelryk
3e5f4b2ca9 Merge branch 'wip-MDL-48366-master' of git://github.com/marinaglancy/moodle 2014-12-09 13:43:30 +13:00
Marina Glancy
769496373e MDL-21724 course: fixed wrong string in behat test 2014-12-04 12:14:32 +00:00
Eloy Lafuente (stronk7)
38ea5e0a39 MDL-21724 course: change remaining tests to new "Save and display" 2014-12-04 12:14:31 +00:00
Eloy Lafuente (stronk7)
8b9bb799f9 Merge branch '21724-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:14:29 +00:00
Eloy Lafuente (stronk7)
fca0b79d18 Merge branch '23178-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:14:28 +00:00
Dan Poltawski
7b58b245bf Merge branch 'MDL-40241_master' of https://github.com/dmonllao/moodle 2014-12-04 11:33:27 +00:00
Marina Glancy
1ce4b63bdd MDL-48366 blocks: always display custom regions in dropdown 2014-12-04 16:07:56 +08:00
Sam Hemelryk
24d0d813e9 MDL-21724 course: ability to return when editing/creating 2014-12-03 10:21:54 +13:00
Sam Hemelryk
5d795b5717 MDL-23178 block_site_main_menu: indenting is possible now 2014-12-03 09:54:55 +13:00
Dan Poltawski
b2ab6cc330 Merge branch '27548-29' of git://github.com/samhemelryk/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2014-12-01 12:21:19 +00:00
Sam Hemelryk
602b281dcb Merge branch 'MDL-14402-master' of git://github.com/andrewnicols/moodle 2014-12-01 11:35:44 +13:00
Andrew Nicols
64e7aa4de1 MDL-28286 JavaScript: Convert all uses of M.str to M.util.get_string 2014-12-01 08:32:04 +13:00
Aaron Barnes
525d6ce397 MDL-40241 blocks_completionstatus: Fix notices 2014-11-28 16:52:13 +08:00
Andrew Nicols
29ac5a6bce MDL-14402 blocks: Do not show assign roles on my home 2014-11-26 13:39:44 +08:00
Sam Hemelryk
e020620430 MDL-27548 block_comments: add pagination tests 2014-11-26 13:31:59 +13:00
Eloy Lafuente (stronk7)
4ef19b1789 Merge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle 2014-11-25 18:38:24 +01:00
Rajesh Taneja
8d85156db7 MDL-48302 behat: Reverted temp fix added by MDL-48251 2014-11-21 10:39:42 +08:00
Eloy Lafuente (stronk7)
4067991016 Merge branch '48206-29' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-19 21:28:51 +01:00
Rajesh Taneja
7b9fb265d2 MDL-48251 behat: Shuffling activity creation fix quiz behat 2014-11-19 20:07:07 +01:00
Dan Poltawski
03e93abad8 MDL-48277 css: enable duplicate definitions lint rule 
And remove duplicates found in code which were detected by this rule
(leaving the last rule defined as this would take precidence).

https://github.com/CSSLint/csslint/wiki/Disallow-duplicate-properties
 2014-11-18 22:11:36 +00:00
Sam Hemelryk
2ff98fb6e4 MDL-48206 block_comments: textarea width 100% 2014-11-14 11:40:33 +13:00
Eloy Lafuente (stronk7)
147bae8f7c MDL-48144 upgrade: add v2.8.0 sep lines 2014-11-10 18:08:15 +01:00
Eloy Lafuente (stronk7)
6fdd4633a7 Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-06 11:14:52 +01:00
David Mudrák
6887e2e53e MDL-48035 Fix Behat tests regressions after merging en_fix strings 2014-11-06 10:54:27 +01:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release 
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
 2014-11-04 17:52:35 +01:00
David Monllao
3c26a30799 MDL-47835 block_recent_activity: Same entry keys order 
insert_records() is sensitive to the order of the keys
assigned to the inserted objects (inserted as arrays in
this case). Now keys are assigned using the same order.
 2014-10-29 10:54:11 +08:00
Sam Hemelryk
45ad1693cd MDL-47183 post-integration fixes 
* Fixed typo with context_module::instance
* Fixed use of $mod->get_context()
 2014-10-28 15:59:59 +13:00
Sam Hemelryk
77b31ba2ce Merge branch 'MDL-47183-master' of git://github.com/andrewnicols/moodle 2014-10-28 14:02:19 +13:00
Frederic Massart
00fd3c1aad MDL-47189 my: Fix the addition of default blocks to my/ page 
Fixing the upgrade script so that they attach the new blocks
to the right my_pages entry. An upgrade script has also been
added to fix the existing bad data.
 2014-10-14 16:03:12 +08:00
Helen Foster
7c8edb452e MDL-40351 course overview block: improved strings 2014-10-10 08:30:58 +01:00
Frederic Massart
dcb59c872c MDL-45893 my: Specifically follow My home from block in Behat tests 2014-10-08 16:59:41 +08:00
Andrew Nicols
f67b5c995e MDL-47183: viewhiddenactivities should use the module context 
Thanks to Paulo Matos for the forum part of this change.
 2014-10-06 12:21:49 +08:00
Marina Glancy
d512e5f833 MDL-40351 block_course_overview: minor corrections 2014-10-06 09:36:58 +08:00