2258 Commits

Author SHA1 Message Date
Marina Glancy
0d1e545612 MDL-51132 tags: do not use user tags for tagging courses 2015-09-05 11:21:15 +08:00
Dan Poltawski
cd7b48a2e7 Merge branch 'wip-MDL-25451-master' of git://github.com/marinaglancy/moodle 2015-09-01 10:36:17 +01:00
Marina Glancy
7a4ff165cb MDL-25451 roles: check if user can assign foles in block 2015-08-31 16:03:27 +08:00
Eloy Lafuente (stronk7)
1b5034025b Merge branch 'MDL-51148-master-enfix' of git://github.com/mudrd8mz/moodle 2015-08-27 12:46:11 +02:00
Helen Foster
ce2c0f3a74 MDL-51148 lang: Merge English strings from the en_fix language pack 2015-08-26 16:46:43 +02:00
Bruce Silver
88a26baec0 MDL-50958 block_messages: declare missing stdClass object 2015-08-24 10:47:24 +08:00
Eloy Lafuente (stronk7)
edd94e24b0 Merge branch 'MDL-49085_master' of git://github.com/dmonllao/moodle 2015-08-19 18:30:37 +02:00
Barry Oosthuizen
4f0c8f307a MDL-41944 block_onlines_users: Add unit tests 2015-08-19 18:30:36 +02:00
Barry Oosthuizen
0964aa33cf MDL-41944 block_onlines_users: Improve performance 2015-08-19 18:30:35 +02:00
David Monllao
cc7a4f4b39 MDL-49085 block_tag_youtube: Using Youtube data api v3 2015-08-18 11:12:55 +08:00
David Monllao
fd76204a8b Merge branch 'MDL-51100-master' of git://github.com/andrewnicols/moodle 2015-08-17 08:50:49 +08:00
Andrew Nicols
711b1d6b3e MDL-51100 behat: Remove javascript tag from usermenu steps
These tests only needed the javascript tag because of the user menu.
Now that issue has been resolved, they do not need it.

Note: Some were also not using the singleselect feature, so would fail
without changes to use this too as they were not handling proper selection
of the singleselect element.
2015-08-14 08:52:29 +08:00
Eloy Lafuente (stronk7)
1dce5c99c8 Merge branch 'MDL-50446-master' of git://github.com/ryanwyllie/moodle 2015-08-12 00:11:42 +02:00
David Monllao
b84129b11e Merge branch 'MDL-50956' of git://github.com/bostelm/moodle 2015-08-11 13:20:11 +08:00
Marina Glancy
7f0c7f01c0 MDL-51062 behat: permission steps should work without js 2015-08-09 20:33:27 +08:00
Eloy Lafuente (stronk7)
6573ba3e27 MDL-44273 block_rss: Prevent PHP notices in tests + whitespace fix 2015-08-05 00:55:28 +02:00
Eloy Lafuente (stronk7)
f2755d847e Merge branch 'MDL-44273' of https://github.com/NeillM/moodle 2015-08-04 20:24:00 +02:00
Neill Magill
83f215850e MDL-44273 block_rss: Back-off strategy for RSS feeds
Based on a patch by Davo Smith of Synergy Learning

RSS feeds can fail, either permanently or temporarily.
After this patch if a feed fails it will not be tried again in the next cron run.
If it continues to fail the delay between tries will be increased.
When a feed succeeds it will go back to being fetched on each cron run.

This should make the CRON process for RSS feeds finish faster when
there are lots of invalid feeds.
2015-08-04 11:04:29 +01:00
Jun Pataleta
bf2986c2e3 MDL-50572 youtube: Disable Youtube
Disabled Youtube repository and Youtube Tag Block on new Moodle installations.
2015-07-31 15:20:19 +08:00
Ryan Wyllie
fd4eca115a MDL-50446 block_site_main_menu: Test add URL resource
Behat tests to confirm that adding a URL resource to
the main menu block doens't break the javascript.
2015-07-30 03:39:53 +00:00
Ryan Wyllie
fd57126fc7 MDL-50446 block_site_main_menu: Fix the onclick property handling 2015-07-30 02:07:24 +00:00
Henning Bostelmann
afd9a921fa MDL-50956 block_site_main_menu: Show site content on course pages 2015-07-29 16:46:33 +01:00
Andrew Nicols
8a53c3f433 Merge branch 'wip-MDL-50874-master' of https://github.com/marinaglancy/moodle 2015-07-28 14:08:54 +08:00
Marina Glancy
9a7e398664 MDL-50874 block: basic tests for tag-related blocks 2015-07-21 17:02:10 +08:00
Syxton
483fb4ec44 MDL-50293 navigation: File name not wrapping
A long File name doesn't always wrap correctly in the Navigation block.
2015-07-16 10:26:19 -04: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
Andrew Davis
ef38a7286b MDL-49885 core_blocks: fixed course_overview block applicable_formats() 2015-06-08 05:42:18 +08:00
Aaron Barnes
03f3f7180f MDL-49611 completion: Update dangling err_nocriteria lang strings 2015-05-19 22:41:19 +12:00
Eloy Lafuente (stronk7)
b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
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