Eloy Lafuente (stronk7)
9fb434a618
Merge branch 'wip-mdl-51266' of https://github.com/rajeshtaneja/moodle
2015-09-30 20:34:33 +02:00
Adam Olley
dba0fdc2bc
MDL-9070 forum: Add margin in rtl mode to timed post icon
...
As the icon has a float on it to move it to the right, a margin-top
needs to be applied to keep it aligned the same as in ltr.
2015-09-30 12:27:12 +08:00
David Monllao
8e31c017f2
MDL-9070 mod_forum: Reducing it to a single scenario
2015-09-30 10:09:03 +08:00
David Monllao
15791dffac
Merge branch 'MDL-9070' of git://github.com/aolley/moodle
2015-09-30 09:29:55 +08:00
Eloy Lafuente (stronk7)
d4e65df215
Merge branch 'MDL-49143-master' of git://github.com/cameron1729/moodle
...
Note: Fixed small bug in unit test.
2015-09-30 03:22:26 +02:00
Adam Olley
05f1455b35
MDL-9070 forum: Show timed post display period
...
This adds the following changes when viewing a list of discussions and
forum_enabletimedposts is turned on.
* Discussions a student wouldnt see right now are dimmed (timestart in
future or timeend in the past).
* A icon appears next to the discussion subject, the tooltip for this
icon displays the display start and/or end time. This only appears for
the user that made the discussion or has permission to
viewhiddentimedposts.
These two changes achieve a couple of important things, namely, teachers
will not mistakenly think their students can see a discussion when
viewing the list if they've later forgot that they set a time limit on
it (or indeed if someone else put it on their discussion without them
realising). Additionally it makes it easy to see from the list when
different discussions are set to be released without having to go in and
edit them to find out.
Change-Id: Ia1818b33c00adae0dad72df8e170a078fb66cd76
2015-09-30 09:18:31 +09:30
Dan Poltawski
5fc9fdd54e
Merge branch 'MDL-51402' of git://github.com/timhunt/moodle
2015-09-29 20:54:45 +01:00
Dan Poltawski
747554d335
Merge branch 'MDL-50658' of https://github.com/spvickers/moodle
2015-09-29 16:50:45 +01:00
Andrew Nicols
eb89f7cb40
Merge branch 'MDL-43594-master' of git://github.com/junpataleta/moodle
2015-09-29 13:49:30 +08:00
Jun Pataleta
418a0d0465
MDL-43594 mod_assign: Fix calendar update on course reset
...
This patch fixes the updating of calendar events when the course
is reset and its start date is changed.
2015-09-29 13:46:27 +08:00
Eloy Lafuente (stronk7)
07842a3861
MDL-49143 LTI: Test resource_link_id in lti_build_request()
2015-09-29 13:42:02 +08:00
Cameron Ball
219f956acc
MDL-49143 LTI: Fix missing resource id
2015-09-29 13:41:55 +08:00
Dan Poltawski
5a068364cb
Merge branch 'mdl46710-master' of https://github.com/tlock/moodle
2015-09-28 14:56:52 +01:00
Dan Poltawski
158cc03737
Merge branch 'MDL-50109-master-blogsort' of https://github.com/mudrd8mz/moodle
2015-09-28 10:44:47 +01:00
Tim Lock
86b314c7b0
MDL-46710 mod_lti: fix logging and completion tracking in new windows
2015-09-25 06:27:18 +09:30
spvickers
591b3128eb
MDL-50658 mod_lti: Add LTI Memberships service
...
Implementation of the LTI Memberships service.
2015-09-24 17:44:00 +01:00
Eloy Lafuente (stronk7)
46e92173fd
Merge branch 'wip-MDL-51259-master' of git://github.com/abgreeve/moodle
2015-09-24 15:37:12 +02:00
rajesh Taneja
5ecf8e8f21
MDL-51266 unittest: replaced low level phpunit_util calls
2015-09-23 15:42:48 +08:00
Andrew Nicols
32cc0de4f3
MDL-50349 mod_scorm: Bump version for new WS
2015-09-23 13:40:29 +08:00
Andrew Nicols
be09ca85ef
MDL-50664 mod_data: Fix for unit test failure
2015-09-23 09:27:30 +08:00
Dan Poltawski
b7a87899c5
Merge branch 'MDL-50541-master' of git://github.com/jleyva/moodle
2015-09-22 14:37:22 +01:00
Dan Poltawski
f43194ab36
Merge branch 'MDL-50349-master' of git://github.com/jleyva/moodle
2015-09-22 13:17:03 +01:00
Dan Poltawski
df44776afd
Merge branch 'MDL-50536-master' of git://github.com/jleyva/moodle
2015-09-22 12:55:46 +01:00
Dan Poltawski
79eb3afa9b
Merge branch 'MDL-50132-master' of git://github.com/jleyva/moodle
2015-09-22 12:46:39 +01:00
Dan Poltawski
abd3fdc977
Merge branch 'wip-MDL-51108-master' of git://github.com/abgreeve/moodle
2015-09-22 11:48:49 +01:00
Dan Poltawski
0730ddc2ad
Merge branch 'MDL-50664-master' of git://github.com/ryanwyllie/moodle
2015-09-22 10:39:33 +01:00
Andrew Nicols
a32cd742c3
Merge branch 'MDL-51413-master' of git://github.com/jleyva/moodle
2015-09-22 12:22:55 +08:00
Ferenc Lengyel
efc76e9e90
MDL-51402 quiz: notification emails should respect grouping
...
In the case where teachers do not have the accessallgroups capability,
we only send "an attempt has been sumbitted "notification to teachers
in the same group as the student who submitted.
At the moment this considers all groups in the course. If this
particular quiz has a grouping set, then the logic should only consider
the groups in that grouping.
2015-09-21 13:28:38 +01:00
Dan Poltawski
c331e8f9c0
Merge branch 'MDL-48165-master-dimgrades' of git://github.com/mudrd8mz/moodle
2015-09-21 10:14:47 +01:00
Juan Leyva
bae627b276
MDL-50541 mod_imscp: New Web Service mod_imscp_get_imscps_by_courses
2015-09-21 09:30:59 +02:00
Juan Leyva
580a14c265
MDL-50536 mod_book: New WS mod_book_get_books_by_courses
2015-09-21 09:30:06 +02:00
Juan Leyva
f07a2bb09b
MDL-50132 mod_choice: New WS mod_choice_get_choices_by_courses
2015-09-21 09:27:42 +02:00
Juan Leyva
ea5b910b3a
MDL-51413 forum: Return additional field in get_forums_by_courses WS
2015-09-18 17:27:14 +02:00
Adrian Greeve
453adb1adf
MDL-51108 mod_data: Addition to behat test for Lat. and Long.
2015-09-18 07:33:12 +08:00
Adrian Greeve
d25043270c
MDL-51108 mod_data: Add validation for Lat. and Long.
...
Added a check to see that both the Lat. and Long. values
are entered when filling in database module entries.
2015-09-18 07:33:12 +08:00
Adrian Greeve
f3013ba67e
MDL-51259 mod_data: ratings of items not activated.
...
When selecting a rating method, the restrict rating
to items with dates would be automatically enabled if
not checked. This code brings the data module inline
with forum and glossary.
2015-09-18 07:21:59 +08:00
Juan Leyva
91ea3678a9
MDL-50349 scorm: New WS mod_scorm_get_scorms_by_courses
2015-09-17 18:16:22 +02:00
Ryan Wyllie
ec9e1bec57
MDL-50664 mod_data: tests for 'manageapproved' setting.
...
Adding test coverage for the 'manageapproved' setting that
was added by Johannes Burk.
2015-09-17 06:18:26 +00:00
Juan Leyva
35219d8bb9
MDL-50557 scorm: Add attempt field in mod_scorm_get_scorm_sco_tracks
2015-09-16 23:18:40 +02:00
Juan Leyva
6b5e69ebe6
MDL-50557 mod_scorm: New WS mod_scorm_get_scorm_sco_tracks
2015-09-16 23:18:39 +02:00
Juan Leyva
f26274a45c
MDL-50353 mod_scorm: Fix problem with ids ordering in tests
2015-09-16 23:14:11 +02:00
Juan Leyva
6b4ceb24cf
MDL-50353 scorm: New Web Service mod_scorm_insert_scorm_tracks
2015-09-16 22:07:34 +02:00
Juan Leyva
822e9df70d
MDL-50352 scorm: New Web Service mod_scorm_get_scorm_user_data
2015-09-16 19:25:19 +02:00
Juan Leyva
dfe927c8d6
MDL-50351 scorm: New Web Service mod_scorm_get_scorm_scoes
2015-09-16 19:25:17 +02:00
David Monllao
974053b93f
MDL-48881 mod_lesson: A couple of performance improvements
...
- Improve memory usage on db drivers not able to use recordsets
properly
- !array_key_exists replaced by empty calls
2015-09-16 13:32:49 +08:00
David Monllao
48cec36dfb
Merge branch 'MDL-48881_m30v5' of git://github.com/sbourget/moodle
2015-09-16 13:20:52 +08:00
Johannes Burk
97fe80ad68
MDL-50664 mod_data: add 'manageapproved' setting.
...
New function data_user_can_manage_entry checks whether a user is allowed to manage an entry.
Considering manageentries capability, data_in_readonly_period() result,
ownership (determined by data_isowner()), approval and manageapproved setting.
2015-09-15 07:16:40 +00:00
David Monllao
9ff2a265d0
Merge branch 'm30_MDL-51363_Fix_Default_Settings_1x_Restore' of git://github.com/scara/moodle
...
Conflicts:
mod/scorm/version.php
2015-09-15 09:58:08 +08:00
Andrew Nicols
5a191b2f44
Merge branch 'MDL-51017-master' of git://github.com/jleyva/moodle
2015-09-15 08:23:10 +08:00
Matteo Scaramuccia
32c114ca04
MDL-51363 SCORM: fixed default settings on restoring 1.x backups
2015-09-14 23:48:25 +02:00
