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
87,269 Commits 36 Branches 519 Tags
Commit Graph

87269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
6b2a9a6fb8 Merge branch 'MDL-60765-master' of git://github.com/andrewnicols/moodle 2017-11-10 10:55:09 +08:00
Mihail Geshoski
ae4522ff55 MDL-60675 analytics: Error when selecting invalid insight 2017-11-10 10:43:51 +08:00
Andrew Nicols
fb5bbf1424 MDL-60765 theme: Make inplace-autocomplete rule more specific 
This change was intended to fix an issue with the autocomplete in RTL,
but was applied to all inplace-editables.
 2017-11-10 10:29:11 +08:00
Damyon Wiese
ce225e1c5e MDL-52838 workshop: Each criterion > 0 levels 
Add validation to the edit assessment form so each criterion in a rubric requires at least one level.
 2017-11-10 10:22:27 +08:00
Ryan Wyllie
08b7558483 MDL-60766 block_calendar_upcoming: stop summary modal not logged in 
Stopped the JS from running on the block when the user is not logged in
because it attempts to load a summary modal when an event is clicked on
which results in a failed call to a webservice.
 2017-11-10 02:20:32 +00:00
Andrew Nicols
9dead25fd5 MDL-60763 core_calendar: Revert removal of calendar_get_upcoming 
This reverts part of commit 522b84be04a7551fa7de64a0db460268dc5c4a2a.
 2017-11-10 10:11:42 +08:00
Ryan Wyllie
eac88b955f MDL-60766 block_calendar_month: hide nav when not logged in 2017-11-10 02:07:50 +00:00
Eloy Lafuente (stronk7)
438c98cc98 MDL-60764 versions: main version bump 2017-11-10 02:56:14 +01:00
Eloy Lafuente (stronk7)
ba854606e6 MDL-60764 versions: bump all versions and requires near release 
version = 2017111300 release version
requires= 2017110800 current rc2 version
 2017-11-10 02:52:53 +01:00
Jake Dallimore
f5b63fc829 Merge branch 'MDL-60760_master' of git://github.com/dmonllao/moodle 2017-11-10 09:32:17 +08:00
Andrew Nicols
6996fbaa0e MDL-60763 core_calendar: Revert removal of calendar_get_upcoming 
Revert "MDL-60092 core_calendar: remove unused calendar_get_upcoming method"

This reverts commit 4259387ebb7ce04d3adafc61f0c7d70525eeddf3.
 2017-11-10 08:11:36 +08:00
David Monllao
20305a8a8f MDL-60758 tool_analytics: Skip guess start if higher than guess end 2017-11-09 17:11:34 +01:00
David Monllao
5da020169e MDL-60760 tool_analytics: No onlycli link for managers 2017-11-09 17:05:08 +01:00
Sara Arjona
2f673d8b6a MDL-60749 scorm: Remove   from files when downloading 2017-11-09 10:15:03 +01:00
Sara Arjona
4bcb0a9a1d MDL-60550 user: Add more restrictions in keyword searches 
Original patch provided by Tim Schroeder.
 2017-11-09 16:29:29 +08:00
David Monllao
a4e0b7468c Merge branch 'MDL-60718-master' of git://github.com/sarjona/moodle 2017-11-09 09:27:01 +01:00
David Monllao
7fdcdc04ff Merge branch 'MDL-60615-master' of git://github.com/damyon/moodle 2017-11-09 08:48:48 +01:00
Damyon Wiese
bef5a8ca10 Merge branch 'MDL-60752-master' of git://github.com/andrewnicols/moodle 2017-11-09 15:08:11 +08:00
Damyon Wiese
246698e779 MDL-60615 imscc: string to array fix 
Sloppy typing in the imscc converter is causing errors on php7.1

Variable is initialised as a string and then used as an array.
 2017-11-09 15:05:36 +08:00
Jake Dallimore
4f3262fede Merge branch 'MDL-60753_master' of git://github.com/markn86/moodle 2017-11-09 14:47:23 +08:00
Andrew Nicols
f169f4fd21 MDL-60752 lti: Compare text in types_config properly 2017-11-09 14:25:51 +08:00
Mark Nelson
d48d1ba19a MDL-60753 report_competency: fixed dialogue failing to show 2017-11-09 14:11:24 +08:00
Jun Pataleta
7a571b813a Merge branch 'MDL-60628-master' of git://github.com/lameze/moodle 2017-11-09 17:08:46 +13:00
Simey Lameze
754016ab33 MDL-60628 calendar: amend web service unit test 2017-11-09 11:43:49 +08:00
Simey Lameze
10c17dcc10 MDL-60628 calendar: support category events on get_calendar_events ws 2017-11-09 11:29:07 +08:00
Andrew Nicols
5518a32de5 Merge branch 'MDL-60579-master-fix2' of https://github.com/damyon/moodle 2017-11-09 11:18:14 +08:00
Damyon Wiese
56f05f23c6 MDL-60579 user: Don't lose text filters 
When replacing a group filter with a different group filter - don't forget all the current text filters that have
been applied.
 2017-11-09 11:06:30 +08:00
