mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-09 18:30:03 +01:00
Code Issues Projects Releases Wiki Activity
65,970 Commits 36 Branches 523 Tags
Commit Graph

757 Commits

Author SHA1 Message Date
Damyon Wiese
cf1110eb62 MDL-43595: The dropdowns for editpdf stopped working due to a recent change. 2014-01-08 09:15:58 +08:00
Damyon Wiese
abc217b2bf Merge branch 'MDL-43307-master' of git://github.com/andrewnicols/moodle 2014-01-07 14:10:40 +08:00
Damyon Wiese
e011f229a8 Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle 2014-01-07 12:29:45 +08:00
Damyon Wiese
de47c9c81b Merge branch 'wip-mdl-43293' of https://github.com/rajeshtaneja/moodle 2014-01-07 12:22:49 +08:00
Dan Poltawski
812cc702ad Merge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle 2014-01-07 11:51:15 +08:00
Dan Poltawski
93759b73a5 Merge branch 'MDL-42585-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assign/version.php
 2014-01-07 10:55:20 +08:00
Frederic Massart
f588ea5008 MDL-42995 mod_assign: Extended tests for update_calendar method 2014-01-06 10:20:23 +01:00
Frederic Massart
0cfc7d13ef MDL-42995 mod_assign: Remove files from calendar event description 2014-01-06 09:29:26 +01:00
Frederic Massart
2a5794e099 MDL-42995 mod_assign: Use new global function to strip content 2014-01-06 09:29:25 +01:00
Sam Hemelryk
e4ac256c35 Merge branch 'wip-mdl-18770' of https://github.com/rajeshtaneja/moodle 2014-01-06 13:09:42 +13:00
Sam Hemelryk
2dad31ecf9 MDL-43238 mod_assign: removed incorrect validation 2014-01-06 09:51:38 +13:00
Rajesh Taneja
456d7bc7f3 MDL-18770 mod_assign: Set gradetype to GRADE_TYPE_NONE if feedback not enabled 2014-01-03 16:30:37 +08:00
Rajesh Taneja
184afb6b73 MDL-43238 events: Added event other information in event php doc block 2014-01-03 15:03:48 +08:00
Petr Škoda
2803f3c1b5 MDL-43402 remove all zlib detection code 
Zlib extension is now required.
 2013-12-27 11:06:18 +08:00
Sam Hemelryk
ee70f10f99 Merge branch 'MDL-43250-master' of git://github.com/damyon/moodle 2013-12-24 10:36:22 +13:00
Andrew Nicols
54a3dca258 MDL-43307 JavaScript: Migrate moodle-mod_assign-history to use Shifter 2013-12-23 16:18:10 +08:00
Rajesh Taneja
cdfd607449 MDL-43293 Events: Added unit test for comment events 2013-12-23 09:22:15 +08:00
Rajesh Taneja
a55eaf0351 MDL-43293 Events: Added comments event in modules supporting comments 2013-12-23 09:22:14 +08:00
Eloy Lafuente (stronk7)
a6761e26e7 Merge branch 'MDL-43318-master' of git://github.com/damyon/moodle 2013-12-23 00:39:41 +01:00
Damyon Wiese
997588195d MDL-43318 Assign: Fix bug when editing previous attempt feedback 2013-12-20 11:14:27 +08:00
Damyon Wiese
4a47008ca6 MDL-42585 Assign: Add capability to only view grades 
AMOS BEGIN
    CPY [viewgrades,grades],[assign:viewgrades,mod_assign]
AMOS END
 2013-12-20 11:01:44 +08:00
Eloy Lafuente (stronk7)
1f73779156 MDL-42425 assign: keep already bumped version. 2013-12-20 03:40:58 +01:00
Eloy Lafuente (stronk7)
c7df8656be Revert "MDL-42425 modify mod_assign_save_grade to process advanced grading data" 
This reverts commit 29932b211287985c8e3235e52fc78782528309a2.

Conflicts:
	mod/assign/upgrade.txt
 2013-12-20 03:39:14 +01:00
Damyon Wiese
76dc48cb6a MDL-34432 Assign: Set up the commentinline form element properly. 2013-12-19 09:40:14 +08:00
Eloy Lafuente (stronk7)
c751d81bbc Merge branch 'MDL-42425' of https://github.com/Lightwork-Marking/moodle 
Conflicts:
	mod/assign/upgrade.txt
 2013-12-19 01:37:57 +01:00
