mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
71,923 Commits 36 Branches 519 Tags
Commit Graph

16378 Commits

Author SHA1 Message Date
Andrew Nicols
e2a036b4a9 Merge branch 'MDL-348' of https://github.com/bostelm/moodle 2015-01-21 11:46:22 +08:00
Eloy Lafuente (stronk7)
fac7cff3e2 Merge branch 'MDL-48813_m29' of git://github.com/sbourget/moodle 2015-01-20 19:20:26 +01:00
Dan Poltawski
9f0c24120f Merge branch 'wip-mdl-48831' of https://github.com/rajeshtaneja/moodle 2015-01-20 17:20:58 +00:00
Dan Poltawski
cde9fece2f Merge branch 'MDL-48829' of git://github.com/timhunt/moodle 2015-01-20 17:07:52 +00:00
Eloy Lafuente (stronk7)
e08f58288a Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle 2015-01-20 17:07:34 +01:00
David Monllao
97b2e747ac Merge branch 'wip-MDL-20053-master' of git://github.com/abgreeve/moodle 2015-01-20 16:43:24 +08:00
Andrew Nicols
a2209774ce Merge branch 'MDL-44560-master' of git://github.com/xow/moodle 2015-01-20 12:57:41 +08:00
Andrew Nicols
81a5c2b672 Merge branch 'MDL-38277_m29v2' of https://github.com/sbourget/moodle 2015-01-20 12:34:07 +08:00
Andrew Nicols
b4d70adb9e Merge branch 'MDL-43163' of git://github.com/jmvedrine/moodle 2015-01-20 11:23:41 +08:00
Andrew Nicols
a8ed2e50ea Merge branch 'MDL-48596' of git://github.com/jmvedrine/moodle 2015-01-20 10:54:19 +08:00
Adrian Greeve
14fb7662cc MDL-20053 mod_data: Update to fix unit tests. 2015-01-19 15:24:47 +08:00
Adrian Greeve
c1d222fcf8 MDL-20053 mod_data: Update to behat tests 
A bulk delete of entries has been added to
the behat tests.
 2015-01-19 15:24:47 +08:00
Adrian Greeve
c910cf308c MDL-20053 mod_data: Removal of individual DB call. 
The main functions for retrieving records have been
updated to include user picture information.
 2015-01-19 15:24:47 +08:00
Rajesh Taneja
cb8c8a2fba MDL-48624 behat: Added extended timeout in workshop step 
i_allocate_submissions_in_workshop_as step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
 2015-01-19 10:15:47 +08:00
Jean-Michel Vedrine
59f1c9f5a8 MDL-43386 Lesson: Grade essay student response formatting not correct 2015-01-18 20:36:46 +01:00
Jean-Michel Vedrine
1cd5f23995 MDL-48596 mod_lesson: editing interface won't expand to full screen 2015-01-16 15:10:16 +01:00
Jean-Michel Vedrine
f47c365a48 MDL-43163 mod_lesson: Coding style problem: ->BOX 2015-01-16 15:09:15 +01:00
John Okely
4b793ed78b MDL-44560 mod_glossary: Fix indentation in mod/glossary/sql.php 2015-01-16 11:49:48 +08:00
John Okely
6fe5646a29 MDL-44560 glossary: Fix pagination on glossary category view 
Credit to Sebastian B for this fix
 2015-01-16 11:10:31 +08:00
Rajesh Taneja
a7960c06c2 MDL-48831 behat: Added behat test for label activity 
Thanks to Neill Magill, for providing test feature.
 2015-01-16 10:38:34 +08:00
Rajesh Taneja
fe4992854f MDL-48831 behat: Fixed activity show hide for label 
Labels are not links and have dimmed_text class
So updated find query for show/hide activity check
 2015-01-16 10:38:34 +08:00
Anthony Borrow
560237b4b3 MDL-20053 mod_data: Add userpicture tag to show profile pictures 2015-01-16 09:57:36 +08:00
Henning Bostelmann
52b0a55125 MDL-348 mod_quiz: Improved print layout 
Implementing a more compact print layout
for question attempt and review pages.
 2015-01-15 20:28:06 +00:00
Stephen Bourget
9e84423b79 MDL-38277 Lesson: Fix strings on activity report 2015-01-15 12:41:57 -05:00
Tim Hunt
2e4e8d16c7 MDL-48829 quiz nav: add a data attr to buttons giving the page 
This way, if you need to know which page each button goes to in
JavaScript, you can find out.
 2015-01-15 10:20:55 +00:00
