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

25048 commits

Author SHA1 Message Date
David Monllao
8f2cee482d Merge branch 'MDL-59644-master' of git://github.com/lameze/moodle 2017-08-07 09:34:36 +02:00
David Monllao
0370931076 Merge branch 'wip-MDL-59055-master' of git://github.com/marinaglancy/moodle 2017-08-07 09:21:21 +02:00
David Monllao
00da1e6010 MDL-59116 analytics: Multiple predictions for each analysable time range 
Now we only predict using the most recent range available, this means
that if someone upgrades to moodle 3.4 at three quarters of a course
we will only calculate the latest range, previous ranges were not
displayed anyway once more recent predictions were available.

This commit deletes all previous predictions :) this shouldn't be a
problem in master as we don't provide any guarantee, the alternative
(retrive sampleids from mdl_files) would have been slow and a waste of
time as well as require horrible code in an upgrade step (text fields
do not accept defaults nor we can use NOTNULL).
 2017-08-07 06:56:11 +02:00
Andrew Nicols
a41ef5ece5 Merge branch 'MDL-59698-master' of git://github.com/damyon/moodle 2017-08-07 12:43:42 +08:00
Cameron Ball
8243706542
MDL-59700 filestorage: Add before_file_created hook 2017-08-07 12:27:04 +08:00
Andrew Nicols
aca995a2f4 Merge branch 'MDL-59206-master' of git://github.com/damyon/moodle 2017-08-07 11:35:26 +08:00
Andrew Nicols
5bc4c797a7 MDL-59506 core_lock: use a null lock during install 
Use a different lock factory during installation which does not actually
lock at all.
 2017-08-07 09:59:44 +08:00
Marina Glancy
20060b3b2e MDL-59055 grades: provide backward-compatibility of changes 2017-08-07 09:56:14 +08:00
Marina Glancy
be85f0cf88 MDL-59055 grades: fix bug displaying item id instead of grade 
Thanks to Marcelo Santos for initial patch
 2017-08-07 09:56:14 +08:00
Jake Dallimore
4d068a6708 MDL-59172 user: user_can_view_profile() now checks viewalldetails cap 2017-08-07 09:27:04 +08:00
Andrew Nicols
d504e9207c MDL-59642 stats: Correct random unit test failure 
The unit test was creating four events, and then relying on them being
retrieved in the order in which they were created.

I've modified the test to:
* ensure timecreated are spaced apart; and
* add an order by timecreated when fetching them.
 2017-08-04 15:06:51 +08:00
Andrew Nicols
ee640d3f2d Merge branch 'm34_MDL-59583_Fix_MariaDB_10d2d7_Breaking_Change' of https://github.com/scara/moodle 2017-08-03 12:29:56 +08:00
Damyon Wiese
63f4aa20b2 MDL-59698 behat: Remove bad tests 
These tests are an abuse and should not have been accepted. Behat tests should use real pages.
Adding testing only entry points to Moodle is a bad security practice and is not the purpose of behat.
 2017-08-03 10:26:05 +08:00
Andrew Nicols
c6de3bd68f Merge branch 'MDL-59382-master-4' of git://github.com/ryanwyllie/moodle 2017-08-03 09:31:44 +08:00
Ryan Wyllie
d6942fb5ba MDL-59382 calendar: fix CiBoT warnings 2017-08-03 01:07:01 +00:00
Matteo Scaramuccia
2ec50fe3fd MDL-59583 dml: fixed NULL values w/ MariaDB 10.2.7+ 2017-08-03 00:13:03 +02:00
Jun Pataleta
1e674d0147 MDL-59613 course: Activity list dropdown menu fixes 
* Use the formatted name of the modules to be listed in the dropdown.
* Skip the current activity when adding activities for the dropdown.
 2017-08-02 17:02:24 +08:00
