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

66458 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
263979ebee Merge branch 'wip-MDL-43828-master' of git://github.com/marinaglancy/moodle 2014-02-03 23:58:07 +01:00
Sam Hemelryk
68ad9d82bf Merge branch 'MDL-43886-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-02-04 11:14:11 +13:00
Sam Hemelryk
1331241bf4 Merge branch 'MDL-43892' of git://github.com/timhunt/moodle 2014-02-04 10:57:26 +13:00
Sam Hemelryk
527dd78d36 Merge branch 'wip-MDL-33920-master' of git://github.com/marinaglancy/moodle 2014-02-04 10:47:00 +13:00
Sam Hemelryk
5666a74c91 Merge branch 'MDL-43893-master' of git://github.com/andrewnicols/moodle 2014-02-04 10:23:24 +13:00
Sam Hemelryk
5eb041021e Merge branch 'w04_MDL-43903_m27_mssqltests' of https://github.com/skodak/moodle 2014-02-04 10:22:42 +13:00
Sam Hemelryk
4a30b40069 Merge branch 'MDL-43936' of git://github.com/timhunt/moodle 2014-02-04 10:11:44 +13:00
Gordon Bateson
1b17f2b0db MDL-40410 remove ampersands required for PHP strict standards lib/tablelib.php 2014-02-04 10:06:07 +13:00
Sam Hemelryk
7c8c6aa76b Merge branch 'wip-mdl-40911' of https://github.com/rajeshtaneja/moodle 2014-02-04 09:53:16 +13:00
Sam Hemelryk
b2ca12e904 Merge branch 'MDL-43884-master' of git://github.com/ankitagarwal/moodle 2014-02-04 09:11:27 +13:00
Sam Hemelryk
3f5827459e MDL-39617 backup: language improvements to cli/backup.php 2014-02-04 09:04:01 +13:00
Sam Hemelryk
6bdf77c191 Merge branch 'MDL-39617-master' of https://github.com/lucisgit/moodle 2014-02-04 08:41:37 +13:00
Sam Hemelryk
6958c718cc Merge branch 'wip-MDL-39942-master' of https://github.com/kwiliarty/moodle 2014-02-04 08:28:56 +13:00
Eloy Lafuente (stronk7)
4f31798dfc Merge branch 'master_MDL-37714' of git://github.com/greg-or/moodle 2014-02-03 17:58:30 +01:00
Marina Glancy
8621a0ece5 Merge branch 'MDL-41647' of git://github.com/apsdehal/moodle 2014-02-03 17:34:20 +08:00
Dan Poltawski
40c761e01a MDL-42882 upgrade: improved SQL query 
Kudos to Tim Hunt who came up with this, on mysql with 4 milion
records (and a fast SSD) the performance difference is:

Original: 36.83 sec
New query: 8.63 sec
 2014-02-03 17:29:51 +08:00
Dan Poltawski
119cf17eec MDL-42882 upgrade: unit tests for root folders upgrade 
Just verifying the original behaviour
 2014-02-03 17:29:51 +08:00
David Monllao
3688bd470b MDL-43838 behat: Clean theme compatibility with small and medium screen sizes 2014-02-03 16:59:59 +08:00
Marina Glancy
3ef6324aaa Merge branch 'MDL-43805-master' of git://github.com/damyon/moodle 2014-02-03 16:09:09 +08:00
Marina Glancy
c8e346f799 Merge branch 'w05_MDL-43905_m27_loginevents' of git://github.com/skodak/moodle 2014-02-03 15:17:18 +08:00
Marina Glancy
dc4bed906f Merge branch 'MDL-43593-master' of git://github.com/damyon/moodle 2014-02-03 15:06:11 +08:00
Marina Glancy
367465085b Merge branch 'MDL-43951_master' of git://github.com/dmonllao/moodle 2014-02-03 14:53:45 +08:00
Ankit Agarwal
6b21643236 MDL-43804 themes: Update css not to use r0 and r1 identifiers for table rows 2014-02-03 14:29:39 +08:00
David Monllao
405cdd0441 MDL-43951 behat: Fixing random failure 
NodeElement->hasAttribute() (JS enabled) queries selenium
about whether it has any attribute or not, if due to an
AJAX request the field node changed selenium can not access
that node and throws an exception.
 2014-02-03 13:59:12 +08:00
