mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
91,640 Commits 36 Branches 519 Tags
Commit Graph

91640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
f47c8f3525 MDL-64300 upgrade: add 3.6.0 separation line to all upgrade scripts 2018-12-02 18:36:40 +01:00
Eloy Lafuente (stronk7)
2cea0bd6c6 weekly back-to-dev release 3.7dev 2018-12-02 00:25:11 +01:00
Eloy Lafuente (stronk7)
2c608daca7 NOBUG: Change travis.yml back to master 2018-12-02 00:18:46 +01:00
Eloy Lafuente (stronk7)
cb628a9a08 Moodle release 3.6 v3.6.0 2018-12-02 00:18:46 +01:00
Eloy Lafuente (stronk7)
0cbcd08946 NOBUG: Change travis.yml to MOODLE_36_STABLE 2018-12-02 00:18:45 +01:00
Eloy Lafuente (stronk7)
5ff115743c Moodle release 3.6rc3 v3.6.0-rc3 2018-11-30 18:02:17 +01:00
Eloy Lafuente (stronk7)
ea8c34da48 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-11-30 18:02:15 +01:00
David Monllao
823fc75421 Merge branch 'MDL-64282' of git://github.com/stronk7/moodle 2018-11-30 13:02:47 +01:00
Jun Pataleta
b5e4b37aae Merge branch 'MDL-64000-master' of git://github.com/andrewnicols/moodle 2018-11-30 16:13:38 +08:00
Andrew Nicols
84dad5bffa MDL-64000 usertours: Add final step to new tours 
AMOS BEGIN
  CPY [tour_2_title_end,tool_usertours],[tour_final_step_title,tool_usertours]
AMOS END
 2018-11-30 16:04:33 +08:00
Jun Pataleta
9101a01fb8 Merge branch 'MDL-64000-master' of git://github.com/andrewnicols/moodle 2018-11-30 13:46:09 +08:00
Elizabeth Dalton
fbb219617b MDL-64000 usertours: Add tours for key 3.6 features 
Tours originally written by Elizabeth Dalton, Mangled a little by Andrew
Nicols and Sander Bangma, and language tweaks by Helen Foster.

AMOS BEGIN
 CPY [pluginname,block_recentlyaccessedcourses],[tour3_title_recentcourses,tool_usertours]
 CPY [pluginname,block_myoverview],[tour3_title_overview,tool_usertours]
 CPY [groupmessages,core_message],[tour4_title_groupconvo,tool_usertours]
 CPY [favourites,moodle,core_message],[tour4_title_starred,tool_usertours]
AMOS END

Co-authored-by: Andrew Nicols <andrew@nicols.co.uk>
Co-authored-by: Sander Bangma <sander@moodle.com>
Co-authored-by: Helen Foster <helen@moodle.org>
 2018-11-30 13:23:53 +08:00
Jun Pataleta
dad4bcf90c Merge branch 'MDL-64214-master' of git://github.com/junpataleta/moodle 2018-11-30 09:53:34 +08:00
Jun Pataleta
85354cb79e MDL-64214 calendar: Populate the groups select box on page load 2018-11-30 09:25:42 +08:00
AMOS bot
74afdef07d Automatically generated installer lang files 2018-11-30 00:07:31 +00:00
Eloy Lafuente (stronk7)
bcd85def5c MDL-64282 versions: main version bump 2018-11-29 18:28:33 +01:00
Eloy Lafuente (stronk7)
085353b315 MDL-64282 versions: bump all versions and requires near release 
version = 2018120300 release version
requires= 2018112800 current rc2 (week7roll1) version
 2018-11-29 18:24:08 +01:00
Jun Pataleta
98fada12c4 Merge branch 'MDL-64228-master' of git://github.com/jleyva/moodle 2018-11-29 20:51:52 +08:00
Damyon Wiese
1a368ec351 Merge branch 'MDL-64264_master' of git://github.com/markn86/moodle 2018-11-29 14:46:55 +08:00
Jun Pataleta
d71865419b Merge branch 'MDL-64227-master' of git://github.com/damyon/moodle 2018-11-29 14:07:26 +08:00
Simey Lameze
9cf58f070d MDL-64214 calendar: fix failing unit tests 2018-11-29 13:59:36 +08:00
Simey Lameze
b13fe83adb MDL-64214 core_calendar: fix event types form element handling 2018-11-29 13:59:32 +08:00
Mark Nelson
44b92ecdfc MDL-64264 core_message: use non-deprecated WS for deletion 
Also fixed typo in function name.
 2018-11-29 12:41:57 +08:00