Simey Lameze
705eea84d1 MDL-59382 core: make CiBoT happy. 2017-08-02 07:52:20 +00:00
Andrew Nicols
9bed446559 Merge branch 'MDL-57259-master' of git://github.com/ryanwyllie/moodle 2017-08-02 13:39:23 +08:00
Simey Lameze
7934986284 MDL-59644 core_output: fix font awesome mapping for lock icons 2017-08-02 13:37:03 +08:00
Ryan Wyllie
aa0912258d MDL-59382 calendar: add modal to create and update events 2017-08-02 04:47:43 +00:00
Ryan Wyllie
6973baa31e MDL-59382 form: fix name in template context 2017-08-02 04:47:42 +00:00
Ryan Wyllie
a50768b97f MDL-59382 javascript: template context can be given to modal factory 2017-08-02 04:47:42 +00:00
Ryan Wyllie
4defa05fdc MDL-59382 javascript: fix large styling for modals 2017-08-02 04:47:42 +00:00
Ryan Wyllie
74eedb28b3 MDL-57259 external: fix page url debug in fragment loading 2017-08-02 04:47:41 +00:00
Ryan Wyllie
cacc04006f MDL-57259 external: fix page url debug in fragment loading 2017-08-02 03:37:32 +00:00
Dan Poltawski
e3a2d7a473 Merge branch 'MDL-59366-master' of git://github.com/junpataleta/moodle 2017-08-01 10:36:14 +01:00
Dan Poltawski
b8cf4be7a7 Merge branch 'MDL-59658-master' of git://github.com/junpataleta/moodle 2017-08-01 10:15:54 +01:00
David Monllao
266959a41e Merge branch 'MDL-59613-master' of git://github.com/junpataleta/moodle 2017-08-01 10:29:39 +02:00
David Monllao
71b917ace6 MDL-53492 hub: Fix remaining conflict 2017-08-01 10:03:31 +02:00
David Monllao
2c04945c58 Merge branch 'wip-MDL-53492-master' of git://github.com/marinaglancy/moodle 2017-08-01 09:20:57 +02:00
Jun Pataleta
3120ebab9d MDL-59658 core: Add login/logout steps for course participants scenario 
* Add student1 and student2 login/logout steps for the course
  participants filtering scenario in order to have last access data
  for students 1 and 2 since the participants table is sorted by last
  access by default.
* Remove @javascript tags for the following scenario:
  - Filter users on assignment submission page
  - Filter users on view gradebook page
  - Filter users on course participants page
  JS is not really necessary in these scenario and we can get faster
  execution time.
 2017-08-01 15:09:34 +08:00
Andrew Nicols
77c5325f81 Merge branch 'MDL-9367-master' of git://github.com/ankitagarwal/moodle 2017-08-01 13:39:38 +08:00
Damyon Wiese
f28c0c7245 MDL-59206 event: Add an event for a config_log 
This is useful because config_logs are sent via logstores, and we may be interested to know how
many people change a particular admin setting across many sites (aggregated data).
 2017-08-01 13:18:55 +08:00
Ankit Agarwal
0d14fcbc60 MDL-9367 restore: Roll only configuration dates 
It was decided to roll only configuration dates and any date related to user content
such as 'timecreated' , 'timemodified' etc should not be rolled forward.
 2017-08-01 10:46:37 +05:30
David Monllao
85a9c0b1e5 Merge branch 'MDL-59299-master' of https://github.com/xow/moodle 2017-08-01 04:56:09 +02:00
Andrew Nicols
5283fa3329 Merge branch 'MDL-59473' of https://github.com/sytabaresa/moodle 2017-08-01 10:46:39 +08:00
Andrew Nicols
13822dca07 Merge branch 'MDL-28574-master' of https://github.com/xow/moodle 2017-08-01 09:59:59 +08:00
Jun Pataleta
4698e169e5 MDL-59613 course: Add dropdown menu for activity list 
Part of MDL-59313.
 2017-07-31 22:25:22 +08:00
David Monllao
707f9beae1 Merge branch 'MDL-59612-master' of git://github.com/junpataleta/moodle 2017-07-31 13:59:55 +02:00
Dan Poltawski
6cc8b0a4a6 Merge branch 'MDL-59632_master' of git://github.com/dmonllao/moodle 2017-07-31 11:33:05 +01:00
David Monllao
726ad1bd08 Merge branch 'MDL-59511-master-oauthsysmail' of git://github.com/Dagefoerde/moodle 2017-07-31 11:46:30 +02:00
Dan Poltawski
23e1ce7d52 Merge branch 'wip-MDL-59476-master-2' of git://github.com/marinaglancy/moodle 2017-07-31 10:21:32 +01:00
John Okely
72e688d7ff MDL-28574 webservices: Explain tokens you can edit but can't see 2017-07-31 15:35:23 +08:00
David Monllao
634d0f8330 Merge branch 'MDL-58744-master' of https://github.com/jacac/moodle 2017-07-31 08:36:18 +02:00
Marina Glancy
7d792aeee4 MDL-53492 registration: use https://moodle.net as hub url 2017-07-31 14:31:11 +08:00
Mark Nelson
585146f0ab MDL-59612 core: edit 'frametop' layout so links display for LTI 
Part of MDL-59313.
 2017-07-31 12:03:28 +08:00
Mark Nelson
d8cb461529 MDL-59612 core: added previous and next links to activities 
Part of MDL-59313.
 2017-07-31 12:03:28 +08:00
Andrew Nicols
2653e0c8e1 Merge branch 'm34_MDL-59583_Fix_MariaDB_10d2d7_Breaking_Change' of https://github.com/scara/moodle 2017-07-31 11:37:45 +08:00
John Okely
1318aec36e MDL-59299 filepicker: Display what filetypes are accepted 2017-07-31 09:58:22 +08:00