Marina Glancy
1b066c06c6 Merge branch 'MDL-43440-master' of git://github.com/mr-russ/moodle 2014-02-03 13:42:23 +08:00
Paul Charsley
40c3dacf44 MDL-42425 modify mod_assign_save_grade to process advanced grading data 2014-02-03 09:06:28 +13:00
Andrew Nicols
a964ead06d MDL-43911 Behat: Save dumps of the page content to disk on scenario failure 2014-02-02 20:34:10 +08:00
apsdehal
23f9ff903f MDL-41647 WebServices: Changed notification CSS class 2014-02-02 15:20:21 +05:30
apsdehal
54ae34ced1 MDL-41644 Backup: Update CSS class .notifywarning with .notifyproblem 2014-02-02 03:26:28 +05:30
Tim Hunt
70f22d60fb MDL-43936 questions: document renderer API change. 2014-01-31 14:12:19 +00:00
Tim Hunt
e06bb5f800 MDL-43926 Unit tests shouldn't assume only one category on install 2014-01-31 13:31:17 +00:00
Marina Glancy
cdb69ddff0 MDL-43828 forum: allow to select single available group when posting 2014-01-31 16:56:48 +08:00
Marina Glancy
93c9a86dea MDL-43821 completion: fix bug in section completion progress 
Thanks to Shane Dye for the provided patch
 2014-01-31 16:56:43 +08:00
Marina Glancy
7456c96766 MDL-41384 course: do not show debugging message if $COURSE contains format options 
before showing debugging message make sure that field exists in database and not only in the object
 2014-01-31 16:56:30 +08:00
Marina Glancy
e20497827d MDL-41384 upgrade: make sure to re-read $SITE from DB when course table is altered 2014-01-31 16:56:30 +08:00
Marina Glancy
4e3663365b MDL-33920 filepicker: hide 'save as' field when not applicable 2014-01-31 16:56:13 +08:00
Marina Glancy
183515da23 weekly release 2.7dev 2014-01-31 14:11:12 +08:00
Marina Glancy
56ae2ba99b Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-01-31 14:11:11 +08:00
Petr Škoda
54b1e0409c MDL-43905 fix update of user login times 
There needs to be only one event during user login.
The timemodified field is not supposed to be updated during login.
 2014-01-31 10:08:01 +08:00
Gregory Faller
20c9f4a133 MDL-37714: Correctly identify frequently used comments during restore 2014-01-31 10:26:11 +10:30
Andrew Nicols
8cf30a371a MDL-42928 Filepicker: Disable behat tests run by phantom 
There seems to be a bug relating to overflow: hidden on the body tag in
some cases which is only showing for dialogues which belong to the
filepicker.

Disabling these for the moment as this issue may be related to MDL-43712
which is a work in progress.
 2014-01-30 17:13:32 +08:00
Rajesh Taneja
140118e3e8 MDL-40911 events: replaced add_to_log with events for login failed 2014-01-30 12:12:02 +08:00
Andrew Nicols
d125cf103c MDL-43684 Course: Correct showing and hiding of resources on drag/drop 
This was caused by an issue with String casting in JavaScript.
In JavaScript, "0" evaluates as a truthy value.
 2014-01-30 11:03:08 +08:00
Petr Škoda
bfaf4f00cb MDL-43903 prevent adodb error logging output in phpunit execution with 
native ms sql driver
 2014-01-30 10:39:34 +08:00
Damyon Wiese
11ab6207e8 MDL-43805 assign: Behat test for quickgrading bug 2014-01-29 20:29:41 +08:00
Damyon Wiese
a6fd2e2cf1 MDL-43805 Assign: Quickgrading wipes out grades for hidden columns. 
Grr.. quickgrading will always be a hack.
 2014-01-29 20:29:35 +08:00
M Kassaei
7258470276 MDL-43687, convert question/preview.js to the new yui format 2014-01-29 11:37:57 +00:00
David Monllao
7e3f5e79d0 MDL-43450 behat: Checking the ->behat_* vars contents before showing the steps list 2014-01-29 14:28:37 +08:00
Marina Glancy
7c4044a54f Merge branch 'MDL-25500-master-fix1' of git://github.com/damyon/moodle 2014-01-29 12:01:33 +08:00
Damyon Wiese
37b2c56569 MDL-25500 Lock: Unit tests have found that MySQL locks are broken 
Removing the MySQL lock factory, the only safe way to use this MySQL API
would be to open a new DB connection for every lock. Record locking is a decent
fallback.
 2014-01-29 11:52:51 +08:00