Commit graph

57477 commits

Author SHA1 Message Date
Dan Poltawski
42fd0b64b9 Merge branch 'MDL-34270_master' of https://github.com/markn86/moodle 2012-11-08 14:53:06 +08:00
Mark Nelson
4fc95a9fff MDL-34270 blocks: removing unnecessary capabilities 2012-11-08 14:49:28 +08:00
Aparup Banerjee
4b1466d50c Merge branch 'MDL-27824' of git://github.com/rwijaya/moodle 2012-11-08 13:26:39 +08:00
Rossiani Wijaya
d9b87135cb MDL-27824 course categories: remove trailing whitespace 2012-11-08 12:29:42 +08:00
Rossiani Wijaya
929cdf06de MDL-27824 course categories: change isset() to empty() 2012-11-08 12:25:58 +08:00
Rossiani Wijaya
08af002921 MDL-27824 course categories: Added @todo comments to remove the temporary fix 2012-11-08 12:25:57 +08:00
Rossiani Wijaya
98068e1d8c MDL-27824 - course category: add check test for ->coursesperpage value. 2012-11-08 12:25:57 +08:00
Dan Poltawski
f7febae6d0 Merge branch 'MDL-36422-master' of git://github.com/FMCorz/moodle 2012-11-08 11:07:43 +08:00
Dan Poltawski
9b70e89fc3 MDL-36436 - remove disabling of setting based on ldap paging support 2012-11-08 10:22:30 +08:00
Frederic Massart
eec4107bdd MDL-36422 question: Fixed malformed HTML in manual marking 2012-11-08 10:20:22 +08:00
Dan Poltawski
6a0511c17e MDL-36119 - remove <em> from lang string
(Its across whole string, so shouldn't really be done within the string)
2012-11-08 10:18:06 +08:00
Dan Poltawski
ee943e7311 MDL-36119 - fix trailing whitespace 2012-11-08 10:18:06 +08:00
Dan Poltawski
809c1bee49 Merge branch 'wip_master_mdl-36119_ldap_paged_results' of git://github.com/iarenaza/moodle 2012-11-08 09:48:36 +08:00
Dan Poltawski
bec1b02a91 Merge branch 'wip-MDL-36381-m24' of git://github.com/samhemelryk/moodle 2012-11-08 09:33:43 +08:00
Dan Poltawski
650e6c7339 Merge branch 'MDL-36290-master' of git://github.com/FMCorz/moodle 2012-11-08 09:26:08 +08:00
Dan Poltawski
7164d2f68a Merge branch 'w45_MDL-36194_m24_editoruninstall' of git://github.com/skodak/moodle 2012-11-08 08:52:25 +08:00
Rex Lorenzo
00917ec682 MDL-36051 - Quick Grading in Assignment module does not turn on in some circumstances
* Fixed bug with quick grading when file submission is turned off
2012-11-07 16:26:26 -08:00
Mark Nelson
3774324174 MDL-33791 Portfolio: Fixed security issue with passing file paths. 2012-11-08 00:26:13 +01:00
Sam Hemelryk
f89a1a8876 Merge branch 'MDL-36197_master' of git://github.com/lazydaisy/moodle 2012-11-08 11:30:49 +13:00
Sam Hemelryk
24f4515576 Merge branch 'MDL-36271_master' of https://github.com/markn86/moodle 2012-11-08 11:07:15 +13:00
Sam Hemelryk
9a0e6f147d Merge branch 'WIP-MDL-35249-master' of git://github.com/nadavkav/moodle
Conflicts:
	mod/assign/gradingtable.php
2012-11-08 10:57:52 +13:00
Sam Hemelryk
81ede547f2 MDL-36381 cache: fixed bug whereby you couldn't edit store instances 2012-11-08 10:54:11 +13:00
Adrian Greeve
e2c5f38605 MDL-35558 mod_data: Show only own entries while there are required pending. 2012-11-07 19:43:42 +01:00
Iñaki Arenaza
c090d7c90e MDL-36119: auth_{ldap,cas}: LDAP Sync - implement paged results
Thanks to Jerome Charaoui for the original patch.
2012-11-07 19:13:10 +01:00
Petr Škoda
b5cf59a59d MDL-36194 remove bogus echo $PAGE->set_title()
Credit goes to Dan Poltawski, thanks!
2012-11-07 19:11:25 +01:00
Petr Škoda
eac37ff46a MDL-36431 fix multiple problems with self enrol defaults
This patch adds new method for retrieving of default properties of enrol_self instances and uses it both for automatic adding of instances and add instance form - this will guarantee both are using the same data in the future.
2012-11-07 18:57:14 +01:00
Petr Škoda
68cd60b7df MDL-36196 hardcode the required PHP version in installer 2012-11-07 13:04:08 +01:00
Petr Škoda
4f66c75f20 MDL-36194 add support for editor uninstallation 2012-11-07 13:02:21 +01:00
Eloy Lafuente (stronk7)
9986cd9013 NOBUG: Trivial whitespace fix to quickly fix ongoing CI status. 2012-11-07 11:49:56 +01:00
Frederic Massart
0f817d0d90 MDL-36290 usability: CSS post processing does not cancel SVG use 2012-11-07 17:29:20 +08:00
Dan Poltawski
2ac705c41d Merge branch 'MDL-36092-master' of git://git.luns.net.uk/moodle 2012-11-07 16:56:11 +08:00
Dan Poltawski
e87bdad9ad Merge branch 'MDL-36368_master' of git://github.com/lazydaisy/moodle 2012-11-07 16:49:35 +08:00
Dan Poltawski
4b5a6b1327 Merge branch 'wip-MDL-36317-master' of git://github.com/marinaglancy/moodle
Conflicts:
	course/format/lib.php
2012-11-07 16:41:53 +08:00
Dan Poltawski
63fc21b4e5 Merge branch 'MDL-26349-workshop-grades-display' of git://github.com/mudrd8mz/moodle 2012-11-07 16:32:43 +08:00
David Mudrák
3cb4ce45c7 MDL-26349 Display the workshop final grades to participants when the activity is closed 2012-11-07 09:08:38 +01:00
Dan Poltawski
64f7d154db Merge branch 'wip-MDL-36113-master' of git://github.com/abgreeve/moodle
Conflicts:
	lib/tests/csvclass_test.php
2012-11-07 15:40:06 +08:00
Adrian Greeve
13041f2125 MDL-36113 - lib: Unit tests for importing csv files with empty lines in the middle of the file. 2012-11-07 15:34:36 +08:00
Adrian Greeve
415a6ffcc8 MDL-36113 - lib: Importing csv entries with empty lines in the middle doesn't throw errors. 2012-11-07 15:34:29 +08:00
Dan Poltawski
defcb763fe Merge branch 'MDL-36209-workshop-assess-while-evaluating' of git://github.com/mudrd8mz/moodle 2012-11-07 15:30:38 +08:00
Dan Poltawski
092977fb0b Merge branch 'wip-MDL-36112-master' of git://github.com/abgreeve/moodle 2012-11-07 15:06:36 +08:00
Dan Poltawski
20aea2ea0d Merge branch 'MDL-17444_localPluginBackupRestoreMaster' of https://github.com/moodlerooms/moodle 2012-11-07 14:49:15 +08:00
Nicolas Connault
dd15ef0e1b MDL-36413 Added "this->" to exclude variable assignment
The this-> keyword was missing from the $exclude = array() statement.
2012-11-07 14:48:40 +08:00
Dan Poltawski
53b6a75a99 Merge branch 'wip-MDL-35279-master' of git://github.com/marinaglancy/moodle 2012-11-07 14:44:26 +08:00
Dan Poltawski
5c6d2b1480 Merge branch 'wip-MDL-36369-master' of git://github.com/marinaglancy/moodle 2012-11-07 14:34:37 +08:00
Dan Poltawski
8f3020558d Merge branch 'wip-MDL-33017-m24-r2' of git://github.com/samhemelryk/moodle 2012-11-07 14:17:11 +08:00
Dan Poltawski
1383b1f29a Merge branch 'wip-MDL-36365-master' of git://github.com/abgreeve/moodle 2012-11-07 14:09:25 +08:00
Adrian Greeve
1222dc52e1 MDL-36365 - lib: The csv class now reads tab separated files with tabs at the end of the file. 2012-11-07 14:02:39 +08:00
Dan Poltawski
ac012a9b2c Merge branch 'wip-MDL-36397-master' of git://github.com/barbararamiro/moodle 2012-11-07 13:42:32 +08:00
Dan Poltawski
20272a548c Merge branch 'wip-mdl-36303' of git://github.com/rajeshtaneja/moodle 2012-11-07 11:57:58 +08:00
Barbara Ramiro
32ee9fe407 MDL-36397 Usability: New setting block icons in svg and png formats 2012-11-07 11:32:14 +08:00