Damyon Wiese
bb869f05e8 MDL-60579 user: Move defines into library 
Entry page user/index.php was defining constants that were used by the renderer.
This means the renderer was tied to user/index.php.
 2017-11-09 11:06:30 +08:00
Andrew Nicols
7cf4331a6f MDL-60579 user: Correct PARAM type for filters 
Damyon pointed out during the integration of this fixset, that the
PARAM type is incorrect.
 2017-11-09 10:07:13 +08:00
Andrew Nicols
762f8dc1db MDL-60579 user: Add missing case breaks 2017-11-09 09:07:34 +08:00
Andrew Nicols
a997dc9da5 MDL-60579 user: Correct search for strings 2017-11-09 09:07:21 +08:00
Andrew Nicols
446b21b512 MDL-60579 user: Check filter strings have correct part count 2017-11-09 09:07:02 +08:00
Andrew Nicols
3968d2ca7e MDL-60579 user: Prevent behat from interacting til setup complete 2017-11-09 09:05:22 +08:00
Adam Olley
7f83e99e5f MDL-60707 core_search: In tests, use faked time for indexing length 
Without this change its possible that the unit tests will fail at any time.
Before this change the indexing time is measured by real-time, not fake time,
making all index timings 0.

This happens as PHP offers no guarantee around the sort-order of an array for
any given two members that equate as equal. It just happens to pass for the
current array of search areas in vanilla Moodle.
 2017-11-09 10:49:53 +10:30
AMOS bot
68c580c903 Automatically generated installer lang files 2017-11-09 00:05:00 +00:00
Matteo Scaramuccia
373a35dd31 MDL-60745 phpunit: Bump phpunit from 6.4.3 to 6.4.4 
$ php composer.phar update
Loading composer repositories with package information
Updating dependencies (including require-dev)
Package operations: 0 installs, 3 updates, 0 removals
  - Updating sebastian/comparator (2.0.2 => 2.1.0): Downloading (100%)
  - Updating phpunit/php-code-coverage (5.2.2 => 5.2.3): Downloading (100%)
  - Updating phpunit/phpunit (6.4.3 => 6.4.4): Downloading (100%)
Writing lock file
Generating autoload files
 2017-11-08 23:02:24 +01:00
João Umberto Ciocca de Almeida
6bc8a2e11f
MDL-60654 calendar: Clean up lines 140-154 
The if+switch code between lines 140 and 154, even though they selected 3 different choices, all of them gave the same result.
Therefore, it'd be cleaner to replace those 16 lines for just two.
 2017-11-08 18:36:03 -02:00
Sara Arjona
0c0d460e8b MDL-60718 analytics: Avoid duplicates for users with 2 enrolments 2017-11-08 19:12:59 +01:00
David Monllao
ed0e2cea00 Merge branch 'MDL-60732-master' of git://github.com/damyon/moodle 2017-11-08 17:48:07 +01:00
David Monllao
7effd6dd79 Merge branch 'MDL-60720-master' of https://github.com/sammarshallou/moodle 2017-11-08 17:27:15 +01:00
David Monllao
29adfbc3c8 Merge branch 'MDL-58699-master' of git://github.com/damyon/moodle 2017-11-08 15:56:25 +01:00
Tim Hunt
d00007bc45 MDL-60741 purgecaches: did not correctly setup the admin page 
Note that, admin_externalpage_setup does the right capability check.
 2017-11-08 14:30:27 +00:00
David Monllao
4e73acf3cf Merge branch 'MDL-60579-master' of https://github.com/mihailges/moodle 2017-11-08 12:16:20 +01:00
David Monllao
fcafb22c22 MDL-60733 oauth: Remove outdated comment 2017-11-08 12:04:31 +01:00
David Monllao
6463a047a2 Merge branch 'MDL-60733-master' of git://github.com/damyon/moodle 2017-11-08 12:03:43 +01:00
David Monllao
ccf7578373 Moodle release 3.4rc2 v3.4.0-rc2 2017-11-08 09:47:39 +01:00
David Monllao
68ba214c65 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-11-08 09:47:38 +01:00
Damyon Wiese
a471bc4971 MDL-60732 core_user: Show group filters 
Always show the group filters, even if the course is in NO_GROUPS mode.
 2017-11-08 16:45:42 +08:00
Damyon Wiese
b6319f70bd Merge branch 'MDL-60590-master' of git://github.com/andrewnicols/moodle 2017-11-08 15:46:44 +08:00
Damyon Wiese
d3882ea4a3 MDL-60733 core: B/C for google_oauth 
The google_oauth class extends oauth2client which was modified to send "Accept" headers.

The "Accept" headers break picasa and could break any other plugin that was using google_oauth.
 2017-11-08 15:41:53 +08:00