moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74145 commits 37 branches 540 tags 1.3 GiB
Commit graph

2608 commits

Author SHA1 Message Date
David Monllao
5e8a03b429 Merge branch 'MDL-51088-master' of git://github.com/andrewnicols/moodle 2015-08-17 09:24: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
Andrew Nicols
2e782e5142 MDL-51088 mod_forum: Improve mod_forum behat performance 2015-08-14 07:58:13 +08:00
David Monllao
819ab257f7 Merge branch 'MDL-46321-master' of git://github.com/tonyjbutler/moodle 2015-08-12 08:49:14 +08:00
Eloy Lafuente (stronk7)
4da133199f Merge branch 'MDL-50430' of https://github.com/danielneis/moodle 2015-08-12 00:48:07 +02:00
Daniel Neis Araujo
54cf94390b MDL-50430 forum: Add number of subscribers to forum subscriber list 2015-08-10 14:17:10 -03:00
Tony Butler
5a699f25a2 MDL-46321 mod_forum: Remove move button to force destination selection 2015-08-10 11:00:00 +01:00
Marina Glancy
7f0c7f01c0 MDL-51062 behat: permission steps should work without js 2015-08-09 20:33:27 +08:00
Eloy Lafuente (stronk7)
ad9a7604f9 MDL-35027 mod_forum: verify forced subscriptions cannot be edited 
This commit adds a new scenario to verify that the option
to turn edition of subscribers is not available anymore
for forced-subscription activities.

It also gets rid of the @javascript tag in a just introduced
scenario not needing it.
 2015-08-05 02:05:37 +02:00
Eloy Lafuente (stronk7)
caf6577e7f Merge branch 'MDL-35027-B' of https://github.com/bostelm/moodle 2015-08-05 01:15:59 +02:00
Andrew Nicols
259ca15a2d Merge branch 'MDL-43709-master' of https://github.com/pauln/moodle 2015-08-04 12:26:12 +08:00
Andrew Nicols
45f8f3e372 MDL-50493 mod_forum: Correct style issues 2015-08-04 11:53:04 +08:00
Andrew Nicols
b9e4972c7a Merge branch 'MDL-50493-master' of git://github.com/jleyva/moodle 2015-08-04 11:46:14 +08:00
Henning Bostelmann
e143918f9e MDL-35027 mod_forum: Fix subscriber list in hidden forums 
If the forum is force-subscribed and hidden, only subscribers that can
view hidden activities will be shown in the subscriber list.
 2015-08-03 12:12:56 +01:00
Simey Lameze
dcee0b9447 MDL-49360 core_lib: add new method get_local_referer() 
This commit also replace all usages of $_SERVER['HTTP_REFERER'] and get_referer().
 2015-07-27 11:11:24 +08:00
Andrew Nicols
83bd7fcc89 Merge branch 'MDL-49618-master' of https://github.com/marinaglancy/moodle 2015-07-21 12:14:53 +08:00
Juan Leyva
1c2b788256 MDL-49796 webservices: Fix the functions description 2015-07-14 11:31:57 +02:00
Paul Nicholls
8ff7531ed7 MDL-43709 Forum: Reset forums not working with multiple forum types 
The SQL being generated from the selected forum types on the course reset
form was using AND, resulting in never matching anything if more than one
forum type was selected for resetting (as each forum can only have one
type).  This should use $DB->get_in_or_equal() to generate sensible SQL.
 2015-07-13 16:19:08 +12:00
Marina Glancy
fc62987c84 MDL-49618 forum: apply format_string 2015-07-09 08:24:08 +08:00
Eloy Lafuente (stronk7)
17d47fa5aa Merge branch 'MDL-50489-master' of git://github.com/jleyva/moodle 2015-07-07 19:12:12 +02:00
Juan Leyva
039c81f098 MDL-50489 forum: Handle qanda forums in get_forum_discussions_paginated 
I removed the last qanda checks in forum_user_can_see_discussion because they are not necessary and
they make the external function fail.

