mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 18:42:40 +01:00
Code Issues Projects Releases Wiki Activity
69,938 Commits 36 Branches 527 Tags
Commit Graph

69938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
c7ed7235c7 Merge branch 'MDL-47358-master' of git://github.com/FMCorz/moodle 2014-09-29 11:58:14 +01:00
Dan Poltawski
2633f23627 Merge branch 'MDL-47322-master' of https://github.com/sammarshallou/moodle 2014-09-29 11:12:29 +01:00
Dan Poltawski
156cd01e7b Merge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle 2014-09-29 10:42:50 +01:00
Dan Poltawski
f03b612191 Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-09-29 10:30:42 +01:00
Sam Hemelryk
525b6ebeb9 Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges 2014-09-29 15:18:03 +13:00
Sam Hemelryk
fcf0cc04b3 Merge branch 'MDL-47295-master' of git://github.com/FMCorz/moodle 2014-09-29 15:17:24 +13:00
Sam Hemelryk
55f0eb8328 Merge branch 'wip_MDL-47300_m28_tcpdf' of https://github.com/skodak/moodle 2014-09-29 15:15:47 +13:00
Sam Hemelryk
a9a09787e4 Merge branch 'wip-MDL-47398-master' of git://github.com/marinaglancy/moodle 2014-09-29 14:35:06 +13:00
Sam Hemelryk
71668d2efc Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle 2014-09-29 14:32:38 +13:00
Sam Hemelryk
ddd0d4a56b Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle 2014-09-29 14:23:18 +13:00
Sam Hemelryk
b87711a0dc Merge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle 2014-09-29 14:21:39 +13:00
Sam Hemelryk
503324d241 Merge branch 'MDL-39190' of https://github.com/pauln/moodle 2014-09-29 14:19:52 +13:00
Sam Hemelryk
a93039706c Merge branch 'MDL-20250_grade_settings2' of https://github.com/andyjdavis/moodle 2014-09-29 14:10:30 +13:00
Eloy Lafuente (stronk7)
9288030937 Merge branch 'MDL-47411-master-submodules' of git://github.com/mudrd8mz/moodle 2014-09-29 01:42:32 +02:00
Sam Hemelryk
e0533f2633 Merge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle 2014-09-29 11:35:23 +13:00
Sam Hemelryk
cec3ac8baf Merge branch 'MDL-42974-master' of https://github.com/sammarshallou/moodle 2014-09-29 11:21:19 +13:00
Sam Hemelryk
51606b8e63 Merge branch 'MDL-47378-master' of git://github.com/danpoltawski/moodle 2014-09-29 11:19:06 +13:00
Jean-Michel Vedrine
d92f768baa MDL-32870 mod_lesson: added support for files to question answers and responses 2014-09-29 11:00:28 +13:00
Brian Barnes
11edf09c61 MDL-46127 core_calendar: Removed tables when rendering a single event 2014-09-29 10:45:39 +13:00
Sam Hemelryk
29b72af1b2 Merge branch 'MDL-43566' of https://github.com/willylee/moodle 2014-09-29 09:51:35 +13:00
Sam Hemelryk
d672e25b6c Merge branch 'MDL-47395' of git://github.com/nebgor/moodle 2014-09-29 09:11:25 +13:00
Sam Hemelryk
3604d399e3 Merge branch 'MDL-47381' of git://github.com/timhunt/moodle 2014-09-29 09:06:35 +13:00
Sam Hemelryk
c8674e5ca5 Merge branch 'MDL-47380-master' of https://github.com/sammarshallou/moodle 2014-09-29 09:02:52 +13:00
Sam Hemelryk
50dfb7cf38 MDL-47252 mod_forum: fixed whitespace 2014-09-29 08:44:43 +13:00
Sam Hemelryk
a038c1e0a3 Merge branch 'MDL-47252-master' of git://github.com/gurgus/moodle 2014-09-29 08:43:51 +13:00
Eloy Lafuente (stronk7)
cfbd81253b MDL-47242 theme_bootstrapbase: Fixed whitespace (take2) 
Seems that previous whitespace fix was not ok.
 2014-09-28 18:27:40 +02:00
