moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86087 commits 37 branches 544 tags 1.3 GiB
Commit graph

86087 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ryan Wyllie
ca518350ff MDL-59393 calendar: use event context in update_event_start_day 2017-08-23 01:32:51 +00:00
Simey Lameze
b453e4c92f MDL-59797 core_course: dont escape module and section names 2017-08-23 09:19:02 +08:00
Ryan Wyllie
28e030d9f9 MDL-59393 calendar: remove use of legacy event in event_exporter 2017-08-23 01:15:08 +00:00
Ryan Wyllie
909d08588d MDL-59393 calendar: stop user editing module events 2017-08-23 00:57:22 +00:00
Ryan Wyllie
5ca142dc5b MDL-59393 calendar: add event drag and drop to monthly view 2017-08-23 00:57:22 +00:00
Ryan Wyllie
c6fb931088 MDL-59393 calendar: add update_event_start_day external function 2017-08-23 00:56:27 +00:00
Ryan Wyllie
55f5fcb9c9 MDL-59393 calendar: add update_event_start_day to local api 2017-08-23 00:56:26 +00:00
Ryan Wyllie
0dc3aa1295 MDL-59393 calendar: set defaults for legacy event in mapper 2017-08-23 00:56:26 +00:00
Ryan Wyllie
1652934f09 MDL-59393 calendar: move candelete and canedit into event_exporter_base 2017-08-23 00:56:26 +00:00
Simey Lameze
d8da7fc8b4 MDL-59674 core_calendar: add group name to summary template 2017-08-23 00:56:26 +00:00
Simey Lameze
950d2ce0e5 MDL-59674 core_calendar: add group name to event exporter 2017-08-23 00:56:26 +00:00
Eloy Lafuente (stronk7)
a7417383fa Merge branch 'MDL-59067_master' of git://github.com/dmonllao/moodle 2017-08-23 02:55:20 +02:00
David Monllao
0690a271c3 MDL-59067 analytics: Store indicator calculations 
This was supposed to be split into multiple commits to make it easier to understand
but I failed to do it properly. So this is the list of changes:

- New analytics_indicator_calc db table to store indicators calculations
- Reuse previous calculations during prediction/training; other models
  previous calculations should also be reused as long as they belong to
  the same sample (sampleid depends on sampleorigin), time range and indicator
- Allow bulk inserting of these calculations as this can hurt database performance
- Block the same analysable to be analysed for training and for prediction
- Use a new instance of the target and use it for is_valid_* functions
  as using ::is_valid_sample can lead to problems if people
  uses it to cache stuff
 2017-08-22 22:28:04 +02:00