moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 19:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65725 commits 37 branches 544 tags 1.3 GiB
Commit graph

65725 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Nicols
43736b7dd0 MDL-43272 JavaScript: Migrate moodle-course-modchooser to use Shifter 2013-12-10 18:41:46 +08:00
Russell Smith
cc67c6db61 MDL-39725 database: Apply database statistics update to daily stats 2013-12-10 20:33:01 +11:00
Russell Smith
8343b340c4 MDL-39725 database: Include stats collections in unit tests 2013-12-10 20:32:56 +11:00
Russell Smith
814c9438a0 MDL-39725 database: Add statistics collection functions 2013-12-10 20:31:47 +11:00
Sam Chaffee
7bfa3d9b6e MDL-37972 Assignment: fixing settings link for upload single submissions 2013-12-10 13:41:57 +08:00
Dan Poltawski
e238b2cb92 MDL-43306 restore: fix grade item sortorder restoration 
Previously, restore was blindly inserting the old sort order into the
database, causing duplicate sortorders which lead to unpredicatble
sorting results.

Now we will use the api function to add it after the original sortorder,
this means if a duplicate exists in the original location, this item
will appear after it.
 2013-12-10 12:32:36 +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
Marina Glancy
e762d5a7f2 Merge branch 'm27_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara/moodle 2013-12-10 14:47:08 +11:00
Marina Glancy
a98bdfa668 Merge branch 'MDL-37517-master' of git://github.com/danpoltawski/moodle 2013-12-10 14:29:22 +11:00
Marina Glancy
3649bcfa21 Merge branch 'MDL-43215_master' of https://github.com/markn86/moodle 2013-12-10 14:25:24 +11:00
Marina Glancy
2cbcf496c2 Merge branch 'MDL-43131' of git://github.com/timhunt/moodle 2013-12-10 14:10:04 +11:00
Marina Glancy
11ca8227b1 Merge branch 'mdl42487-master' of https://github.com/tlock/moodle 2013-12-10 13:56:49 +11:00
Jason Fowler
c476e67839 MDL-25473 mediaplayer - prevent embedded videos from looping 2013-12-10 10:49:44 +08:00
Mark Nelson
8bf0f20795 MDL-42932 core_calendar: introduced calendar type system setting 2013-12-09 18:40:46 -08:00
Marina Glancy
907b98204b MDL-43044 fix trailing whitespace 2013-12-10 11:52:42 +11:00
Marina Glancy
013620aad3 Merge branch 'MDL-43044-master' of git://github.com/ankitagarwal/moodle 2013-12-10 11:40:54 +11:00
Marina Glancy
332d9ec84b MDL-43279 block_blog_recent: fixed undefined property notice 2013-12-10 09:28:05 +11:00
Sam Hemelryk
fd0281dfc3 Merge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle 2013-12-10 10:27:45 +13:00
Sam Hemelryk
a88c1ca91a Merge branch 'MDL-43164-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:52:08 +13:00
Sam Hemelryk
176521e560 Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:25:51 +13:00
Sam Hemelryk
830299fe4f Merge branch 'm27_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle 2013-12-10 09:21:10 +13:00
Sam Hemelryk
f9fb9826be NOBUG: rebuilt shifted files 2013-12-10 09:18:16 +13:00
Sam Hemelryk
8f2bd073aa Merge branch 'MDL-43253-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:09:06 +13:00
Sam Hemelryk
c8d6ee9870 Merge branch 'MDL-43212-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:07:11 +13:00
Sam Hemelryk
437fd401f9 Merge branch 'MDL-43232-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:06:54 +13:00
Sam Hemelryk
b78f0294bb Merge branch 'MDL-43194-master' of git://github.com/andrewnicols/moodle 2013-12-10 08:48:33 +13:00
Sam Hemelryk
822f529014 Merge branch 'MDL-43152-master' of git://github.com/andrewnicols/moodle 2013-12-10 08:43:50 +13:00
Sam Hemelryk
e3f7ac09e7 Merge branch 'MDL-43087a' of https://github.com/srynot4sale/moodle 
Conflicts:
	config-dist.php
 2013-12-10 08:36:39 +13:00
