Commit graph

2608 commits

Author SHA1 Message Date
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
Juan Leyva
6e5df52c80 MDL-49503 forum: Unit tests for forum_discussion_view 2015-04-02 17:08:42 +02:00
Juan Leyva
1546987b86 MDL-49503 forum: Move discussion viewed triggering to API function 2015-04-02 17:08:42 +02:00
Andrew Nicols
df15759724 Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle 2015-04-02 11:06:27 +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
Juan Leyva
ebfa74c799 MDL-49502 forum: Unit tests for forum_view 2015-03-27 11:33:35 +01:00
Juan Leyva
449a6304d4 MDL-49502 forum: Add the new function to the mobile service 2015-03-27 11:33:34 +01:00
Juan Leyva
4a1e44a155 MDL-49502 forum: New external function view_forum 2015-03-27 11:33:34 +01:00
Juan Leyva
51c378b116 MDL-49502 forum: New API function forum_view 2015-03-26 21:21:10 +01:00
David Monllao
fd822c0bc5 Merge branch 'MDL-19670-master' of git://github.com/gurgus/moodle 2015-03-16 13:45:31 +08:00
Dave Cooper
2587313a9a MDL-19670 mod_forum: Allow user to post a copy to all accessible groups 2015-03-12 17:02:49 +08:00
Dave Cooper
f267b8b2f4 MDL-19670 mod_forum: Add tests for posting to multiple discussions 2015-03-12 17:02:43 +08:00
Rex Lorenzo
c9f2d347f3 MDL-49069 mod_forum: Ability to specify default values for Forum RSS 2015-03-10 14:57:03 -07:00
Marina Glancy
1edd3d6fbf MDL-48804 core: do not set current course until login validated 2015-03-02 16:48:15 +01:00
Andrew Nicols
38ec3fb080 MDL-49216 mod_forum: Move subquery to outer component
It is not possible to order sub-query results with some RDBMs, and the
subquery is not necessary anyway.
2015-02-24 08:29:43 +08:00
Andrew Nicols
94802d3518 MDL-49216 mod_forum: Add tests for discussion reply count 2015-02-24 08:29:43 +08:00
Eloy Lafuente (stronk7)
2d4d68073d Merge branch 'MDL-48221-master' of git://github.com/andrewnicols/moodle 2015-02-17 15:51:59 +01:00
David Monllao
0e8182e8f8 Merge branch 'MDL-48822-master' of git://github.com/andrewnicols/moodle 2015-02-10 14:10:28 +08:00
David Monllao
f01845c2a6 Merge branch 'MDL-48212-master' of git://github.com/ankitagarwal/moodle 2015-02-10 08:54:13 +08:00
Andrew Nicols
be773fd65b MDL-48221 mod_forum: Improve discussion subscription on post
If the user has posted in the forum before, follow their previous
discussion preference.

If the user has not posted before, but is subscribed to the forum, follow
their forum preference.

Otherwise, follow their user-preference.

This has the result that if a user has unsubscribed from a forum and writes
their first response; the user preference will be followed. This may
override the forum subscription.

This commit also changes from a dropdown to a checkbox in the post form.
2015-02-09 15:17:09 +08:00
Andrew Nicols
bfa7beceee MDL-48822 mod_forum: Add lastpost class to final post in discussion
Thanks to Lior Gil for the basis of the suggested fix.
2015-02-05 13:09:42 +08:00
Eloy Lafuente (stronk7)
7172903fcf Merge branch 'MDL-41851-master' of git://github.com/andrewnicols/moodle 2015-02-03 12:36:00 +01:00
Eloy Lafuente (stronk7)
3195a1f91f Merge branch 'MDL-48939-master' of git://github.com/andrewnicols/moodle 2015-01-26 23:57:33 +01:00
Eloy Lafuente (stronk7)
13abbea83b Merge branch 'MDL-48407-master' of git://github.com/gurgus/moodle 2015-01-26 23:41:17 +01:00
Ankit Agarwal
9bb71899c0 MDL-48212 messages: show reply allowed message only when needed 2015-01-26 08:16:03 +05:30
Andrew Nicols
2f19417319 MDL-48939 core: Depreacte search_generate_text_SQL
This has never been used outside of forum, where it was introduced in
Moodle 1.8 and required manual creation of an index.
2015-01-22 15:10:00 +08:00
Dave Cooper
b02f473cfb MDL-48407 mod_forum: Updated text email notification template 2015-01-22 13:28:18 +08:00