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

61113 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Hemelryk
311c034744 MDL-38874 theme_bootstrap: tidy up whitespace 2013-04-22 10:43:38 +12:00
Sam Hemelryk
9fdb1c1a63 Merge branch 'MDL-38874_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 10:35:52 +12:00
David Scotson
16d795a4d3 MDL-39196 theme_bootstrap: improved display of login errors 2013-04-22 10:27:11 +12:00
Sam Hemelryk
48d253c100 Merge branch 'MDL-39241-master' of git://github.com/danpoltawski/moodle 2013-04-22 09:23:54 +12:00
Mary Evans
232affc96a MDL-38874 theme_bootstrap: added back CSS rules to fix advanced elements show/hide toggle in admin forms. 
While doing this I got a compile error so not sure but I am guessing the changes to fix that error will show up in the commit diff.
 2013-04-21 18:02:08 +01:00
Petr Škoda
968083cd02 MDL-39213 allow role assignments in frontpage in user upload 2013-04-21 17:24:51 +02:00
Petr Škoda
abea8b437c MDL-39178 add missing update callback for all theme settings 2013-04-20 22:06:55 +02:00
Petr Škoda
fd4592bbbc MDL-36959 test reworked adding of files to sha1 content pool 2013-04-20 21:59:08 +02:00
Petr Škoda
d91e2c15db MDL-36959 rework adding of content files to the file pool 
This patch includes refreshing of borked files in file pool and basic prevention of race conditions. It also helps with diagnosing of file pool permission problems, detects coding errors and some other type of problems including sha1 collision jackpot.
 2013-04-20 21:41:41 +02:00
Mary Evans
c9ff4d0e0f MDL-38898 theme_bootstrap: Made changes to layout/general.php to enable drag-n-drop support in Bootstrap theme. 2013-04-20 02:10:11 +01:00
David Mudrák
7b1e0645c1 MDL-39249 Fix typo in available_update_deployer class 
I have accidentally spotted this typo while working on this branch. It
has never caused any harm as both parameters callerurl and returnurl are
always passed. Blame copy/pasting of code blocks.
 2013-04-20 03:01:36 +02:00
David Mudrák
5d7a4bab3f MDL-39249 Return to the correct page after successful update deployment 
The method available_update_deployer::make_execution_widget() used to
have hard-coded return URL. Now it accepts the return URL as the second
parameter and passes it to the mdeploy.php utility.

The callerurl parameter is now correctly passed and used.
 2013-04-20 03:00:19 +02:00
David Mudrák
b27c50e234 MDL-39248 Fix the plugins check screen strings 
Not all add-ons require administrator's attention during the upgrade
now. They are now listed only if there is an update available for them.

Also, it's not true any more that add-ons must be updated manually. They
can be updated using the automatic deployment feature, too.
 2013-04-20 00:52:47 +02:00
David Mudrák
2f838a4e93 MDL-39248 Display only plugins with available updates at plugins check 2013-04-20 00:42:02 +02:00
Tim Hunt
ba86e1d1ee MDL-39186 quiz password form: set param types. 2013-04-19 18:28:59 +01:00
David Scotson
13cb4ee0b4 MDL-38900 Change highlighted course section color 2013-04-19 16:39:29 +01:00
Dan Poltawski
b93945e9b9 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle 
Conflicts:
	mod/scorm/module.js
 2013-04-19 15:20:02 +01:00
Dan Poltawski
aa15c5f3ff Merge branch 'MDL-38361' of https://github.com/prateeksachan/moodle 2013-04-19 15:11:33 +01:00
Dan Poltawski
35626ff4dd MDL-39241 groups import: missing type 2013-04-19 14:51:27 +01:00
Dan Poltawski
00a850b33e Merge branch 'wip-MDL-38565-m25' of git://github.com/samhemelryk/moodle 2013-04-19 13:29:07 +01:00
David Mudrák
9074e47871 MDL-39148 Highlight plugin status at the overview screen 
Plugins that are to be installed and plugins that are missing from disk
are now highlighted at the Plugins overview screen. Other statuses (such as
of plugin to be upgraded) should not be needed at this page as those
are primarily intended for the Plugins checks screen during the upgrade.
 2013-04-19 13:21:39 +02:00
Tim Hunt
53f8948899 MDL-39050 quiz access rules: settings.php files should work. 2013-04-19 11:50:25 +01:00
Mary Evans
082ebd6e51 MDL-38918 theme_simple: Added favicon.ico to theme/simple/pix directory. 2013-04-19 10:46:33 +01:00
David Mudrák
badf464792 MDL-39148 Non-installed plugins cannot be uninstalled 
If the plugin has been only deployed to the disk without installing into
the database, do not allow going through the uninstallation procedure.
Not only it does not have much sense. But it can also lead to some
tricky situation due to dependencies. Better to block it and wait till
the plugin is either fully installed or removed from the disk.
 2013-04-19 11:24:43 +02:00
