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

84838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
93c97fdc3a Merge branch 'MDL-59158-master' of git://github.com/junpataleta/moodle 2017-06-27 16:39:41 +02:00
David Monllao
c4b25152cc Merge branch 'MDL-57927-master' of git://github.com/lameze/moodle 2017-06-27 15:55:17 +02:00
Eloy Lafuente (stronk7)
c32f0cd62a Merge branch 'MDL-58844-master' of git://github.com/andrewnicols/moodle 2017-06-27 11:41:08 +02:00
Eloy Lafuente (stronk7)
ce836829e6 Merge branch 'MDL-59296-master' of git://github.com/crazyserver/moodle 2017-06-27 11:37:52 +02:00
Eloy Lafuente (stronk7)
e2aa2f25f1 Merge branch 'MDL-59123-master-3' of git://github.com/ryanwyllie/moodle 2017-06-27 09:24:24 +02:00
Jake Dallimore
8d7ae061e3 Merge branch 'MDL-59312-master' of https://github.com/xow/moodle 2017-06-27 15:07:44 +08:00
Ryan Wyllie
5dd40ec4b4 MDL-59123 admin: add cli script to compile theme CSS 
Added a script to selectively compile theme CSS. In order to allow
compiling on per theme basis without purging all theme CSS in the
local cache I have made some changes to how CSS is compiled and
how it is accessed via local cache.
 2017-06-27 06:48:45 +00:00
Jake Dallimore
cb37f200a8 Merge branch 'MDL-59275-master' of git://github.com/lameze/moodle 2017-06-27 13:57:11 +08:00
Jake Dallimore
196558a5d8 Merge branch 'MDL-56046_master-fix' of git://github.com/markn86/moodle 2017-06-27 13:16:42 +08:00
Simey Lameze
92c8cb9d98 MDL-59275 auth: prevent user login failed coding error 2017-06-27 13:04:02 +08:00
Mark Nelson
e0ee37e426 MDL-56046 dataformat: changes to docs, upgrade.txt and error message 2017-06-27 11:35:05 +08:00
Eloy Lafuente (stronk7)
7ad2822269 Merge branch 'MDL-56046_master' of git://github.com/markn86/moodle 2017-06-27 02:42:31 +02:00
Eloy Lafuente (stronk7)
139648e5bd Merge branch 'MDL-40818-master' of git://github.com/junpataleta/moodle 2017-06-27 01:50:28 +02:00
Andrew Nicols
29d409b642 MDL-58844 testing: Move to GCE build infrastructure 
Switch back to GCE build infrastructure for Travis Builds and move
databases to RAM Disk.

This also adds a software entropy generator (haveged) which is
recommended when using a RAMdisk for the database.
 2017-06-27 07:42:38 +08:00
Eloy Lafuente (stronk7)
51fc76193d Merge branch 'MDL-59295-master' of git://github.com/lameze/moodle 2017-06-27 00:53:28 +02:00
Eloy Lafuente (stronk7)
1dac440f55 MDL-58813 phpunit: pick test from 32_STABLE to fix expected behavior 2017-06-26 19:46:05 +02:00
Eloy Lafuente (stronk7)
df30a5a25f Merge branch 'MDL-1322-master' of git://github.com/junpataleta/moodle 2017-06-26 18:15:25 +02:00
Eloy Lafuente (stronk7)
41c17610c0 Merge branch 'MDL-59297_myoverview_error' of git://github.com/davosmith/moodle 2017-06-26 13:04:42 +02:00
Mark Nelson
faf45f9c47 MDL-56046 core: enable multiple sheets for flexible table 2017-06-26 13:59:30 +08:00
Mark Nelson
d4606c1b24 MDL-56046 dataformat: added related information to upgrade.txt 2017-06-26 13:59:30 +08:00
Jun Pataleta
390098fa64 MDL-1322 calendar: Add course short name in calendar event 
* Add the course's short name for a course event in order to let the
user know immediately which course an event belongs to. Particularly
helpful for activity events.
 2017-06-26 13:37:39 +08:00
Mark Nelson
eb26be5b39 MDL-56046 dataformat_*: convert core plugins 2017-06-26 13:29:32 +08:00
Mark Nelson
ce3beb267c MDL-56046 core: convert download_as_dataformat to use new API 2017-06-26 13:29:32 +08:00
Mark Nelson
b62b5879af MDL-56046 core_dataformat: added functions to support multiple sheets 
Also removed write_header() and write_footer(). The reason for this
is because in core we want to know if the format being used supports
multiple sheets. To do this, and ensure we do not break third-party
dataformat plugins, we are using method_exist(). If write_header()
and write_footer() remain in the base class then this will always
be true.
 2017-06-26 13:29:32 +08:00
