mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 00:20:37 +01:00
Code Issues Projects Releases Wiki Activity
72,224 Commits 36 Branches 527 Tags
Commit Graph

19739 Commits

Author SHA1 Message Date
Paul Nicholls
10fae2779e MDL-48973 Atto: Atto does not listen to the drop event 
The 'drop' event fires before the native ContentEditable drop handler, so
in order to update the underlying textarea we need to call updateOriginal
with a brief delay so that the dropped content has actually been added to
the editor.
 2015-02-13 14:48:12 +13:00
David Monllao
d3dac40019 MDL-48894 core_registration: Fixing version value 2015-02-11 16:18:06 +08:00
David Monllao
d0676138b2 Merge branch 'MDL-48894_registration' of git://github.com/andyjdavis/moodle 2015-02-11 09:11:06 +08:00
gthomas2
78c36b065f MDL-46763 core: Change icon processing to retain source format 2015-02-10 23:55:57 +01:00
Andrew Davis
806c06fc7b MDL-48894 core_registration: make it more obvious if site is registered 2015-02-10 21:12:10 +01:00
Eloy Lafuente (stronk7)
3b77006451 Merge branch 'MDL-49036-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2015-02-10 13:29:10 +01:00
Dan Poltawski
bb2b3dea79 Merge branch 'wip-mdl-49081' of https://github.com/rajeshtaneja/moodle 2015-02-10 09:08:31 +00:00
Jetha Chan
3451a51cdf MDL-37477 output: Add support for table captions 
Conflicts:
	lib/upgrade.txt
	theme/bootstrapbase/style/moodle.css
 2015-02-10 16:15:49 +08:00
David Monllao
6e47fb1da3 Merge branch 'MDL-49024_master' of git://github.com/nadavkav/moodle 2015-02-10 12:32:23 +08:00
David Monllao
4c75cc3278 Merge branch 'MDL-48937-master' of git://github.com/FMCorz/moodle 2015-02-10 11:41:42 +08:00
David Monllao
4b408c3afe Merge branch 'MDL-48960-master' of git://github.com/danpoltawski/moodle 2015-02-10 11:12:18 +08:00
David Monllao
f01845c2a6 Merge branch 'MDL-48212-master' of git://github.com/ankitagarwal/moodle 2015-02-10 08:54:13 +08:00
Eloy Lafuente (stronk7)
8bcc97f056 Merge branch 'MDL-49073-master' of git://github.com/jethac/moodle 2015-02-10 01:04:38 +01:00
Dan Poltawski
c874c3c455 Merge branch 'MDL-48544-master' of git://github.com/andrewnicols/moodle 2015-02-09 22:42:01 +00:00
Dan Poltawski
8edac41831 Merge branch 'MDL-43535_master' of git://github.com/dmonllao/moodle 2015-02-09 22:39:36 +00:00
Andrew Nicols
4b410a6875 MDL-48544 blocks: Only add docked tags if all blocks are docked 
Previously, if all blocks were hidden, then the region was reported as
being docked eroniously and it was not possible to unhide the blocks.

Docking should have no relation to the presence of block content.
 2015-02-09 20:55:10 +08:00
Dan Poltawski
b9d7f56337 Merge branch 'MDL-30239-master' of git://github.com/jleyva/moodle 2015-02-09 12:32:59 +00:00
Eloy Lafuente (stronk7)
ea4630411e Merge branch '39459-29' of git://github.com/samhemelryk/moodle 2015-02-09 13:17:32 +01:00
Dan Poltawski
8ddf449ae5 Merge branch 'MDL-44520-master' of git://github.com/xow/moodle 2015-02-09 11:33:13 +00:00
Dan Poltawski
1a12542d6a Merge branch 'MDL-48294-master' of git://github.com/jleyva/moodle 2015-02-09 11:28:21 +00:00
Yuliya Bozhko
62fef3cf7e MDL-47085 badges: Fix badges file download issues 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2015-02-09 16:00:17 +13:00
David Monllao
3c1aa6fdfb MDL-43535 webservices: Marking functions as deprecated 
Also:
- We don't allow users to add deprecated functions to WS
- We show a debugging message when deprecated functions
  are already being used in web services.
 2015-02-09 05:42:22 +08:00
