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

84822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Dallimore
196558a5d8 Merge branch 'MDL-56046_master-fix' of git://github.com/markn86/moodle 2017-06-27 13:16:42 +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
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
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
Dan Poltawski
22ef8f1f9b Merge branch 'MDL-58919-master' of git://github.com/Dave-B/moodle 2017-06-20 14:24:59 +01:00
Juan Leyva
bef5777fc4 MDL-59214 webservice: Return calendar type in get_site_info 2017-06-20 11:44:04 +01:00
Dan Poltawski
3fb9ca78c7 Merge branch 'MDL-58952' of https://github.com/scyrma/moodle 2017-06-20 11:31:30 +01:00
Davo Smith
977258bacd MDL-59297 block_myoverview: fix fatal error (missing require_once) 2017-06-20 11:13:03 +01:00
Dan Poltawski
4431f1e0e3 Merge branch 'MDL-59005-master' of git://github.com/lameze/moodle 2017-06-20 09:51:50 +01:00
Dan Poltawski
2764bcf49b Merge branch 'MDL-58472-master' of git://github.com/damyon/moodle 2017-06-20 09:38:29 +01:00
Jun Pataleta
88720416ba Merge branch 'wip-MDL-58911-master' of git://github.com/marinaglancy/moodle 2017-06-20 16:33:15 +08:00
Jun Pataleta
d938d1b6e2 Merge branch 'MDL-57770-master' of git://github.com/lameze/moodle 2017-06-20 16:27:48 +08:00
Marina Glancy
63e9e38202 MDL-58911 calendar: use the same callbacks in unittests and prod 
Remove unittest-specific callbacks for checking access and displaying
the calendar events on the dashboard.

This will allow plugin developers unittest the full behavior
of how their plugins add events to the dashboard.

Reset all static caches between unittests.
 2017-06-20 16:13:35 +08:00
Dan Poltawski
0ba61c3bf8 Merge branch 'MDL-59160-master' of git://github.com/jleyva/moodle 2017-06-20 09:10:25 +01:00
Simey Lameze
9524169a59 MDL-59295 tool_lp: remove useless ng-label attribute 2017-06-20 16:08:20 +08:00
Jake Dallimore
6f2950cf59 Merge branch 'wip-MDL-58729-master' of git://github.com/abgreeve/moodle 2017-06-20 15:18:16 +08:00
Jun Pataleta
b70b7df6d3 Merge branch 'MDL-58766-clean-tree-item-indent' of https://github.com/lucaboesch/moodle 2017-06-20 15:09:41 +08:00
Jun Pataleta
65f1cac814 Merge branch 'MDL-59270-master' of git://github.com/lameze/moodle 2017-06-20 09:58:37 +08:00
Simey Lameze
07782e10f1 MDL-59270 block_myoverview: tab setting logic to main template on clean 2017-06-20 08:45:18 +08:00