A user in a qanda forum can always see a discussion (he needs to see the discussion to be able to reply).
What he cannot see are the other user posts unless he has replied to the discussion once and the edition period
(usually 30 minutes) has ended.

Note also that forum_user_can_see_discussion was originally only used when displaying forums in blog format
in order to display the button show more or not, this is the reason this wasn't detected before.
 2015-07-02 10:55:40 +02:00
Mark Nelson
eabbc98c78 MDL-50220 mod_forum: added missing capability check 2015-06-29 18:43:09 +02:00
Juan Leyva
b1aa7dfac3 MDL-50493 forum: Handle correctly qanda forums in get_discussion_posts 2015-06-06 00:00:56 +02:00
Dan Poltawski
4bbb035830 Merge branch 'MDL-49905_postform_timeoption' of https://github.com/kylemn/moodle 2015-06-02 16:06:45 +01:00
Dan Poltawski
825be82b8a MDL-50322 forum: add basic split post behat coverage 
Also bump version for autoloading new class.
 2015-06-01 14:59:06 +01:00
Martin Mastny
069d0f1733 MDL-50322 mod_forum: Added validation when spliting discussions 2015-05-29 09:11:39 +08:00
Ankit Agarwal
23e9968a25 MDL-50276 forums: Add a new line in forum emails 2015-05-19 11:46:00 +05:30
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
Eloy Lafuente (stronk7)
88ffe4020f Merge branch 'MDL-50152' of git://github.com/timhunt/moodle 2015-05-07 16:18:35 +02:00
Tim Hunt
f459f29b6f MDL-50152 forum: show if last post in a thread is unread. 2015-05-07 10:38:32 +01:00
Dan Poltawski
57fc76ab92 Merge branch 'MDL-50102' of git://github.com/stronk7/moodle 2015-05-06 10:50:35 +01: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
Frederic Massart
b2687a055d MDL-49179 weblib: Secure the direct usage of $_SERVER['HTTP_REFERER'] 2015-05-05 18:31:13 +08:00
Frederic Massart
dd0607b7bb MDL-49179 mod_forum, mod_quiz: Prevent misuse of get_referer() 2015-05-05 18:31:13 +08:00
Mark Nelson
9542b15671 MDL-49985 core_enrol: direct user to appropriate URL 2015-05-05 01:17:23 -07:00
Mark Nelson
b3cb726431 MDL-49985 core_course: revert commit belonging to MDL-18309 
This reverts commit 6601690202.

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
David Monllao
a7f81bc72d Merge branch 'MDL-48002-master' of git://github.com/ankitagarwal/moodle 2015-05-05 10:21:06 +08:00
David Monllao
119ff65c0e Merge branch 'MDL-49954-master' of git://github.com/jleyva/moodle 2015-05-04 15:16:01 +08:00
John Okely
4887d15228 MDL-49983 navigation: Remove 'my' from user context navigation 2015-05-04 12:38:50 +08:00
Ankit Agarwal
0174fa9bc0 MDL-48002 inbound: add tests for evolution 2015-05-04 08:00:01 +05:30
Ankit Agarwal
aef3c18b76 MDL-48002 inbound: Remove quoted text from forum emails 2015-05-04 08:00:00 +05:30
Helen Foster
0634dc3b76 MDL-50033 lang: Merge English strings from the en_fix language pack 2015-04-29 21:43:00 +02:00
Kyle Nguyen
c46cb498f6 MDL-49905 post_form: added hour option to timed forum posts 2015-04-28 19:14:22 -07:00
Juan Leyva
9a3f7a484d MDL-49954 forum: Use clean_returnvalue properly in external unit tests 2015-04-27 18:22:49 +02:00
Dan Poltawski
a8d8783988 Merge branch 'MDL-49921-master' of git://github.com/jleyva/moodle 2015-04-22 16:40:15 +01:00
Juan Leyva
c8f1d8a026 MDL-49921 forum: Handle exceptions correctly in get_forums_by_courses 2015-04-22 09:47:18 +02:00
Andrew Nicols
9d745218e8 Merge branch 'MDL-49902-master' of git://github.com/jleyva/moodle 2015-04-21 11:40:39 +08: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