mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-23 17:10:20 +01:00
Code Issues Projects Releases Wiki Activity
85,782 Commits 36 Branches 527 Tags
Commit Graph

85782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
685e99cabe Merge branch 'MDL-59910-master' of git://github.com/lameze/moodle 2017-08-29 01:06:46 +02:00
Eloy Lafuente (stronk7)
1fb5f3cf4a Merge branch 'MDL-59870-participants-th-top-vertical-aligned' of http://github.com/lucaboesch/moodle 2017-08-29 00:52:37 +02:00
Eloy Lafuente (stronk7)
cace54811d Merge branch 'MDL-59670-master' of git://github.com/andrewnicols/moodle 2017-08-29 00:41:57 +02:00
Jun Pataleta
9317ceefcf Merge branch 'MDL-59833_master' of git://github.com/markn86/moodle 2017-08-28 11:54:44 +08:00
Jun Pataleta
3fc3e41bfa Merge branch 'MDL-59904_master' of git://github.com/markn86/moodle 2017-08-28 11:30:59 +08:00
Mark Nelson
7948dae160 MDL-59904 core: add missing FKs to analytics tables 2017-08-28 11:13:38 +08:00
Andrew Nicols
5d09e9d890 Merge branch 'MDL-59907' of git://github.com/stronk7/moodle 2017-08-28 08:25:20 +08:00
Andrew Nicols
a49c3d8aa0 MDL-59670 calendar: Select correct group when editing events 2017-08-25 11:27:20 +08:00
Eloy Lafuente (stronk7)
2f8420657e Merge branch 'wip-MDL-59881-master' of git://github.com/abgreeve/moodle 2017-08-25 00:55:58 +02:00
Luca Bösch
bb3216f8ea MDL-59870 users: Default align participant table header row. 
Instead of putting vertical-align: middle as indication for participants table
headers, none is set which leads to theme default, i.e. bottom in Clean and Boost.
 2017-08-25 00:09:30 +02:00
Eloy Lafuente (stronk7)
9eb3c173ae weekly release 3.4dev 2017-08-24 14:14:18 +02:00
Eloy Lafuente (stronk7)
ca736c577a Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-08-24 14:14:15 +02:00
Andrew Nicols
d839e25e9d Merge branch 'MDL-59699-master-fix2' of https://github.com/lameze/moodle 2017-08-24 09:58:09 +08:00
Andrew Nicols
ed50116863 Merge branch 'MDL-59675-master-fix1' of https://github.com/lameze/moodle 2017-08-24 09:57:28 +08:00
Simey Lameze
2d7008aeab MDL-59675 core_calendar: reload page after create event 2017-08-24 09:48:00 +08:00
Andrew Nicols
0afab19477 Merge branch 'MDL-59677-master-fix1' of https://github.com/lameze/moodle 2017-08-24 09:43:31 +08:00
Jun Pataleta
66c7f71950 Merge branch 'MDL-36985-master-fix' of github.com:xow/moodle 2017-08-24 09:30:32 +08:00
Simey Lameze
2c65e0ce61 MDL-59677 core_calendar: replace the whole node on reload 2017-08-24 09:28:04 +08:00
Eloy Lafuente (stronk7)
5e3ee3748b MDL-59907 behat: Fix features to be collation independent 
Before the patch there were some problems with sorting
causing student1@ and student10@ to be sorted inconsistently
between databases.

Where that is not an important problem in real use, was
causing tests to fail consistently in sqlsrv.

So, adding student0@ to the tests in order to make them
stable collation-wise.
 2017-08-24 03:08:02 +02:00