Andrew Nicols
2a43613b73 Merge branch 'master_MDL-48418' of https://github.com/greg-or/moodle-mod_assign 2015-01-15 08:35:02 +00:00
Eloy Lafuente (stronk7)
ccb722b76c Merge branch 'MDL-48574_workflow_state_updated_batch_single' of https://github.com/Dave-B/moodle 2015-01-15 08:35:01 +00:00
Eloy Lafuente (stronk7)
639910a75d Merge branch 'MDL-41166-master' of git://github.com/danpoltawski/moodle 2015-01-15 08:35:01 +00:00
Dan Poltawski
63cc7cfc61 Merge branch 'MDL-48675' of git://github.com/jmvedrine/moodle 
Conflicts:
	mod/lesson/upgrade.txt
 2015-01-15 08:34:58 +00:00
Dan Poltawski
02362f4414 Merge branch 'MDL-36824_m29' of https://github.com/sbourget/moodle 2015-01-15 08:33:29 +00:00
Dan Poltawski
594276893e Merge branch 'MDL-39103-master' of git://github.com/xow/moodle 
Conflicts:
	mod/lesson/lib.php
 2015-01-15 08:33:27 +00:00
Dan Poltawski
584e582bfc Merge branch 'MDL-45784-master' of git://github.com/xow/moodle 2015-01-15 08:32:45 +00:00
Dan Poltawski
db387f25de Merge branch 'MDL-47931' of git://github.com/jmvedrine/moodle 2015-01-15 08:32:44 +00:00
Dan Poltawski
d55a433d6c Merge branch 'MDL-48750_m29' of https://github.com/sbourget/moodle 2015-01-15 08:32:43 +00:00
Dan Poltawski
8c9390c5eb Merge branch 'MDL-40326' of git://github.com/jmvedrine/moodle 2015-01-15 08:32:42 +00:00
Dan Poltawski
261b858985 Merge branch 'MDL-14730' of git://github.com/jmvedrine/moodle 2015-01-15 08:32:42 +00:00
Andrew Nicols
26a1fbbd15 Merge branch 'MDL-43898-master' of git://github.com/danpoltawski/moodle 2015-01-15 08:32:38 +00:00
Dan Poltawski
6aa08f9442 Merge branch 'MDL-31774' of git://github.com/jmvedrine/moodle 2015-01-15 08:32:35 +00:00
Stephen Bourget
002da93948 MDL-48813 Lesson: Removed unused GROUPMEMBERSONLY 2015-01-12 10:49:41 -05:00
Andrew Nicols
99334f6a56 Merge branch 'MDL-38142-master' of git://github.com/FMCorz/moodle 2015-01-12 11:55:34 +08:00
Andrew Nicols
db5a9ca117 Merge branch 'MDL-47692_master' of git://github.com/markn86/moodle 2015-01-12 10:05:39 +08:00
Gregory Faller
b351e4460a MDL-48418 mod/assign: Fix text in 'late submission' row 2015-01-12 09:00:44 +10:30
Stephen Bourget
8eef88589a MDL-48750 Lesson: Behat test for lesson attempt info 
behat test provided by Jean-Michel Vedrine
 2015-01-10 17:13:17 -05:00
Jean-Michel Vedrine
91d9008108 MDL-40326 mod_lesson: progress bar is not reset by course reset 2015-01-10 18:54:54 +01:00
Jean-Michel Vedrine
a30e935aa7 MDL-31774 mod_lesson: Wrong jumps in lessons with mutiple clusters 2015-01-10 18:30:06 +01:00
Stephen Bourget
ca3327133b MDL-36824 Lesson: Media File should be displayed as a block 2015-01-09 18:15:27 -05:00
David Balch
73f419ea43 MDL-48574 assign: Test workflow_state_updated fired on batch and single. 2015-01-09 15:18:05 +00:00
Stephen Bourget
c1500a8270 MDL-48750 Lesson: Fix attempt info displayed by course overview block 2015-01-09 09:10:11 -05:00
Jean-Michel Vedrine
5ca2e765fa MDL-14730 mod_lesson: allow linking to pages inside a lesson 2015-01-09 11:33:35 +01:00
Frederic Massart
6b5d34b18d MDL-38142 mod_forum: Allow viewing of student posts in hidden courses 2015-01-09 11:34:24 +08:00