Paul Charsley
29932b2112 MDL-42425 modify mod_assign_save_grade to process advanced grading data 2013-12-19 09:39:22 +13:00
Eloy Lafuente (stronk7)
1f71f7685a Merge branch 'MDL-43025-master' of git://github.com/damyon/moodle 2013-12-17 22:58:51 +01:00
Sam Hemelryk
9b4c44c8e6 Merge branch 'MDL-43074-master' of git://github.com/damyon/moodle 2013-12-18 09:59:05 +13:00
Marina Glancy
9cba0f8981 Merge branch 'wip-MDL-43295-master' of git://github.com/abgreeve/moodle 2013-12-17 16:35:31 +11:00
Sam Hemelryk
233e6b985b Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/upgrade.txt
 2013-12-17 16:32:35 +13:00
Adrian Greeve
fb59d5352a MDL-43295 mod_assign: Removed wrongly used format_text call in online text submission. 2013-12-17 10:42:20 +08:00
Sam Hemelryk
2b08f90aca Merge branch 'MDL-36984-master' of git://github.com/phalacee/moodle 2013-12-17 08:45:05 +13:00
Damyon Wiese
f268fb5d20 MDL-43250 Assign: separate groups mode fix 
When in separate groups mode, only get graders in a group that is in the course module grouping.
 2013-12-16 10:54:38 +08:00
Sam Hemelryk
9f5b319345 Merge branch 'MDL-34432-master' of git://github.com/damyon/moodle 2013-12-16 15:46:56 +13:00
Damyon Wiese
c7a7368958 MDL-34432: Allow comment inline (stripping embedded images version) 2013-12-16 10:38:23 +08:00
Sam Hemelryk
3b94d80c20 Merge branch 'MDL-40096-master' of git://github.com/damyon/moodle 2013-12-16 13:52:16 +13:00
Jason Fowler
082ad25776 MDL-36984 Assign: Add redirect after saving grades 2013-12-12 14:19:26 +08:00
Andrew Nicols
5947ab3333 MDL-43259 JavaScript: Stop using deprecated lightbox config setting when instantiating dialogues 2013-12-11 16:56:49 +08:00
Damyon Wiese
e9fe65d575 MDL-43326 Assign: Start new attempt from previous missing sesskey 2013-12-11 13:07:52 +08:00
Marina Glancy
939aedfe30 Merge branch 'MDL-43071-master' of https://github.com/lucisgit/moodle 2013-12-11 12:46:14 +11:00
Eloy Lafuente (stronk7)
ebc77165a4 Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle 2013-12-10 23:29:06 +01:00
Eloy Lafuente (stronk7)
5cf182e39d Merge branch 'wip-MDL-42174-master' of git://github.com/marinaglancy/moodle 2013-12-10 22:06:39 +01:00
Marina Glancy
b3e0bd5225 Merge branch 'MDL-43199-master' of git://github.com/damyon/moodle 2013-12-10 15:15:27 +11:00
Sam Chaffee
262075ce02 MDL-40003 mod_assign: Fixed submission comments not being restored 2013-12-09 11:01:34 +01:00
Damyon Wiese
4fe9950ba6 MDL-43025 EditPDF: Increase memory limit when reading source pdfs. 2013-12-09 12:58:40 +08:00
David Monllao
c1faf86bd1 MDL-42625 behat: Make behat pacient 
* When looking for texts inside the page or inside
  other containers we should wait until the elements
  are visible.
* Same when expanding tree nodes.
* Normalizing loops to spin() function using
  behat_base::TIMEOUT and behat_base::EXTENDED_TIMEOUT,
  leaving TIMEOUT for DOM load processes and
  EXTENDED_TIMEOUT for long processes that involves JS
  too.
* Add page load waits between actions that involves
  reloading the page.
 2013-12-09 11:08:42 +08:00
Damyon Wiese
1f738c8c0c MDL-43074 assignfeedback_editpdf: Use escapeshellarg for all args in exec command. 
This is to fix a reported problem with windows compatibility (e.g. when ghostscript is installed in
a folder with spaces in the name).
 2013-12-09 10:52:35 +08:00
Damyon Wiese
9a046c0683 MDL-40096 assign: Prevent js error because uniqid() is not unique. 
Use html_writer::random_id instead because it incorporates a static counter.
 2013-12-09 10:25:15 +08:00
Pavel Sokolov
a66555328b MDL-43199 assign: fix js error when expanding comments for non editing teachers in assign grading table 2013-12-06 12:57:20 +08:00
Marina Glancy
07622451a3 MDL-42174 behat: deprecate upload file to filepicker step in favour of filemanager 2013-12-05 21:00:25 +11:00