mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 21:20:02 +01:00
Code Issues Projects Releases Wiki Activity
66,589 Commits 36 Branches 527 Tags
Commit Graph

66589 Commits

This Branch
This Branch
All Branches
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
d9fece93d0 Merge branch 'MDL-41757-master' of https://github.com/jamiepratt/moodle 2014-02-05 12:36:52 +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
Eloy Lafuente (stronk7)
9433b01c94 Merge branch 'MDL-42425' of https://github.com/Lightwork-Marking/moodle 2014-02-04 23:56:27 +01: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
Bas Brands
a799631bb1 MDL-38923 theme bootstrapbase: theme clean: enable docking 2014-02-05 11:20:32 +13:00
Yuliya Bozhko
ab8aa5828f MDL-43774 badges: Stop overriding default course navigation 2014-02-05 10:46:34 +13:00
Yuliya Bozhko
a2a114bd6a MDL-43978 badges: Display error message to guest users viewing "My Badges" page 2014-02-05 09:52:32 +13:00
Iñaki Arenaza
a8451603cf MDL-32724: LDAP Auth function user_update() returns true even if update has failed 2014-02-04 19:28:59 +01:00
apsdehal
f80add6990 MDL-43200 WebServices: Reset Instance variable 2014-02-04 19:38:34 +05:30
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
Damyon Wiese
35361b94ec MDL-43805 assign: Prevent behat fail on ci - editpdf is not available there 
Ghostscript is not setup on the ci servers, so the editpdf feature will be automatically
disabled. This means that I cannot click on "Hide Annotate PDF".
 2014-02-04 13:37:06 +08:00
Sam Hemelryk
aa01949f24 Merge branch 'MDL-43369-master' of git://github.com/jamiepratt/moodle 2014-02-04 15:50:48 +13: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
AMOS bot
fa8e01e2b8 Automatically generated installer lang files 2014-02-04 00:42:01 +00: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
Eloy Lafuente (stronk7)
2c4e068639 Merge branch 'MDL-43687' of https://github.com/mkassaei/moodle 2014-02-04 00:16:48 +01:00
Eloy Lafuente (stronk7)
21fe8c3355 Merge branch 'wip-MDL-43821-master' of git://github.com/marinaglancy/moodle 2014-02-04 00:11:20 +01:00
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