mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 19:12:39 +01:00
Code Issues Projects Releases Wiki Activity
66,393 Commits 36 Branches 527 Tags
Commit Graph

66393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
642ad27297 Merge branch 'MDL-43994-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-02-10 09:06:31 +13:00
Sam Hemelryk
98396c2327 MDL-43804 theme: amended upgrade.txt with more information 2014-02-10 09:04:54 +13:00
Sam Hemelryk
179ddd105b Merge branch 'MDL-43804-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-02-10 08:50:23 +13:00
Sam Hemelryk
705c5e0aed Merge branch 'MDL-44029-quiz-group-delete-handler-bug' of https://github.com/mpetrowi/moodle 2014-02-10 08:44:39 +13:00
Sam Hemelryk
065bc30c8d Merge branch 'MDL-43946' of https://github.com/merrill-oakland/moodle 2014-02-10 08:42:55 +13:00
Andrew Nicols
e14e17029c MDL-43994 Blocks: Hide the move icon when blocks are docked 2014-02-07 17:39:36 +08:00
Sam Hemelryk
974c2cdc03 weekly release 2.7dev 2014-02-07 11:46:00 +13:00
Sam Hemelryk
b1733dc795 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-02-07 11:45:55 +13:00
Matt Petro
74b3c4e58c MDL-44029 mod_quiz: Fixing group deleted handler so it does not remove user overrides. 2014-02-06 13:32:04 -05:00
Andrew Nicols
fd2e73abef MDL-43687 Javascript: Correct instantiation of the question-preview 
This addresses issues discovered during testing, including:
* inclusion of the M.core_question_preview metadata;
* inclusion of required strings; and
* correcting a function signature.
 2014-02-06 13:55:27 +08:00
Russell Smith
42e34c2882 MDL-43926 files: Unit tests cannot assume id values. 2014-02-06 09:34:56 +08:00
Sam Hemelryk
37a079acb5 Merge branch 'MDL-43936' of git://github.com/timhunt/moodle 2014-02-06 10:04:04 +13:00
Eric Merrill
51ec2e451f MDL-43946 gradebook upgrade Improve SQL to find duplicate sortorders. 2014-02-05 09:56:34 -05:00
Tim Hunt
c2f35e0b22 MDL-43936 questions: fix my lame spelling in upgrade.txt. 
Thanks to Mark Nelson for the suggested improvements.
 2014-02-05 11:23:42 +00:00
Marina Glancy
7f34b8e135 Merge branch 'MDL-42339' of git://github.com/rwijaya/moodle 2014-02-05 15:56:30 +08:00
Rossiani Wijaya
8c6ca6961a MDL-42339 - removed double formatting for set_title() and set_heading() 2014-02-05 14:47:23 +08:00
Marina Glancy
a76edd4961 MDL-42425 assign: bumping version for new web services to take effect 2014-02-05 14:32:27 +08:00
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
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