Damyon Wiese
dda38f91ab Merge branch 'MDL-64245-master-fix-1' of git://github.com/ryanwyllie/moodle 2018-11-29 11:04:38 +08:00
Ryan Wyllie
9aaf61346f MDL-64245 message: fix scrollback for conversation loaded via contact 2018-11-29 10:46:13 +08:00
Jun Pataleta
7d82e35e39 MDL-64245 message: Ditch sender+lastmessage lang string for simplicity 
Passing the last message (which can virtually contain any character) as
a parameter for the {{#str}} mustache helper can break the JSON parsing
which eventually leads to the breakage of the messaging UI.
So for simplicity, revert the addition of the 'conversationlastmessage'
language string and render the sender and the last message as separate
elements.
 2018-11-29 10:45:22 +08:00
Ryan Wyllie
030f164ecc MDL-64245 message: fix contacts list height on Safari 10 2018-11-29 10:45:22 +08:00
Ryan Wyllie
b154e2bf7b MDL-64245 message: fix loading convo by id with lots of messages 2018-11-29 10:45:22 +08:00
AMOS bot
0a83e9f713 Automatically generated installer lang files 2018-11-29 00:08:12 +00:00
Andrew Nicols
cb14e3bc08 Merge branch 'MDL-63988-master' of git://github.com/bmbrands/moodle 2018-11-29 07:26:45 +08:00
Bas Brands
d996eb941f MDL-63988 core_my: always honour showshortname and summary heading 
* make the summaryview heading semantically correct for boost where titles
are h5 and headings within the blocks should have h6
* style the heading to use h5
* add clean theme .h5 class for dashboard blocks
 2018-11-28 17:36:21 +01:00
Bas Brands
f87181fdaf MDL-63988 core_my: add course shortname to dashboard blocks … 
* all dashboard card templates moved to /course/templates/
* added aria labels for course short name
* removed ":" from other course aria strings to improve screenreader output
 2018-11-28 17:36:20 +01:00
David Monllao
df6d0b6d45 Moodle release 3.6rc2 v3.6.0-rc2 2018-11-28 11:23:40 +01:00
David Monllao
c8527895b0 NOBUG: Fixed SVG browser compatibility 2018-11-28 11:23:38 +01:00
Juan Leyva
676545bc66 MDL-64228 nextcloud: Handle the offline parameter in send_file 
This will neew a follow-up issue.
This patch is just preventing downloading the HTML popup code when a file is not found.
Ideally, we should be able to serve the original file using the system OAuth.
 2018-11-28 10:21:27 +01:00
Jun Pataleta
5aba38cbc1 Merge branch 'MDL-64223-master' of https://github.com/snake/moodle 2018-11-28 13:59:50 +08:00
Damyon Wiese
da868a1e32 MDL-64227 nextcloud: Small layout for login links 
When we need to show a login link, we don't want the normal page layout because we are in an iframe
already. Use the embedded layout to reduce the clutter of the page.
 2018-11-28 12:51:31 +08:00
Andrew Nicols
b1e01063a8 Merge branch 'MDL-64224-master' of https://github.com/snake/moodle 2018-11-28 12:02:34 +08:00
Andrew Nicols
3dd518b7d2 Merge branch 'MDL-64217-master' of git://github.com/ryanwyllie/moodle 2018-11-28 11:08:22 +08:00
Andrew Nicols
c7891de160 Merge branch 'MDL-64207-master' of git://github.com/mihailges/moodle 2018-11-28 10:39:38 +08:00
Ryan Wyllie
c337741524 MDL-64099 message: fix lazy load list overflow 2018-11-28 10:25:29 +08:00
Damyon Wiese
2a9e70a818 Merge branch 'MDL-64099-master-fix' of git://github.com/junpataleta/moodle 2018-11-28 10:15:35 +08:00
Jun Pataleta
494575bc55 MDL-64099 message: Show last message for individual messages 2018-11-28 09:27:06 +08:00
Jake Dallimore
e412548506 MDL-64224 core_message: fix for isfavourite in api::get_conversation() 2018-11-28 09:09:07 +08:00
Eloy Lafuente (stronk7)
d67e734678 Merge branch 'MDL-64220-master' of git://github.com/damyon/moodle 2018-11-27 16:47:10 +01:00
Bas Brands
f3194f39bb MDL-64099 message: group conversation heading html 
* Fix for IE11 group conversation header image sticking to group name
 2018-11-27 13:15:22 +01:00
Bas Brands
4d446b8814 MDL-64099 message: last message container minimum size 
* empty last message containers should have a minimum size
to ensure list-group-item element are in the right place.
 2018-11-27 12:44:43 +01:00
Jake Dallimore
236f56d906 MDL-64223 libraries: PHP7.1 compatibility fixes for Jabber lib 2018-11-27 16:40:35 +08:00
Andrew Nicols
d9c72b7df9 Merge branch 'MDL-64161-master' of git://github.com/abgreeve/moodle 2018-11-27 15:13:16 +08:00
Damyon Wiese
ff015b5f7a MDL-64220 privacy: Clean path params 
We need to consistently clean the path params before we use them. This
shows a difference on windows where dir separators are different.
 2018-11-27 15:01:41 +08:00