mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity
72,078 Commits 37 Branches 536 Tags
Commit Graph

72078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
1ee0c927b2 Merge branch 'MDL-44071-master' of git://github.com/zbdd/moodle 2015-02-03 12:16:16 +00:00
Eloy Lafuente (stronk7)
7172903fcf Merge branch 'MDL-41851-master' of git://github.com/andrewnicols/moodle 2015-02-03 12:36:00 +01:00
Dan Poltawski
e46856e48b MDL-48624 behat: fix trailing whitespace 2015-02-03 11:01:34 +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
Eloy Lafuente (stronk7)
3cafe67502 Merge branch 'wip-mdl-48403' of https://github.com/rajeshtaneja/moodle 2015-02-03 11:57:27 +01:00
Eloy Lafuente (stronk7)
7eb4e0397b Merge branch 'wip-mdl-49015' of https://github.com/rajeshtaneja/moodle 2015-02-03 11:52:03 +01:00
Eloy Lafuente (stronk7)
336314812f Merge branch 'MDL-48328_M29' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2015-02-03 11:42:41 +01: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
71439af9d5 Merge branch 'MDL-48920-master' of git://github.com/FMCorz/moodle 2015-02-03 16:11:08 +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
26faad60e2 Merge branch 'MDL-48989-master' of git://github.com/jleyva/moodle 2015-02-03 15:51:38 +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
48bac91be8 Merge branch 'MDL-48929-master' of git://github.com/FMCorz/moodle 2015-02-03 13:55:32 +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
Andrew Nicols
6ef9a63bcd Merge branch 'MDL-48608_master' of git://github.com/markn86/moodle 2015-02-03 12:30:29 +08:00
Mark Nelson
d838640e4c MDL-48608 mod_assign: correctly display grades for group assignments 2015-02-02 20:13:24 -08:00
David Monllao
a5b4cc9635 Merge branch 'wip_MDL-46728_master' of git://github.com/gjb2048/moodle 2015-02-03 11:45:15 +08:00
David Monllao
9afe4eb556 MDL-43752 repository_s3: Using setDefault 2015-02-03 11:04:51 +08:00
David Monllao
5428d6b065 Merge branch 'MDL-43752-master' of git://github.com/DanBennettUK/moodle 2015-02-03 10:52:21 +08:00
Mary Evans
76edd23810 MDL-48328 theme_bootstrapbase: Added update info to /readme_moodle.txt 2015-02-03 01:32:25 +00:00
Eloy Lafuente (stronk7)
f4160a8e52 Merge branch 'MDL-43387' of git://github.com/jmvedrine/moodle 2015-02-03 01:17:03 +01:00
Eloy Lafuente (stronk7)
968e8dc94b Merge branch 'MDL-48525-master' of git://github.com/jleyva/moodle 2015-02-03 00:57:37 +01:00
Eloy Lafuente (stronk7)
bd6a0c5df1 Merge branch 'MDL-48578-master' of git://github.com/jleyva/moodle 2015-02-03 00:47:13 +01:00
Eloy Lafuente (stronk7)
22102378d3 Merge branch 'MDL-48793-master' of git://github.com/jleyva/moodle 2015-02-03 00:45:16 +01:00
Eloy Lafuente (stronk7)
fe1e5e1963 Merge branch 'MDL-47562-master' of git://github.com/damyon/moodle 2015-02-02 23:51:15 +01:00
Dan Bennett
9b71e3aff0 MDL-43752 repository_s3: added endpoint select box to settings page 2015-02-02 15:34:36 +00: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
David Monllao
5ade288ab0 Merge branch 'MDL-31036-master' of git://github.com/zbdd/moodle 2015-02-02 14:54:48 +08:00
Brian Barnes
e323bf512f MDL-48484 admin: Added labels to configtime settings 2015-02-02 09:42:38 +13:00
Jean-Michel Vedrine
ebf5ad4fa2 MDL-43387 mod_lesson: add an editor for essay grading comments 2015-02-01 19:01:40 +01:00
Mary Evans
d439eeb0fc MDL-48328 theme_bootstrapbase: lessc is failing to compile our less. 2015-01-30 23:28:25 +00:00
Zachary Durber
75d08f0291 MDL-31036 mod_assign: Don't strip quickgrading feedback of special chars 2015-01-30 14:43:35 +08:00
John Okely
3a0c9c6306 MDL-48772 enrol_cohort: Replace hardcoded language with language strings 2015-01-30 11:29:40 +08:00
Rajesh Taneja
dec3a05cb3 MDL-48403 behat: Select text in atto editor before inserting image 2015-01-30 10:02:57 +08:00
Rajesh Taneja
15aacd0454 MDL-49105 mod_lesson: Removed unused image insert step in behat 2015-01-30 08:57:50 +08:00
Rajesh Taneja
d0c36ce621 MDL-49015 mod_lesson: Don't rely on external links in behat 2015-01-30 08:57:49 +08: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
Rajesh Taneja
8fe8df4a8b MDL-48624 behat: Added page load check in workshop step 
i_allocate_submissions_in_workshop_as step sometimes
fails because of server speed. Added page load check
with extended timout.
 2015-01-30 08:54:11 +08:00
Gareth J Barnard
eb1861983a MDL-46728 themes: WOFF2 fonts are not supported. 2015-01-29 16:11:43 +00: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
a86f23cd53 MDL-48525 webservices: Fixed profile user image is not always returned 2015-01-29 13:02:16 +01:00
Juan Leyva
d9a1cf5cae MDL-48793 webservices: Deleted duplicated function in mobile service 2015-01-29 13:01:51 +01:00
Juan Leyva
11d83ab30b MDL-48578 webservices: Fixed missing required library 2015-01-29 13:01:32 +01:00
Juan Leyva
5785421a37 MDL-48989 messages: Add site information in airnotifier payload 2015-01-29 12:59:03 +01:00
Eloy Lafuente (stronk7)
4c27f52d91 weekly release 2.9dev 2015-01-29 10:27:52 +01:00