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

19719 Commits

Author SHA1 Message Date
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
John Okely
102cfc4964 MDL-44520 behat: Add behat selectors for section, activity 2015-02-06 10:34:54 +08: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
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
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
Rajesh Taneja
c3b72e586a MDL-48624 behat: Added extended timeout to ensure step pass 
following_should_download_between_and_bytes step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
Also, not calling force download while running behat site
 2015-01-30 08:54:12 +08:00
Tony Levi
0021942592 MDL-48924 backup: Fix some get_file_packer() calls for enabletgzbackups 2015-01-29 22:53:20 +10:30
Juan Leyva
60ab2e1bc4 MDL-48719 messages: New WS core_message_get_blocked_users 2015-01-29 13:04:43 +01:00
Juan Leyva
d9a1cf5cae MDL-48793 webservices: Deleted duplicated function in mobile service 2015-01-29 13:01:51 +01:00
Eloy Lafuente (stronk7)
c5c34b4019 Revert "Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle" 
This reverts commit 73bf1119ddc19181f02fac81c7d7c3def9f5e28f, reversing
changes made to 7615deba22cfae9076a79fc8ce902b24815c1fff.
 2015-01-28 21:13:42 +01:00
Eloy Lafuente (stronk7)
941ea6b2ff Merge branch 'MDL-48898' of git://github.com/timhunt/moodle 2015-01-28 12:27:07 +01:00
Andrew Nicols
06c2753115 MDL-48542 user_menu: Handle invalid strings better 2015-01-28 15:39:15 +08:00
Damyon Wiese
af9a7937cc MDL-48980 Security: Always clean the result from min_get_slash_argument 
The result from this function is used in send_file calls and if unclean
(windows dir separators, or .. path components) it could expose sensitive
files (e.g. .php files). Now we always clean the result from this function
even if it means double cleaning.

I also fixed the unit test for this function and added a new test for this cleaning.

I also updated the comments to point to get_file_argument as the full version of
min_get_slash_argument.
 2015-01-28 14:38:29 +08:00
Mark Nelson
6c85571902 MDL-48266 core: fixed backup upgrade 2015-01-27 21:32:07 -08:00
Andrew Nicols
ade0072379 MDL-48542 user_menu: Increment index for all menu items 
The invalid type was not causing the idx to incremented, thus missing off
the final divider.
 2015-01-28 12:09:23 +08:00
Andrew Nicols
8b7ca27d48 MDL-48542 user_menu: Improve user menu tests 
Add additional test cases, and actually test that the output is roughly
what we expect.
 2015-01-28 12:09:22 +08:00
Andrew Nicols
0977d3d404 Merge branch 'MDL-48542-master' of git://github.com/jethac/moodle 2015-01-28 12:02:28 +08:00
Stephen Bourget
5bc12ca265 MDl-47104 Calendar: Make 'calendar_lookahead' more flexible 2015-01-28 02:24:36 +01:00
Rajesh Taneja
20153f6308 MDL-48926 behat: No expand form required in non-js mode 2015-01-28 10:58:01 +10:30
Tony Levi
80ac8522cc MDL-48926 behat: Do not poll within spin for non-javascript mode 2015-01-28 10:58:00 +10:30
Eloy Lafuente (stronk7)
8181ab5865 Merge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
 2015-01-28 01:02:54 +01:00