Juan Leyva
feae0f9f42 MDL-47200 WebServices: Add core_files_get_files to the mob app service 2014-09-27 22:58:38 +02:00
Juan Leyva
29ad8f9746 MDL-47163 messages: Upgrade Mobile notifications to use Airnotifier v2 2014-09-27 22:55:56 +02:00
AMOS bot
ca9fe684fe Automatically generated installer lang files 2014-09-28 00:09:28 +08:00
Dmitry Nefedov
e2e1c98a7f MDL-47408 user: Add enableblogs checking before adding blog's link. 2014-09-27 15:23:13 +08:00
Michael Hughes
ad2fc0d83f MDL-47214 General: Multiple IP addresses in X-Forwarded-For Fixed 
Fixed getremoteaddr() function handle multiple IP addresses
Addressed point 2 on Dan's list
Stopped changing $CFG value after started test.
 2014-09-26 16:28:57 +01:00
sam marshall
5298d02f6e MDL-42974 UI: Modal dialogs do not work in IE8 2014-09-26 15:47:36 +01:00
sam marshall
38584d1167 MDL-47380 Availability: Editing interface broken in IE8 2014-09-26 15:47:00 +01:00
sam marshall
06c0603825 MDL-47322 Availability: empty availability should be saved as null 
As part of the unit test modifications for this change, I added the get_json
function to the availability conditions that didn't have it. (This is a function
for use in unit tests.)
 2014-09-26 15:42:37 +01:00
Tim Hunt
02643dafe7 MDL-47381 qformat: Behat tests have wrong plugin type. 2014-09-26 11:46:06 +01:00
Dave Cooper
e89682d822 MDL-32275 enrol: Last site access column now shows last course access 2014-09-26 10:51:47 +08:00
Andrew Davis
3f02391834 MDL-36929 mod_forum: added bolding of discussion titles on the recent activity page 2014-09-26 10:48:57 +08:00
Frederic Massart
a3634cc382 MDL-47295 libraries: Re-apply removal of random seed initialisation 
See MDL-41198.
 2014-09-26 10:33:40 +08:00
Frederic Massart
6000b797ab MDL-47295 libraries: Update AdoDB to v5.19 2014-09-26 10:31:42 +08:00
Andrew Davis
0e99979638 MDL-20250 core_grade: added some settings to disable or hide gradebook functionality 2014-09-26 10:19:00 +08:00
Petr Skoda
64d1184600 MDL-47333 fix support for custom fonts in tcpdf 2014-09-26 13:58:30 +12:00
Marina Glancy
f4f2045a7f MDL-47398 core_grades: fix grade category generator 2014-09-26 09:57:56 +08:00
Sam Hemelryk
3a6ef60a5b MDL-47428 language: fixed typo 2014-09-26 10:05:24 +12:00
David Mudrák
a5d08dce93 MDL-47411 admin: Check if the plugin is a git submodule on uninstalling 
Credit goes to PJ King. I was trying to add unit tests for this new
behaviour but it turned out there are many hard-coded dependencies and
it's not easy to make the whole machinery support alternative location
of testable (fake) plugins.
 2014-09-25 21:17:53 +02:00
David Mudrák
2cdea9c7ac MDL-47069 admin: Add option to upload required ZIP at the check page 
The plugins check page displays other plugins that the current one
depends on.  Previously, we always displayed the other plugin as a link
to the plugins directory. This did not work well in two scenarios:

* The admin wants/needs to upload the other plugin from the ZIP file
  (e.g. it is not available in the plugins directory),

* the other plugin is actually a standard plugin that is not supposed to
  be registered with the plugins directory.

This patch displays the Install or Upload or Check for updates links
next to the required plugin instead, as appropriate.
 2014-09-25 16:54:21 +02:00
Stephen Bourget
accc3ced1a MDL-46084 Calendar: Fix importing of full day events from Google 2014-09-25 09:42:10 -04:00
Dmitry Nefedov
e5fc064876 MDL-47385 coursecat: Mistake line in phpdocs deleted. 2014-09-25 21:17:52 +08:00
Willy Lee
14cea3164f MDL-43566 course: add delete icon to search returns in course management listings 2014-09-25 05:56:11 -07:00
Dan Poltawski
d07b0302a9 weekly release 2.8dev 2014-09-25 11:17:51 +01:00
Dan Poltawski
3f87d42707 NOBUG: Fixed SVG browser compatibility 2014-09-25 11:17:48 +01:00