BA CodeMonkey
f0e683ecb3 MDL-38854: Bootstrap theme - text input in a block is wider than the block 2013-04-19 11:07:04 +02:00
BA CodeMonkey
2135cec6e8 MDL-39231: Rename region-bs-main to region-main in layout files for theme bootstrap and theme simple 2013-04-19 10:52:03 +02:00
Damyon Wiese
42d2b9fbcc MDL-39163 Version bump for css changes 2013-04-19 15:51:31 +08:00
Damyon Wiese
35490f6357 Merge branch 'MDL-39163-master' of git://github.com/FMCorz/moodle 2013-04-19 15:49:16 +08:00
Rajesh Taneja
1fe56a2a00 MDL-38851 Administration: Fixed setType in admin section 2013-04-19 15:18:33 +08:00
Damyon Wiese
43d3124816 Merge branch 'MDL-31194-master' of git://github.com/mouneyrac/moodle 2013-04-19 15:15:10 +08:00
Damyon Wiese
d9c22e944d Merge branch 'MDL-39084-master' of github.com:StudiUM/moodle 2013-04-19 13:58:15 +08:00
Damyon Wiese
747230d564 Merge branch 'wip-MDL-39211-m25' of git://github.com/marinaglancy/moodle 2013-04-19 13:53:14 +08:00
Damyon Wiese
dd3b3a81d1 Merge branch 'MDL-39167' of git://github.com/timhunt/moodle 2013-04-19 13:13:28 +08:00
Damyon Wiese
29e2fecb44 MDL-39173 Assign - Remove permissions check and OUTPUT from previous patch 
The permissions check is not correct (even users with grade capability should not
see user identities) and $assignment->get_renderer() is preferred over $OUTPUT.
 2013-04-19 13:05:12 +08:00
Sam Chaffee
0399580003 MDL-39173 Assign - Enable comments for blind marking assignments (anonymous ones) 2013-04-19 13:03:05 +08:00
Sam Hemelryk
459699105c Merge branch 'MDL-39206_master' of git://github.com/lazydaisy/moodle 2013-04-19 16:37:31 +12:00
Sam Hemelryk
2b2b967ecb MDL-38646 mod_folder: improved upgrade of showexpanded 2013-04-19 16:28:29 +12:00
Sam Hemelryk
a03fdbb099 Merge branch 'MDL-38646' of git://github.com/rlorenzo/moodle 2013-04-19 16:23:21 +12:00
Sam Hemelryk
476554bbca Merge branch 'MDL-38777-m' of git://github.com/andrewnicols/moodle 2013-04-19 15:20:44 +12:00
Frederic Massart
e62e473d44 MDL-30940 form: Mutiple select work correctly without any selection 2013-04-19 11:04:34 +08:00
Sam Hemelryk
91d72d3105 Merge branch 'MDL-39164' of git://github.com/jmvedrine/moodle 2013-04-19 14:54:41 +12:00
Sam Hemelryk
52b4bd37e7 Merge branch 'MDL-38710-master' of git://github.com/damyon/moodle 2013-04-19 14:41:25 +12:00
Sam Hemelryk
5ab262321c Merge branch 'MDL-39033-master' of git://github.com/sammarshallou/moodle 2013-04-19 14:02:35 +12:00
Sam Hemelryk
4d35c88e10 Merge branch 'MDL-39185_master' of https://github.com/markn86/moodle 2013-04-19 13:53:55 +12:00
Sam Hemelryk
ff76b6044b Merge branch 'MDL-39135-master' of git://github.com/damyon/moodle 2013-04-19 13:48:32 +12:00
Rex Lorenzo
57e228045b MDL-38646 folder: change column from show_expanded to showexpanded 2013-04-18 17:28:35 -07:00
Sam Hemelryk
5cba0c4ba3 MDL-38565 cache: tidy up pre-integration 2013-04-19 10:13:36 +12:00
Sam Hemelryk
4da28110c0 MDL-38565 cache: improve stats gathering 2013-04-19 10:12:59 +12:00
Sam Hemelryk
fbf76dcd17 MDL-38565 cache: upgrade code to amend default stores 2013-04-19 10:12:59 +12:00
Sam Hemelryk
059102e728 MDL-38565 cache: cron routine to clean up old session data 2013-04-19 10:11:48 +12:00