mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
76,584 Commits 36 Branches 519 Tags
Commit Graph

2297 Commits

Author SHA1 Message Date
Dan Poltawski
e6f519b73e Merge branch 'MDL-49553_master' of git://github.com/markn86/moodle 2016-01-12 17:01:13 +00:00
Dan Poltawski
04a03ff282 Merge branch 'wip-MDL-50851-master' of git://github.com/marinaglancy/moodle 2016-01-12 14:17:14 +00:00
Andrew Nicols
576d953415 Merge branch 'MDL-52643_m31v1' of https://github.com/sbourget/moodle 2016-01-12 09:31:06 +00:00
Marina Glancy
ac840cf487 MDL-50851 blocks: convert to new tag API 2016-01-10 15:25:48 +08:00
Marina Glancy
b0c62e00bc MDL-50851 block_tags: tag collections settings 2016-01-10 15:25:48 +08:00
Mark Nelson
94cec934a6 MDL-49553 core_block: final deprecation of config_save() 2016-01-06 10:58:50 +08:00
Stephen Bourget
2b65892939 MDL-52643 block_blog_menu: Add behat tests 2016-01-02 16:01:46 -05:00
Stephen Bourget
fd027cd146 MDL-52638 activity_results: Improve Behat tests 2016-01-01 18:54:45 -05:00
Dan Poltawski
e42b60351e Merge branch 'MDL-52487_master' of git://github.com/dmonllao/moodle 2015-12-14 09:23:03 +00:00
David Monllao
abc4e1efed MDL-52487 rss: PHP 7 compatible error supression 
PHP5 used to update error_reporting to 0 on functions called with the
suppress errors operator (@). In PHP7 it is not updated.

Credit to Rajesh Taneja.
 2015-12-14 15:28:37 +08:00
Marina Glancy
1a0df5535e MDL-52081 forms: Use __construct() for constructors 2015-12-10 13:38:01 +08:00
David Monllao
76bcec2cb1 Merge branch 'MDL-50710-master' of git://github.com/marinaglancy/moodle 2015-12-03 18:50:02 +01:00
Dan Poltawski
0ad66dda0e Merge branch 'MDL-52292' of git://github.com/timhunt/moodle 2015-12-03 11:13:26 +01:00
Tim Hunt
eb3884e48f MDL-52292 block testing generators: improve the API 
* Refactor the block generator base class, to remove the amount
  of duplication required in base classes.

* Change the defaults that are filled in to be a little more natural.

* Make the Behat step 'Given the following "block" exist:' work.
 2015-12-01 13:48:08 +00:00
Marina Glancy
f7ff14a1be MDL-50710 block_glossary_random: more precise sorting 2015-11-30 09:16:28 +08:00
Dan Poltawski
aa306e7bc8 MDL-52219 behat: remove steps which turn on avaibility/completion 
Now its the default, we can reduce test time by relying on the default
state rather than going around turning it on
 2015-11-26 14:07:17 +00:00
Eloy Lafuente (stronk7)
6d29c4acdd MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts 2015-11-17 17:08:56 +01:00
Eloy Lafuente (stronk7)
2e144835bb MDL-52059 versions: bump all versions and requires near release 
version = planned 2015111600 release version
requires= current 2015111000 rc3 version
 2015-11-10 12:33:52 +01:00
John Okely
32b4161a3c MDL-52055 block_online_users: Only show users from current course 2015-11-10 08:13:41 +00:00
Eloy Lafuente (stronk7)
d1bd327454 Merge branch 'MDL-52045-master-block_tags_settings' of git://github.com/mudrd8mz/moodle 2015-11-09 23:39:33 +01:00
David Mudrák
afb52b6f31 MDL-52045 block_tags: Fix invalid has_config() declaration 
As the settings.php has been removed in MDL-51132, the block should no
longer declare it has global configuration.
 2015-11-09 09:34:53 +01:00
