Andrew Nicols
954f3f5aa8
Merge branch 'MDL-50047-master-2nd' of git://github.com/FMCorz/moodle
2015-05-07 11:36:36 +08:00
Dan Poltawski
57fc76ab92
Merge branch 'MDL-50102' of git://github.com/stronk7/moodle
2015-05-06 10:50:35 +01:00
Frederic Massart
36c1cc4dc1
MDL-50047 quiz_results: Restore handles misconfig and missing quizzes
...
We had to change back the result of instance_allow_multiple to true,
or a backup would have only restored one instance at random.
2015-05-06 13:16:01 +08:00
Frederic Massart
ae742f12c1
MDL-50047 quiz_results: Upgrade handles misconfig and missing quizzes
2015-05-06 12:32:29 +08:00
Andrew Nicols
43ef409276
Merge branch 'MDL-49985_master' of git://github.com/markn86/moodle
...
Conflicts:
mod/forum/post.php
2015-05-06 11:11:21 +08:00
Eloy Lafuente (stronk7)
26ea380d24
MDL-50102 versions: bump all versions and requires near release
...
version = planned 2015051100 release version
requires= current 2015050500 rc1 version
Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
2015-05-05 17:43:19 +02:00
Mark Nelson
b3cb726431
MDL-49985 core_course: revert commit belonging to MDL-18309
...
This reverts commit 6601690202764d786a5ee4b7bbd9afb5b91dd0ec.
This commit was adding the 'returnurl' param unnecessarily to the
course links in the navigation block, causing a lot of long URLs
to be created.
2015-05-05 01:09:20 -07:00
John Okely
4887d15228
MDL-49983 navigation: Remove 'my' from user context navigation
2015-05-04 12:38:50 +08:00
David Mudrák
3759e7ae96
MDL-50033 lang: Update Behat scenarios to use the new strings
2015-04-29 23:15:44 +02:00
Helen Foster
0634dc3b76
MDL-50033 lang: Merge English strings from the en_fix language pack
2015-04-29 21:43:00 +02:00
Dan Poltawski
d0704fd9e2
Merge branch 'patch-2' of https://github.com/sk-unikent/moodle
2015-04-21 15:38:32 +01:00
Rajesh Taneja
0fe86bbdbb
MDL-49799 behat: replaced asd.com with example.com
...
asd.com is a valid domain, we should use reserved domain names for testing
2015-04-20 11:21:20 +08:00
Skylar Kelty
bf5eebe8f8
MDL-49878 block_settings: Only count visible children
2015-04-15 15:07:22 +01:00
Dan Poltawski
cb5ab19e77
Merge branch 'MDL-49306-master' of git://github.com/gurgus/moodle
2015-04-15 12:35:36 +01:00
Dan Poltawski
75e20c1845
Merge branch 'wip-MDL-18309-master' of git://github.com/marinaglancy/moodle
2015-04-15 09:54:36 +01:00
Rajesh Taneja
f576507558
MDL-45774 behat: Fixed page on which block should be added/viewed
2015-04-14 09:46:50 +01:00
Damyon Wiese
46a2fbc4b7
MDL-49412 Navigation: Remaining behat fixed for nav branch
...
Behat is passing after this change.
Part of MDL-45774.
2015-04-10 17:19:28 +08:00
Dave Cooper
81d7de1aa1
MDL-48936 lang: Changed "My Home" to "Dashboard".
...
Part of MDL-45774
2015-04-10 17:16:27 +08:00
Gregory Zbitnev
6601690202
MDL-18309 Course: enrol/index.php returnurl improvement
...
This patch improves usability of enrolment page in case of course is not
enrollable. 'Continue' button now returns student to referring page instead of
main moodle page (as it used to be). To make this improvement, passing correct
returnurl parameter to enrol/index.php page was implemented for links that may
be accessible for not-enrolled students.
2015-04-10 09:32:31 +08:00
Nathan Lewis
ad5c323065
MDL-49306 blocks: Copy instance data when copying block instances
2015-04-08 14:41:05 +08:00
Rajesh Taneja
345c6a1ac0
MDL-49513 behat: Updated step name to match new step
2015-04-02 11:08:21 +02:00
Rajesh Taneja
bed97c39eb
MDL-49513 behat: Set admin config using php api
...
Added a new set to set config using set_config() api
to make steps faster and more efficient
2015-04-01 14:25:23 +08:00
Dan Poltawski
b74bff0685
MDL-48969 block_quiz_results: correct upgrade logic check
2015-03-25 08:13:02 +00:00
Dan Poltawski
52e81cd14d
MDL-48969 block_quiz_results: disable on install
2015-03-24 12:15:11 +00:00
Dan Poltawski
9569976f86
Merge branch 'MDL-48969_m29v9' of https://github.com/sbourget/moodle
2015-03-24 11:48:44 +00:00
Stephen Bourget
846f6dc712
MDL-48969 Block: Disable and migrate quiz_results block
2015-03-19 19:46:48 -04:00
Stephen Bourget
d6383f6afe
MDL-48969 Block: Implement a high scores block
...
AMOS BEGIN
CPY [bestgrade,block_quiz_results],[bestgrade,block_activity_results]
CPY [bestgrades,block_quiz_results],[bestgrades,block_activity_results]
CPY
[bestgroupgrade,block_quiz_results],[bestgroupgrade,block_activity_resul
ts]
CPY
[bestgroupgrades,block_quiz_results],[bestgroupgrades,block_activity_res
ults]
CPY
[config_format_absolute,block_quiz_results],[config_format_absolute,bloc
k_activity_results]
CPY
[config_format_fraction,block_quiz_results],[config_format_fraction,bloc
k_activity_results]
CPY
[config_format_percentage,block_quiz_results],[config_format_percentage,
block_activity_results]
CPY
[config_grade_format,block_quiz_results],[config_grade_format,block_acti
vity_results]
CPY
[config_name_format,block_quiz_results],[config_name_format,block_activi
ty_results]
CPY
[config_names_anon,block_quiz_results],[config_names_anon,block_activity
_results]
CPY
[config_names_full,block_quiz_results],[config_names_full,block_activity
_results]
CPY
[config_names_id,block_quiz_results],[config_names_id,block_activity_res
ults]
CPY
[config_show_best,block_quiz_results],[config_show_best,block_activity_r
esults]
CPY
[config_show_worst,block_quiz_results],[config_show_worst,block_activity
_results]
CPY
[configuredtoshownothing,block_quiz_results],[configuredtoshownothing,bl
ock_activity_results]
CPY
[config_use_groups,block_quiz_results],[config_use_groups,block_activity
_results]
CPY
[error_nogroupsexist,block_quiz_results],[error_nogroupsexist,block_acti
vity_results]
CPY [worstgrade,block_quiz_results],[worstgrade,block_activity_results]
CPY
[worstgrades,block_quiz_results],[worstgrades,block_activity_results]
CPY
[worstgroupgrade,block_quiz_results],[worstgroupgrade,block_activity_res
ults]
CPY
[worstgroupgrades,block_quiz_results],[worstgroupgrades,block_activity_r
esults]
AMOS END
2015-03-19 19:46:02 -04:00
David Monllao
9db120e338
MDL-49385 blocks: Adding todo tag
2015-03-17 14:52:12 +08:00
Ruslan Kabalin
53c74b1813
MDL-49385 block_base: Deprecate config_save function.
...
block_base->config_save is not used anywhere any more. If contributed plugins
rely on it, it makes no difference since it is not being called, if they do
something like $this->config_save or parent::config_save somewhere in their
block class instance, this will still work as deprecated function will handle
it.
2015-03-13 09:32:48 +00:00
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
