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
76443 commits 37 branches 540 tags 1.3 GiB
Commit graph

2684 commits

Author SHA1 Message Date
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
David Monllao
b312e7f13a Merge branch 'MDL-48723_master_forum-plagiarism_errors' of git://github.com/colin-umn/moodle 2015-04-17 10:41:20 +08:00
Juan Leyva
ea2fa324d7 MDL-49902 forum: Add missing capability check in mod_forum_view_forum 2015-04-16 22:07:11 +02:00
Dan Poltawski
8da277ea96 Merge branch 'MDL-49894-master' of git://github.com/jleyva/moodle 2015-04-16 16:10:23 +01:00
Juan Leyva
b235aef094 MDL-49894 forum: Add deprecated information for get_forum_discussions 2015-04-16 14:53:11 +02:00
Dan Poltawski
8c1444e4a4 Merge branch 'MDL-49763-master' of git://github.com/jleyva/moodle 2015-04-15 15:53:17 +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
Adrian Greeve
6e918b6437 MDL-45774 navigation: General fixes for the user navigation. 2015-04-13 15:54:24 +08:00
Adrian Greeve
e29866b57f MDL-49819 navigation: User profile string improvement. 
Part of MDL-45774.
 2015-04-13 14:41:55 +08:00
Juan Leyva
81f810dca8 MDL-49763 webservices: Handle correctly deleted users for forums 2015-04-10 22:21:42 +02:00
Damyon Wiese
221210e9b2 MDL-49412 Behat: Fix behat tests for all of @mod 
This is after the navigation changes for 2.9.

Part of MDL-45774.
 2015-04-10 17:18:23 +08:00
Adrian Greeve
45367bdf0c MDL-49688 navigation: First review fixes and version bump. 
Part of MDL-45774.
 2015-04-10 17:18:03 +08:00
Ankit Agarwal
b19cc4ef25 MDL-45898 myprofile: Redesign my profile page 
Part of MDL-45774.

Contributions by John Okely, Jetha Chan and Damyon Wiese (squashed branch).

AMOS BEGIN
CPY [coursebadges,core_badges], [badges,core_badges]
AMOS END
 2015-04-10 17:17:32 +08:00
Adrian Greeve
f495187da7 MDL-48935 navigation: Update the user nav breadcrumbs. 
Part of MDL-45774.
 2015-04-10 17:17:07 +08:00
Adrian Greeve
283ea788bf MDL-48931 navigation: Implement the user subheader. 
Part of MDL-45774
 2015-04-10 17:17:07 +08:00
Adrian Greeve
e026cc9253 MDL-48930 navigation: Update to forum page headers. 
The forum posts and discussion headers have been updated
to use the course full name instead of the short name to
match other pages.

Part of MDL-45774.
 2015-04-10 17:17:07 +08:00
Adrian Greeve
880c50731f MDL-48930 navigation: Using user headers in user pages. 
Pages that are percieved to be in a user context are now
using a user context for the header.

Part of MDL-45774
 2015-04-10 17:17:07 +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
Colin Campbell
334bee5f60 MDL-48723 mod/forum: Fix cron task error on digest attachments. 2015-04-08 13:22:02 -05:00
Damyon Wiese
82d341cfd5 Merge branch 'MDL-49503-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
	version.php
 2015-04-07 20:28:23 +08:00
Damyon Wiese
75ece778c5 Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2015-04-07 17:27:17 +08:00
Andrew Hancox
6398ff5387 MDL-49101 core: Add a global admin setting config->requiremodintro 
Removed requiremodintro setting from all core activity plugins and replace
with a single global setting.
Deprecated moodleform_mod::add_intro_editor and replaced with
moodleform_mod::standard_intro_elements
 2015-04-07 10:11:53 +01:00
Petr Skoda
d6e7a63d9a MDL-49684 timezones: rewrite timezone support 
This patch replaces all homegrown timezone
stuff with standard PHP date/time code.

The main change is the introduction of core_date
class that returns normalised user and server
timezones. From now on nobody should be using
$CFG->timezone or $user->timezone directly!

Other new features and fixes:
* admins are prompted for timezone during install
* editing of other users is finally fixed
* timezones are displayed in user profile
* new $this->setTimezone() in phpunit
* time locale is now automatically reset in phpunit
* timezone is now automatically reset in phpunit
* phpunit has Australia/Perth as default timezone
 2015-04-06 13:53:51 +12:00
Juan Leyva
d508dfe79a MDL-49503 forum: Add view_forum_discussion to the mobile service 2015-04-02 17:11:27 +02:00
Juan Leyva
a3c315dda2 MDL-49503 forum: New external function mod_forum_view_forum_discussion 2015-04-02 17:08:42 +02:00