Eloy Lafuente (stronk7)
d073a5f118 Merge branch 'MDL-40003-master' of git://github.com/FMCorz/moodle 2013-12-09 16:24:26 +01:00
sam marshall
4c31243fc7 MDL-43252 Group menu in wrong order when groupings used 2013-12-09 13:02:12 +00:00
Sam Chaffee
262075ce02 MDL-40003 mod_assign: Fixed submission comments not being restored 2013-12-09 11:01:34 +01:00
Marina Glancy
95971ae99e Merge branch 'wip-MDL-43175-master' of git://github.com/abgreeve/moodle 2013-12-09 18:54:53 +11:00
Marina Glancy
895d3050e0 Merge branch 'wip-mdl-43224' of https://github.com/rajeshtaneja/moodle 2013-12-09 18:45:27 +11:00
Marina Glancy
645cd2fe77 Merge branch 'w50_MDL-42973_m27_addonupd' of https://github.com/skodak/moodle 2013-12-09 18:26:39 +11:00
Marina Glancy
40d5757441 Merge branch 'MDL-43092_master' of git://github.com/lazydaisy/moodle 2013-12-09 17:50:27 +11:00
Marina Glancy
98a89047fb Merge branch 'w50_MDL-43137_m27_openbasedir' of https://github.com/skodak/moodle 2013-12-09 16:15:21 +11:00
Andrew Nicols
83cdecec1e MDL-38774 JavaScript: Migrate moodle-core-dragdrop to Shifter 2013-12-09 11:27:44 +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
Adrian Greeve
5bb7158d77 MDL-43175 events: Base event unit tests for JSON encoding / decoding comparison. 2013-12-09 09:21:37 +08:00
Adrian Greeve
49ff134227 MDL-43175 events: Changed JSON encoding decoding comparison to be less strict. 
Debugging messages would be sent when other contained a float that is a whole number.
When encoding and decoding using JSON the number is changed to an integer and the
comparison fails.
 2013-12-09 09:21:37 +08:00
Andrew Nicols
54d076a353 MDL-43104 JavaScript: Combine mcore JS into simplemoodle 
I was wrong about why this didn't work before - this was caused by the
missing semi-colon.

Joining these scripts into a single combo-load has the benefit of further
reducing the number of HTTP transactions to load a page, and a minor
reduction on transferred size due to a reduced header count.
 2013-12-09 09:05:16 +08:00
Marina Glancy
9f973b7bae Merge branch 'master_MDL-43192' of https://github.com/danmarsden/moodle 2013-12-09 11:28:03 +11:00
Marina Glancy
3f189b5d49 Merge branch 'wip-MDL-40213_master' of git://github.com/gjb2048/moodle 2013-12-09 11:13:16 +11:00
Andrew Nicols
cff3b8feed MDL-43259 JavaScript: Deprecate M.core.dialogue's lightbox attribute 
The lightbox attribute just sets the modal attribute of the upstream
dialogue and provides no real benefit. We should deprecate it in favour of
documented upstream attributes of Y.Panel.
 2013-12-08 16:27:41 +08:00
Andrew Nicols
6531d5a8ec MDL-43253 JavaScript: Migrate moodle-backup-backupselectall to use Shifter 2013-12-07 23:44:12 +08:00
Andrew Nicols
4246e5c7cc MDL-43234 JavaScript: Clone dialogue configuration before initialising 
Since we modify the config object when instantiating a new Dialogue, we
need to clone the configuration to prevent those changes from being
reflected back in the caller.
 2013-12-07 09:04:45 +08:00
Dan Poltawski
4ea3286758 MDL-37380 mod_data: remove unused JS functions 2013-12-06 16:27:41 +08:00