Nadav Kavalerchik
05da285001 MDL-49024 output: Add new translation token 'erroroutput' 2015-02-06 23:02:45 +02:00
John Okely
102cfc4964 MDL-44520 behat: Add behat selectors for section, activity 2015-02-06 10:34:54 +08:00
Juan Leyva
3a2ba74694 MDL-49036 webservices: New ws gradereport_user_get_grades_table 2015-02-05 16:58:51 +01:00
Juan Leyva
6655d6ef63 MDL-48294 settings: enablemobilewebservice appears twice 2015-02-05 14:22:04 +01:00
Juan Leyva
7310dcff41 MDL-30239 webservices: Return additional fields in ws get_files 2015-02-05 14:20:24 +01:00
Dan Poltawski
6cc38fb64d MDL-48960 output: use nofollow attribute to stop crawling invalid links 
Both the calendar set url and switch theme links are displayed to
non-logged in users which mean they get crawled by search bots. This
prevents the search bots following these links.
 2015-02-05 08:13:19 +00:00
Dan Poltawski
80f8372926 Revert "Merge branch 'MDL-37477-master' of git://github.com/jethac/moodle" 
This reverts commit f13e8ad04168574574d5be2995502d849109d3f9, reversing
changes made to c6bcbad07a7fd437991ee7a2a1a98973949fac43.
 2015-02-05 08:07:29 +00:00
Andrew Nicols
c346996f38 Merge branch 'MDL-48719-master' of git://github.com/jleyva/moodle 2015-02-04 12:53:34 +08:00
Eloy Lafuente (stronk7)
0db8095621 Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle 2015-02-04 03:39:07 +01:00
David Monllao
4879ea0e18 MDL-47159 atto_link: Adding prefix when url doesn't specify one 2015-02-04 10:23:04 +08:00
Rajesh Taneja
288eea620a MDL-49081 tests: Removed dev option from composer 
dev option is enabled by default in composer, so not required.
https://github.com/composer/composer/blob/master/CHANGELOG.md
 2015-02-04 10:19:46 +08:00
Sam Hemelryk
7fa57e0341 MDL-39459 cache: mode included in stats output 
The cache store mode is now included in the performance stats
printed at the bottom of the page.
It is represented as either [a] [s] or [r] and a title is used
to actually state the mode.
 2015-02-04 09:35:21 +13:00
Dan Poltawski
8448af7d86 Merge branch 'behat_goutte_nowait' of https://github.com/tlevi/moodle 2015-02-03 13:08:32 +00:00
Dan Poltawski
cf02542d93 MDL-44071 upgrade.txt: improve notice 2015-02-03 12:20:39 +00:00
Dan Poltawski
1ee0c927b2 Merge branch 'MDL-44071-master' of git://github.com/zbdd/moodle 2015-02-03 12:16:16 +00:00
Dan Poltawski
cb4748b67d Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle 2015-02-03 11:01:05 +00:00
Jetha Chan
a952ed04d1 MDL-49073 timezones: update to 2015a (2323 rules) 2015-02-03 17:37:30 +08:00
Andrew Nicols
794e3c8cd5 Merge branch 'MDL-48865-master' of git://github.com/xow/moodle 2015-02-03 16:36:11 +08:00
Neill Magill
f95b1e85fb MDL-48865 core_block: Show regions with only hidden blocks when editing 
Before this patch if all the blocks in a block region are set to hidden the region will be docked even when editing is enabled.
This meant that as a user I would need to add a new block to the page and move it to that region via the configuration
menu before I could manipulate the hidden blocks again.
 2015-02-03 16:14:20 +08:00
Andrew Nicols
70b7861da2 Merge branch 'tgz_fixing' of https://github.com/tlevi/moodle 2015-02-03 16:02:59 +08:00
Andrew Nicols
bd8c9bc343 Merge branch '48968-29' of git://github.com/samhemelryk/moodle 2015-02-03 14:22:19 +08:00
Andrew Nicols
f13e8ad041 Merge branch 'MDL-37477-master' of git://github.com/jethac/moodle 2015-02-03 13:48:54 +08:00
Andrew Nicols
c6bcbad07a MDL-48484 admin: Improve coding style 2015-02-03 13:40:30 +08:00
Jetha Chan
49faeef6bb MDL-37477 output: Add support for table captions 2015-02-03 13:38:24 +08:00
Andrew Nicols
5dee60446c Merge branch 'm29_MDL-48484' of https://github.com/totara/moodle 2015-02-03 13:04:38 +08:00
Andrew Nicols
43bde1b9fd Merge branch 'm29_MDL-46467' of https://github.com/totara/moodle 2015-02-03 12:57:25 +08:00
James Henestofel
70f379639a MDL-44071 webservices: Sorting courses post deletion. 
Additional warnings added if particular steps fail.

Signed-off-by: Zachary Durber <zdurber@gmail.com>
 2015-02-02 16:37:12 +08:00
Brian Barnes
e323bf512f MDL-48484 admin: Added labels to configtime settings 2015-02-02 09:42:38 +13:00