Marina Glancy
9390d02099 MDL-52039 block_tags: remove unused setting 2015-11-07 12:45:35 +08:00
Helen Foster
da6ecfd8c1 MDL-52018 lang: Merge English strings from the en_fix language pack 2015-11-02 22:12:06 +01:00
Andrew Nicols
10a8d040dc Merge branch 'MDL-51905-master' of git://github.com/xow/moodle 2015-10-27 14:50:55 +08:00
John Okely
161ffc5605 MDL-51905 block_activity_results: Default to the current activity 
Due to an incorrect condition, the activity results block would
incorrectly identify some blocks as not being gradeable.
This meant that edit form could not determine what activity the block
was added to. This commit fixes the condition, allowing the current
block to be determined correctly
 2015-10-27 13:47:58 +08:00
Andrew Nicols
4727a4a207 Merge branch 'MDL-51864-master' of git://github.com/junpataleta/moodle 2015-10-27 10:57:45 +08:00
Eloy Lafuente (stronk7)
8b3090c13b MDL-51903 behat: move guest enrolment to new UI 
With MDL-30674 we missed to change this use from the
old (course edition) UI to the new (enrolment methods) one.
 2015-10-25 21:13:08 +01:00
Jun Pataleta
3dbdeb5ccb MDL-51864 blocks: Fixed title display for block_course_summary 2015-10-24 00:03:39 -05:00
Adam Olley
1e36665719 MDL-50993 forum: Display timed posts/discussions in a logical order 
Users that don't have permission to view timed posts outside of the release
time frame will have discussions that have entered the visible frame appear
in an odd order from their point of view on the discussion list.

Example:
Discussion 1, modified 2015-01-01, hidden till 2015-01-03
Discussion 2, modified 2015-01-02, not hidden

The standard 'modified descending' order means that D2 is listed at the top
even after D1 becomes visible. When scanning the list of discussions for new
posts, the user could be tricked into thinking they'd already read it.

This fix instead takes into account the release time of the discussion when
timed forum posts are enabled.

I opted to use CASE statements to handle this instead of GREATEST as the
latter is not supported by MSSQL.
 2015-10-19 04:04:58 +00:00
Andrew Nicols
055c5bc02a Merge branch 'MDL-51790-master' of git://github.com/damyon/moodle 2015-10-15 16:04:55 +08:00
Damyon Wiese
390b833ada MDL-51790 block_community: xmlrpc expects correct types 
This is defined as an int on the hub site, so it must be sent as an int.
 2015-10-15 15:08:51 +08:00
Damyon Wiese
bb6ca6f360 MDL-51260 tags: Update the tags form element to use the autocomplete field 
AMOS BEGIN
    REM [interestslist_help,moodle] Commas are no longer required
    REM [entertags,tag] Commas are no longer required
    REM [othertags,tag] Commas are no longer required
AMOS END
 2015-10-15 12:03:35 +08:00
Andrew Nicols
3648d7963a Merge branch 'MDL-51427-master' of git://github.com/marinaglancy/moodle 2015-10-13 10:13:43 +08:00
Andrew Nicols
2dcbd2a27d Merge branch 'MDL-44707-master' of git://github.com/marinaglancy/moodle 2015-10-06 16:31:32 +01:00
Marina Glancy
810805da9e MDL-51636 core_tag: allow setting tags in generators 2015-10-04 22:25:37 +08:00
Eloy Lafuente (stronk7)
02be8a0427 Merge branch 'MDL-50207-master' of git://github.com/lameze/moodle 2015-09-24 15:38:19 +02:00
Marina Glancy
70fb46c87f MDL-51427 user: correctly use strings for phone1 and phone2 
Thanks to Olumuyiwa Taiwo for original patch

AMOS BEGIN
  CPY [phone,core],[phone1,core]
AMOS END
 2015-09-16 13:37:46 +08:00
Simey Lameze
eb8010351c MDL-50207 block_activity_results: css styling on activity results block 
This commit fixes minor styling issues on the activity results block and also add RTL css.
 2015-09-14 16:03:40 +08:00
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
Marina Glancy
f5b93846af MDL-44707 block_html: copy files when copying instance 2015-08-28 16:03:26 +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