Simey Lameze
3fa98f2381 MDL-59699 core_calendar: change course short to full name 2017-08-24 08:55:41 +08:00
Andrew Nicols
586181c7d6 MDL-59860 calendar: Remove trailing whitespace 2017-08-24 08:55:23 +08:00
Andrew Nicols
edddecc6f2 Merge branch 'MDL-59860-master-fix2' of https://github.com/lameze/moodle 2017-08-24 08:49:03 +08:00
Simey Lameze
81e736be5d MDL-59860 core_calendar: temp remove behat test 2017-08-24 08:42:53 +08:00
John Okely
7757d27805 MDL-36985 atto: removeorphaneddrafts should be optional 2017-08-24 08:28:55 +08:00
Mark Nelson
359e9d8370 MDL-59833 core_user: check if groups are present in 'hiddenuserfields' 2017-08-23 17:38:53 +08:00
Eloy Lafuente (stronk7)
8839739680 Merge branch 'MDL-59790-master' of git://github.com/lameze/moodle 2017-08-23 11:34:22 +02:00
Andrew Nicols
fc7467e5a1 Merge branch 'MDL-57412-master' of https://github.com/xow/moodle 2017-08-23 11:15:34 +02:00
Simey Lameze
59641f4eb9 MDL-59910 core_calendar: add missing typegradingdue lang string 2017-08-23 15:42:44 +08:00
John Okely
26f12a35c4 MDL-57412 adminlib: change linkcoursesections default to 1 2017-08-23 15:05:33 +08:00
John Okely
e46fde42ab MDL-57412 upgrade: Set linkcoursesections to 1 if boost in use 2017-08-23 15:05:32 +08:00
Andrew Nicols
9e413012b7 Merge branch 'MDL-59676-master' of git://github.com/lameze/moodle 2017-08-23 14:11:37 +08:00
Andrew Nicols
dcc8096ae3 Merge branch 'MDL-59675-master' of git://github.com/lameze/moodle 2017-08-23 14:10:40 +08:00
Andrew Nicols
a4b426293f Merge branch 'MDL-59674-master-fix2' of https://github.com/lameze/moodle 2017-08-23 12:23:38 +08:00
Simey Lameze
7e3658950d MDL-59674 core_calendar: use course full name on group events 2017-08-23 12:22:18 +08:00
Andrew Nicols
d4cbf2787a Merge branch 'MDL-59699-master-fix' of https://github.com/lameze/moodle 2017-08-23 12:02:41 +08:00
Simey Lameze
c87ad4e52c MDL-59699 core_calendar: use course full name instead 2017-08-23 11:08:19 +08:00
Simey Lameze
99a4e7faea MDL-59699 core_calendar: display course link under event type 2017-08-23 11:02:03 +08:00
Andrew Nicols
cbf0ec51af Merge branch 'MDL-59393-int-fix-1' of github.com:ryanwyllie/moodle 2017-08-23 10:54:51 +08:00
Jun Pataleta
ac150167c3 Merge branch 'MDL-59733-master-fix' of github.com:xow/moodle 2017-08-23 10:52:44 +08:00
Jun Pataleta
b6f7efb368 Merge branch 'MDL-59784-master' of git://github.com/andrewnicols/moodle 2017-08-23 10:47:54 +08:00
Andrew Nicols
959c6204e6 Merge branch 'MDL-59674-master-fix' of https://github.com/lameze/moodle 2017-08-23 10:34:48 +08:00
John Okely
025bf573c9 MDL-59733 assignsubmission_file: Add title to filetypes setting modal 2017-08-23 10:25:49 +08:00
Andrew Nicols
e5bdf51ce5 MDL-59784 core: Check for non-promises rather than string 
If a malformed value was passed, it may be that we can still display it.
We should not assume that, if a string is not passed, that we are
dealing with a promise.
 2017-08-23 10:25:15 +08:00
Simey Lameze
448f47271b MDL-59674 core_calendar: add course link to group events 2017-08-23 10:19:10 +08:00
Ryan Wyllie
96283892fe MDL-59393 calendar: fix CiBoT complaints 2017-08-23 02:09:43 +00:00
Jun Pataleta
c1e75004a5 Merge branch 'MDL-59797-master' of git://github.com/lameze/moodle 2017-08-23 10:05:15 +08:00
Simey Lameze
b45ca55d6b MDL-59790 core: fix tooltip for pie chart 2017-08-23 10:03:00 +08:00
Andrew Nicols
8cb6a55147 Merge branch 'MDL-53848_form_hideif' of git://github.com/davosmith/moodle 2017-08-23 09:56:00 +08:00
Andrew Nicols
6ca4e64606 Merge branch 'MDL-59393-master-2' of git://github.com/ryanwyllie/moodle 2017-08-23 09:44:01 +08:00
Andrew Nicols
ac92b9d2a9 Merge branch 'MDL-51827' of git://github.com/timhunt/moodle 2017-08-23 09:37:52 +08:00