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
bb4551334f
Merge branch 'MDL-34321-master' of git://github.com/phalacee/moodle
2013-12-17 08:48:08 +13:00
Sam Hemelryk
2b08f90aca
Merge branch 'MDL-36984-master' of git://github.com/phalacee/moodle
2013-12-17 08:45:05 +13:00
Frederic Massart
545b310c84
MDL-42212 mod_lesson: Use autoloading for mod_lesson_file_info
2013-12-16 07:03:46 +01:00
Frederic Massart
89133afae6
MDL-42212 mod_lesson: Localise area names
2013-12-16 06:49:05 +01:00
Frederic Massart
b47dc5ffea
MDL-42212 mod_lesson: Fix callbacks retrieving activity files
2013-12-16 06:49:05 +01: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
Marina Glancy
2a73cfb011
Merge branch 'MDL-37972-master' of git://github.com/phalacee/moodle
2013-12-16 12:27:38 +11:00
Sam Hemelryk
3b94d80c20
Merge branch 'MDL-40096-master' of git://github.com/damyon/moodle
2013-12-16 13:52:16 +13:00
Sam Hemelryk
6015500d5b
Merge branch 'MDL-43326-master' of git://github.com/damyon/moodle
2013-12-16 09:46:47 +13:00
Frederic Massart
0aa3b16c90
MDL-35032 mod_book: 1.9 backup restore convertis files to book area
2013-12-13 10:20:49 +01:00
Jason Fowler
082ad25776
MDL-36984 Assign: Add redirect after saving grades
2013-12-12 14:19:26 +08:00
Jason Fowler
871015414d
MDL-34321 Assignment2.2 - Fixing submission count
2013-12-12 10:35:41 +08:00
Rajesh Taneja
2270661e51
MDL-40058 mod_wiki: trigger event on page map view
2013-12-12 13:08:18 +11: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
Rajesh Taneja
0e72987517
MDL-40058 mod_wiki: modified wiki_restore_page api to accept version and context
2013-12-11 13:53:04 +11:00
Rajesh Taneja
e94f6c6572
MDL-40058 Events: added unit test
2013-12-11 13:53:04 +11:00
Rajesh Taneja
86b0e3b308
MDL-40058 Events: Replaced add_to_log for page comments to event
2013-12-11 13:53:00 +11:00
Rajesh Taneja
8b43cf225f
MDL-40058 mod_wiki: Replaced add_to_log for page version viewed to event
2013-12-11 13:53:00 +11:00
Rajesh Taneja
a8481a66fe
MDL-40058 mod_wiki: Replaced add_to_log for page created to event
2013-12-11 13:53:00 +11:00
Rajesh Taneja
ff79f49f44
MDL-40058 mod_wiki: Replaced add_to_log for page map viewed to event
2013-12-11 13:52:59 +11:00
Rajesh Taneja
d6a54be3a6
MDL-40058 mod_wiki: Replaced add_to_log for admin to event
2013-12-11 13:52:59 +11:00
Rajesh Taneja
b3dd79d101
MDL-40058 mod_wiki: Replaced add_to_log for override locks with event
2013-12-11 13:52:59 +11:00
Rajesh Taneja
3e5e78a2c9
MDL-40058 mod_wiki: Replaced add_to_log for page diff view with event
2013-12-11 13:52:59 +11:00
Rajesh Taneja
fb92417b5e
MDL-40058 mod_wiki: Replaced add_to_log for page edit with event
2013-12-11 13:52:59 +11:00
Rajesh Taneja
31383bcdad
MDL-40058 mod_wiki: Replaced add_to_log for version restored with event
2013-12-11 13:52:58 +11:00
Rajesh Taneja
d1d555c955
MDL-40058 mod_wiki: Replaced add_to_log for history viewed with event
2013-12-11 13:52:58 +11:00
Rajesh Taneja
9307bed8c5
MDL-40058 mod_wiki: Replaced add_to_log on index.php with event
2013-12-11 13:52:58 +11:00
Rajesh Taneja
48f871e09b
MDL-40058 mod_wiki: Replaced add_to_log for course_module_viewed with event
2013-12-11 13:52:58 +11:00
Rajesh Taneja
8ac1d22436
MDL-40058 mod_wiki: Replaced add_to_log for page_viewed with event
2013-12-11 13:52:54 +11: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
Sam Chaffee
7bfa3d9b6e
MDL-37972 Assignment: fixing settings link for upload single submissions
2013-12-10 13:41:57 +08:00
Marina Glancy
8f3e0bf7a5
Merge branch 'MDL-37380-master' of git://github.com/danpoltawski/moodle
2013-12-10 15:20:22 +11:00
Marina Glancy
b3e0bd5225
Merge branch 'MDL-43199-master' of git://github.com/damyon/moodle
2013-12-10 15:15:27 +11:00
Michael Dikih
1d2c29ca0d
MDL-43109: mod/wiki - When editing pages populate the default value for the tags input.
2013-12-10 14:15:35 +10:30
Mark Nelson
841a369a87
MDL-40920 mod_url: replaced add_to_log calls with events
2013-12-09 18:49:55 -08:00
Andrew Nicols
0d8907e3d8
MDL-43243 JavaScript: Deprecate show_item
2013-12-10 09:55:34 +08:00
Marina Glancy
013620aad3
Merge branch 'MDL-43044-master' of git://github.com/ankitagarwal/moodle
2013-12-10 11:40:54 +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