Jake Dallimore
e6142a1e2e Merge branch 'MDL-49484-master' of github.com:jebarviabb/moodle 2017-06-26 10:51:43 +08:00
Josh Ebarvia
a06face2ce MDL-49484 mod_lesson: Fix lesson page headers when editing 2017-06-24 05:21:25 +09:30
Pau Ferrer Ocaña
43cf2cb0a4 MDL-59296 data: Fix latlong field search 2017-06-23 09:15:40 +02:00
Andrew Nicols
bd90b61ad2 MDL-59312 js: Improve display of exception stacktrace 2017-06-23 10:44:15 +08:00
John Okely
6bdcaa1320 MDL-59312 notification: Normalise backtrace/stacktrace 2017-06-23 10:43:56 +08:00
Andrew Nicols
fa038116bc MDL-59312 js: Add exception on AJAX error 2017-06-23 10:42:22 +08:00
Jun Pataleta
91af29ba57 MDL-59158 theme_boost: Remove auto width and height for user picture 2017-06-23 10:12:47 +08:00
Jun Pataleta
fb1a615dfe MDL-40818 calendar: Require login to calendar pages 
* Make sure that the course ID being passed points to an existing course
* Require user to login before granting access to calendar pages.
 2017-06-23 09:20:32 +08:00
Dan Poltawski
f4a2d69631 weekly release 3.4dev 2017-06-22 15:40:45 +01:00
Dan Poltawski
6894a98aa1 NOBUG: Fixed SVG browser compatibility 2017-06-22 15:40:44 +01:00
Juan Leyva
bef201c7e0 MDL-58712 core_user: Do not count the root directory 2017-06-22 16:09:58 +02:00
Jake Dallimore
828540b557 Merge branch 'wip-MDL-58919-master' of https://github.com/marinaglancy/moodle 2017-06-22 16:09:56 +02:00
Marina Glancy
412a56027b MDL-58919 mod_assign: fix check for existing setting 2017-06-22 16:09:55 +02:00
Eloy Lafuente (stronk7)
b78887cc4b Merge branch 'MDL-59170-master' of https://github.com/xow/moodle 2017-06-22 16:09:53 +02:00
John Okely
76b5fe8665 MDL-59170 fontawesome: Fix course total controls icon on grader report 2017-06-22 09:13:20 +08:00
Dan Poltawski
8c0b1ec32b Merge branch 'MDL-58919-master-fix1' of https://github.com/snake/moodle 2017-06-21 10:22:11 +01:00
Jake Dallimore
c6b32acdb1 MDL-58919 mod_assign: fix allowing accepted file types to be empty 2017-06-21 17:15:21 +08:00
Jake Dallimore
34e2b1f92d Merge branch 'MDL-56979-master-fix' of git://github.com/junpataleta/moodle 2017-06-21 14:21:56 +08:00
Jun Pataleta
a7184670fd MDL-56979 group: Template and styles fixes 
* Remove custom styles for groups since we're using default Bootstrap
  styles now.
* Hidden input breaks grid layout. Moved it inside the groups column.
* Removed unnecessary 'groups' and 'members' classes. They are not being
  used in JS nor CSS.
 2017-06-21 11:02:16 +08:00
Jun Pataleta
91fe23133c Merge branch 'MDL-58892-mahara-icon-update' of https://github.com/peikk0/moodle 2017-06-21 08:52:46 +08:00
Eloy Lafuente (stronk7)
46e9afecf3 Merge branch 'MDL-58985-master-bluebubbles' of git://github.com/mudrd8mz/moodle 2017-06-21 00:45:07 +02:00
Pierre Guinoiseau
58f2660009 MDL-58892 pix: update icon for Mahara 2017-06-21 10:14:08 +12:00
Eloy Lafuente (stronk7)
2eb67fdc88 Merge branch 'wip-MDL-59125-master' of git://github.com/marinaglancy/moodle 2017-06-20 21:45:38 +02:00
Eloy Lafuente (stronk7)
9ee6de4389 Merge branch 'wip-MDL-59263-master' of git://github.com/marinaglancy/moodle 2017-06-20 18:02:09 +02:00
Eloy Lafuente (stronk7)
42a78077c6 Merge branch 'MDL-59269-master-languninstall' of git://github.com/mudrd8mz/moodle 2017-06-20 17:56:44 +02:00
Eloy Lafuente (stronk7)
41781cf31d Merge branch 'MDL-59214-master' of git://github.com/jleyva/moodle 2017-06-20 17:46:55 +02:00