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

18076 commits

Author SHA1 Message Date
Marina Glancy
c71b7b7c44 Merge branch '38923-27' of git://github.com/samhemelryk/moodle 2014-02-05 12:49:02 +08:00
Sam Hemelryk
ee729af1e4 MDL-38923 theme_bootstrapbase: pre-integration fixups 
* Fixed the way we added the block class to the dock panel in dock.js
* Added a class to the h2 that is used to test dock title width
* Fixed RTL alignment issues as best I could at present
* Fixed overlap of dock + navbar on small screens
* Fixed the docked block width to be constrained to the available space
* Fixed hidden actions on docked blocks
 2014-02-05 15:07:44 +13:00
Sam Hemelryk
8213574043 Merge branch 'MDL-41756-master' of https://github.com/jamiepratt/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2014-02-05 12:35:11 +13:00
Sam Hemelryk
3ec0946e10 Merge branch 'MDL-43027-master' of git://github.com/jamiepratt/moodle 2014-02-05 11:44:49 +13:00
Sam Hemelryk
13de6099c1 Merge branch 'MDL-43952-master' of git://github.com/andrewnicols/moodle 2014-02-05 11:29:32 +13:00
Sam Hemelryk
abaae2a548 MDL-38923 dock: allowed for space before first time 2014-02-05 11:21:09 +13:00
Sam Hemelryk
2a203eee8d MDL-38923 theme_bootstrapbase: tidied up dock implementation 
Also:
* Changed to a CSS based compacting solution
* Converted dock colours to variables
* RTL fixes for the dock
 2014-02-05 11:21:09 +13:00
Eloy Lafuente (stronk7)
5ecfa56512 Merge branch 'MDL-43911-master' of git://github.com/andrewnicols/moodle 2014-02-04 10:53:17 +01:00
Eloy Lafuente (stronk7)
845e11407f Merge branch 'wip-MDL-41384-master' of git://github.com/marinaglancy/moodle 2014-02-04 10:11:42 +01:00
Marina Glancy
e5fd05a368 Merge branch 'MDL-41754-master' of git://github.com/jamiepratt/moodle 2014-02-04 15:44:51 +08:00
Andrew Nicols
ab20c84aff MDL-42428 Javascript: Switch M.util.show_confirm_dialog to use moodle-core-notification 2014-02-04 09:33:45 +08:00
Sam Hemelryk
5c876ed21f Merge branch 'MDL-43538-master' of git://github.com/andrewnicols/moodle 2014-02-04 14:17:39 +13:00
Andrew Nicols
aea2973734 MDL-43952 Javascript: Support invalidation of browser caches for YUI patching 
This will also force files loaded from the CDN to instead come from the
local distribution since those patches will not be included in the CDN
release.

Please see the documentation at http://docs.moodle.org/dev/YUI/Patching for
important on using these changes.
 2014-02-04 09:08:53 +08:00
Oleg Sychev
0b5157363f MDL-42456: add Mercurial vcs support to plugin_external_source 2014-02-04 13:42:33 +13:00
Eloy Lafuente (stronk7)
d29b8f4342 Merge branch 'MDL-33064-master' of git://github.com/danpoltawski/moodle 2014-02-04 00:59:58 +01:00
Sam Hemelryk
2f166b3284 Merge branch 'MDL-43885-master' of git://github.com/andrewnicols/moodle 2014-02-04 12:41:00 +13: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
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
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
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
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
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
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
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
Rajesh Taneja
140118e3e8 MDL-40911 events: replaced add_to_log with events for login failed 2014-01-30 12:12:02 +08: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
Rajesh Taneja
623a32e50d MDL-43736 Events: Updated unit test to test context not used in event 2014-01-29 11:39:50 +08:00
Rajesh Taneja
fdc729ea57 MDL-43736 Events: event->contextinstanceid should be used where possible 
While restoring event context might not be present (deleted)
So before using context api's check context or use event properties
 2014-01-29 11:39:44 +08:00
Andrew Nicols
649c80e6a4 MDL-43885 Javascript: Make the [X] button work like 'No' in relevant dialogues 
The [X] button on the dialogue is another form of the 'No' button and
should behave as such. In some dialogues this matters more than others
because the dialogue is destroyed.
 2014-01-29 11:16:47 +08:00
Eloy Lafuente (stronk7)
fefcd9abab Merge branch 'MDL-43040' 2014-01-29 01:52:49 +01:00
Eloy Lafuente (stronk7)
994e566256 MDL-43040 Note the deprecation and add some TODOs 2014-01-29 01:40:30 +01:00
Sam Hemelryk
34027f1563 MDL-25500 lock: post integration trivial cleanup 
* A couple of misc comment typo's
* Added missing $CFG required global in file_lock_factory::is_available
* Removed unused $CFG global from file_lock_factory::get_lock
* A couple of trivial phpdoc tweaks
* Removed unused $DB global from postgres_lock_factory::get_index_from_key
* Added global namespace \ to exceptions in get_index_from_key (tested and found they didn't resolve)
 2014-01-29 13:22:16 +13:00
Sam Hemelryk
453d66b782 Merge branch 'MDL-25500-master-squashed' of git://github.com/damyon/moodle 2014-01-29 13:21:00 +13:00
Sam Hemelryk
07481c9277 Merge branch 'MDL-40909_master' of https://github.com/markn86/moodle 2014-01-29 08:23:51 +13:00
Andrew Nicols
0860dd78f7 MDL-43886 Javascript: Remove dialouges from the DOM upon destroy 2014-01-29 00:02:03 +08:00
Tim Hunt
3aaf535df1 MDL-43892 dbtransfer: Fix missing string. 2014-01-28 15:55:41 +00:00
Damyon Wiese
d551112566 MDL-25500 Lock: Do not use file locking if $CFG->preventfilelocking is set 
(And file_lock_dir is not prefixed with the dataroot).
 2014-01-28 20:14:05 +08:00
Eloy Lafuente (stronk7)
51cba7809c Merge branch 'MDL-42928-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-28 12:22:23 +01:00
Eloy Lafuente (stronk7)
6dcea23522 Merge branch 'w04_MDL-34055_m27_insertrecords' of https://github.com/skodak/moodle 2014-01-28 10:43:51 +01:00