Mark Nelson
464e00be28
MDL-34270 blocks: perform My Moodle addinstance capability check first
2012-11-06 14:56:47 +08:00
Dan Poltawski
a353088f2c
Merge branch 'wip-MDL-36342-master' of git://github.com/barbararamiro/moodle
...
Conflicts:
theme/base/style/core.css
2012-11-06 14:48:22 +08:00
Dan Poltawski
14c01766ec
Merge branch 'wip-MDL-36338-master' of git://github.com/barbararamiro/moodle
2012-11-06 14:27:59 +08:00
Dan Poltawski
e6acc052fb
Merge branch 'MDL-36037' of git://github.com/netspotau/moodle-mod_assign
2012-11-06 12:32:41 +08:00
Sam Hemelryk
468cc57297
MDL-34342 cache: Added missing include and fixed old lang manager setting
2012-11-06 17:24:20 +13:00
Dan Poltawski
cdf9b0c86f
Merge branch 'MDL-36266-notification-subject' of git://github.com/mudrd8mz/moodle
2012-11-06 11:59:24 +08:00
Dan Poltawski
2f3844e154
MDL-34342 - increment version number
...
To pickup new cache defintion changes
2012-11-06 11:32:43 +08:00
Dan Poltawski
61d49846a1
Merge branch 'wip-MDL-34342-m24' of git://github.com/samhemelryk/moodle
2012-11-06 11:26:45 +08:00
Dan Poltawski
915fc9b96c
Merge branch 'MDL-35421-conclusion' of git://github.com/mudrd8mz/moodle
2012-11-06 11:17:44 +08:00
Dan Poltawski
653c89bcf3
Merge branch 'w43_MDL-36199_m24_pluginsingletons' of git://github.com/skodak/moodle
2012-11-06 10:32:47 +08:00
Dan Poltawski
2c36da50bc
Merge branch 'wip-MDL-36362-m24' of git://github.com/samhemelryk/moodle
...
Conflicts:
version.php
2012-11-06 10:03:23 +08:00
Dan Poltawski
70cb1b995b
Merge branch 'm24_MDL-36360_Missing_cachestore_file_config_get_configuration_array' of git://github.com/scara/moodle
2012-11-06 09:59:16 +08:00
Dan Poltawski
4798b9dd79
Merge branch 'wip-MDL-36379-m24' of git://github.com/samhemelryk/moodle
2012-11-06 09:47:56 +08:00
Dan Poltawski
eb5fc2a7d5
Merge branch 'MDL-36347' of git://github.com/timhunt/moodle
2012-11-06 09:41:56 +08:00
Dan Poltawski
980140e7cf
Merge branch 'MDL-36023-master' of git://git.luns.net.uk/moodle
2012-11-06 09:35:31 +08:00
Sam Hemelryk
db19da5612
MDL-35998 admin: Fixed whitespace
2012-11-06 14:32:18 +13:00
Sam Hemelryk
8b03c25185
MDL-36379 user_view: fixed issue with page layout when editing was on
2012-11-06 14:01:14 +13:00
Mary Evans
f02da4fbce
MDL-36368 theme_sky_high: fixes regression found when testing MDL-35275
2012-11-06 00:45:07 +00:00
Eloy Lafuente (stronk7)
e24d97f944
MDL-35381 added consistent sorting to the new selector (MDL-34657)
2012-11-06 00:44:42 +01:00
Petr Škoda
9f7b195fe6
MDL-35381 limit teachers to do permissions checks of enrolled users only
2012-11-06 00:08:13 +01:00
Sam Hemelryk
5252ec82a2
Merge branch 'MDL-35998' of git://github.com/mouneyrac/moodle
...
Conflicts:
version.php
2012-11-06 11:00:16 +13:00
Sam Hemelryk
02adb1e30d
Merge branch 'wip-mdl-29689' of git://github.com/rajeshtaneja/moodle
2012-11-06 10:34:06 +13:00
Sam Hemelryk
2ede3d7f35
Merge branch 'MDL-31629-master' of git://github.com/micaherne/moodle
2012-11-06 10:08:43 +13:00
Barbara Ramiro
2df53c3ed8
MDL-36277 Usability: New Activity icons in SVG and PNG formats
2012-11-06 00:02:31 +08:00
Barbara Ramiro
651f639ed0
MDL-36342 Usability: New icons for section in SVG and PNG formats
2012-11-05 23:43:02 +08:00
Dan Poltawski
918085d048
Revert "MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled"
...
This reverts commit 45f93db912
.
This reverts commit 3f798d4a3d
.
2012-11-05 15:20:22 +08:00
Rossiani Wijaya
4bde11528b
MDL-34572 accessibility compliance for repository: add label for form input text and select tag
2012-11-05 15:06:33 +08:00
Dan Poltawski
c296ab7a4d
MDL-35260 - version bump for course format settings
2012-11-05 15:06:12 +08:00
Dan Poltawski
3f798d4a3d
MDL-35260 - fix trailing whitespace
2012-11-05 15:05:13 +08:00
Dan Poltawski
1fc59b22de
Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle
2012-11-05 15:04:25 +08:00
Dan Poltawski
1872a0f26e
MDL-35768 - fix trailing whitespace
2012-11-05 14:46:00 +08:00
Dan Poltawski
6b02cc4fc1
MDL-35768 - fix E_STRICT issue
2012-11-05 14:31:54 +08:00
Dan Poltawski
825876620b
MDL-35768 - increment redirect_if_major_upgrade_required
2012-11-05 14:25:24 +08:00
Dan Poltawski
f041dc5ff7
Merge branch 'wip-MDL-35768-master' of git://github.com/marinaglancy/moodle
2012-11-05 14:08:28 +08:00
Dan Poltawski
940a1e8a17
Merge branch 'MDL-34270_master' of https://github.com/markn86/moodle
2012-11-05 14:05:48 +08:00
Aaron Barnes
f493d528c2
MDL-35556 completion: Improve user completion data permission checking
2012-11-05 19:03:18 +13:00
Dan Poltawski
ec0a080a07
MDL-34527 - fix trailing whitespace
2012-11-05 13:28:16 +08:00
Dan Poltawski
2c333485c4
Merge branch 'wip-MDL-34527-m24' of git://github.com/samhemelryk/moodle
2012-11-05 13:25:10 +08:00
Marina Glancy
22fae2a0dd
MDL-36369 Non-admin managers could not access list of plugins
2012-11-05 12:31:19 +08:00
Mark Nelson
70c9c1956d
MDL-34270 blocks: Adding clonepermissionsfrom to the new capability definitions
2012-11-05 12:28:09 +08:00
Marina Glancy
45f93db912
MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled
2012-11-05 11:46:34 +08:00
Marina Glancy
8d8d4da44d
MDL-36017 renamed formatoptions to courseformatoptions in externallib
2012-11-05 11:40:03 +08:00
Dan Poltawski
b59e928b69
Merge branch 'WIP-MDL-36069-master' of git://github.com/nadavkav/moodle
2012-11-05 11:31:46 +08:00
Sam Hemelryk
f3c306f4e0
MDL-21625 question: Fixed phpdocs
2012-11-05 16:29:28 +13:00
Sam Hemelryk
544c455357
Merge branch 'MDL-21625_b' of git://github.com/rwijaya/moodle
2012-11-05 16:27:43 +13:00
Marina Glancy
850acb3560
MDL-35768 MDL-36017 Avoid calling format_base::get_course() when not necessary
...
- If we want to check fields 'numsections' or 'hiddensections' call course_get_format()->get_format_options()
- We still use extended course object in course/edit.php, update_course(), create_course(), and inside course formats
2012-11-05 11:22:06 +08:00
Dan Poltawski
96846c2a9e
Merge branch 'MDL-33621' of git://github.com/rwijaya/moodle
2012-11-05 11:12:32 +08:00
Dan Poltawski
770314dd37
Merge branch 'wip-mdl-35787' of git://github.com/rajeshtaneja/moodle
2012-11-05 10:58:46 +08:00
Aparup Banerjee
c770f07155
Merge branch 'wip-MDL-31824-master' of git://github.com/phalacee/moodle
2012-11-05 10:27:57 +08:00
Sam Hemelryk
1385f1d8fb
Merge branch 'MDL-36107b' of git://github.com/srynot4sale/moodle
2012-11-05 15:07:21 +13:00