Ankit Agarwal
95a3bb4dc8
MDL-39152 phpunit: improve tests for assign_roles()
...
core_role_external::assign_roles() now support alternative paramaters instead of contextid. Test working of those. Also test the parameters validation a bit, since these are no longer automatically tested being optional now
2013-06-14 11:50:25 +08:00
Ankit Agarwal
3a68f79809
MDL-39152 webservices: Provide alternative to context id
...
As per our policy asking for and returning contextids is discouraged in webservices. So provide alternative parameters for the same
2013-06-14 11:50:25 +08:00
Marina Glancy
f192883305
weekly release 2.6dev
2013-06-14 13:18:50 +10:00
Marina Glancy
3bc90f93ee
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
2013-06-14 12:53:23 +10:00
Andrew Nicols
fd66d1de70
MDL-40165 Backup: Split out test classes into multiple files
2013-06-13 08:55:54 +01:00
Rossiani Wijaya
f2a41c5136
MDL-39369: Lesson module: change settype PARAM_TEXT to PARAM_NOTAGS
2013-06-13 15:34:18 +08:00
Rossiani Wijaya
a015bc030c
MDL-39369: Lesson module: fix setType() properly
2013-06-13 15:26:13 +08:00
Damyon Wiese
1fba9cf66a
MDL-37621 assign: Fix for DB error on update.
...
This properly handles the case when the teamsubmissiongroupingid is disabled.
2013-06-13 15:15:07 +08:00
Dan Poltawski
1f782c4181
MDL-39824: theme_bootstrap: initalise array before use
...
This causes warnings when no navigation items are returned.
Also fixed some bad whitespace.
2013-06-13 14:22:59 +08:00
Dan Poltawski
a151eb403e
Revert "MDL-39832 Files: Revert MDL-39688 commit, f111746140
"
...
This reverts commit 3960c00e3c
.
2013-06-13 13:56:11 +08:00
Dan Poltawski
db74804ff1
Revert "MDL-39832 Files: Fixed ETag format according with RFC2616."
...
This reverts commit 9ab37ae3e0
.
2013-06-13 13:56:09 +08:00
Damyon Wiese
7e815a6eac
MDL-37459 admin: Set the default setting flags on a new install.
...
Make sure the default flags for all settings are saved on a new install.
2013-06-13 15:20:52 +10:00
Russell Smith
d6e52b0061
MDL-21933 course: Allow users to search participants course permission
...
Capability checks are performed at the top of the page and do not need
to be completed again.
Search is an expected feature for users and it was confusion to only
appear after 3 pages. This has been changed to enable search when
there are more records than are visible on the screen. If users
are unable to use browser search, they will be able to use Moodle's
search.
2013-06-13 12:44:55 +10:00
Dan Poltawski
e3b472e82c
Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle
2013-06-13 10:15:25 +08:00
Damyon Wiese
54106942b3
MDL-37459 admin: Fix for error on updating a locked checkbox
...
Changed the way apply_admin_locked_flags gets the current value for the field.
The old way was plain wrong (looking at getValue from the quickform element).
2013-06-13 11:18:18 +10:00
AMOS bot
9a0d245145
Automatically generated installer lang files
2013-06-13 00:41:25 +00:00
Ruslan Kabalin
761670208a
MDL-38555 forms: Prevent same data submission multiple times.
...
This disables Submit button when the form has been submitted to
prevent consequent submissions before the page has been loaded.
2013-06-12 15:19:47 +01:00
Mary Evans
fb6bf33bf7
MDL-30312 User: Changed page layout from mydashboard to mypublic in user/profile.php
2013-06-12 13:29:45 +01:00
Dan Marsden
8a309823f0
MDL-38359: assign - prevent loss of associated marker
...
certain markers don't see the marker allocation column.
2013-06-12 21:29:39 +12:00
Dan Marsden
24835a1292
MDL-38359: assign - fix some issues with releasing grades
2013-06-12 21:16:12 +12:00
Dan Poltawski
19c1e0b80a
Merge branch 'master_MDL-39239' of git://github.com/danmarsden/moodle
2013-06-12 16:49:29 +08:00
Dan Poltawski
85937391e1
Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle
2013-06-12 16:47:38 +08:00
Dan Marsden
b6d1b761a4
MDL-38359: assign - remove some old debug code.
2013-06-12 20:18:07 +12:00
Dan Poltawski
3d5f0a66e9
Revert "MDL-39489 behat: Updating to 2.6 moodlehq/behat-extension tag"
...
Wasn't ready for the prime time
This reverts commit ca96789d77
.
2013-06-12 16:08:50 +08:00
Marina Glancy
8ea7d3a2db
Merge branch 'MDL-37621-master-fix2' of git://github.com/damyon/moodle
2013-06-12 17:22:22 +10:00
Marina Glancy
128e9315d6
Merge branch 'MDL-37459-master-fix2' of git://github.com/damyon/moodle
2013-06-12 16:53:49 +10:00
Damyon Wiese
c7cd8d9c84
MDL-37621 assign: Improvements to default settings.
...
Added a new adminsetting_configempty type so that module settings
which can have no sensible defaults can still be configured as advanced.
2013-06-12 14:20:02 +08:00
Damyon Wiese
de6a0a394b
MDL-37621 assign: Improvements to assignment default settings.
...
Remove locked flag from datetime settings.
Change requiresubmissionstatement to use the new admin flags instead of it's previous custom behaviour.
This means there is a language change:
AMOS BEGIN
CPY [requiresubmissionstatementassignment_help,mod_assign],[requiresubmissionstatement_help,mod_assign]
AMOS END
2013-06-12 14:19:52 +08:00
Damyon Wiese
c30371168f
MDL-37459 admin: Code improvements for admin defaults.
...
Split apply_admin_defaults_after_data so the defaults are set before
set_data is called.
Change function from private to protected.
Change check for if module for is an add or an update.
2013-06-12 14:10:55 +08:00
Dan Poltawski
bdce4a9cca
Merge branch 'MDL-39472-master' of git://github.com/sammarshallou/moodle
2013-06-12 13:56:39 +08:00
Damyon Wiese
fa358a83ad
MDL-37459 admin: Change the behaviour of locked admin settings.
...
Now the defaults for settings will never force changes to the module update
form, and settings will only be locked if their value matches the admin default.
2013-06-12 12:30:08 +08:00
Daniel Neis Araujo
3f213cd321
MDL-32253 - Adding link to forum discussion on text emails
2013-06-12 10:28:55 +08:00
Sam Hemelryk
c601027d8f
Revert "MDL-38555 forms: Prevent same data submission multiple times."
...
This reverts commit 9f2f313e9f
.
2013-06-12 14:22:01 +12:00
Damyon Wiese
459e3c88ca
MDL-37459 admin: Default styles for flags for admin settings
2013-06-12 10:06:06 +08:00
Dan Poltawski
1899145c50
Merge branch 'MDL-39773_b' of git://github.com/rwijaya/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-06-12 09:33:23 +08:00
Sam Hemelryk
44df0d9aaa
Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle
2013-06-12 11:36:40 +12:00
Sam Hemelryk
e1e6c0dd4c
Merge branch 'wip-MDL-39040-master' of git://github.com/abgreeve/moodle
2013-06-12 10:21:45 +12:00
Sam Hemelryk
aae402010b
Merge branch 'MDL-35666-master' of git://github.com/mouneyrac/moodle
2013-06-12 10:14:14 +12:00
Sam Hemelryk
6e49802071
MDL-39629 theme_formal_white: added missing pluginfile func
2013-06-12 09:58:55 +12:00
Sam Hemelryk
ac547b717a
Merge branch 'MDL-39629_master' of git://github.com/kordan/moodle
2013-06-12 09:48:56 +12:00
Dan Marsden
93c984a829
MDL-39239 SCORM: drop old imsrepository code - it doesn't work anyway.
2013-06-12 09:47:26 +12:00
Sam Hemelryk
ee4e6c04e2
Merge branch 'MDL-30320' of git://github.com/timhunt/moodle
2013-06-12 09:38:38 +12:00
Sam Hemelryk
5d24aff39f
Merge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle
2013-06-12 09:34:06 +12:00
Sam Hemelryk
18a1f186db
Merge branch 'MDL-39967-master' of git://github.com/danpoltawski/moodle
2013-06-12 09:08:55 +12:00
Sam Hemelryk
cc5468de0e
Merge branch 'MDL-39940-master' of git://github.com/danpoltawski/moodle
2013-06-12 09:07:01 +12:00
Sam Hemelryk
7b50002304
Merge branch 'MDL-39964-master' of git://github.com/danpoltawski/moodle
...
Conflicts:
lib/deprecatedlib.php
2013-06-12 09:04:22 +12:00
Sam Hemelryk
9439d0506c
Merge branch 'MDL-25901-master' of git://github.com/danpoltawski/moodle
2013-06-12 09:00:24 +12:00
Sam Hemelryk
9ce7b61e62
Merge branch 'w24_MDL-38109_m26_pluginlist' of git://github.com/skodak/moodle
2013-06-12 08:54:09 +12:00
Sam Hemelryk
ec18f333bd
Merge branch 'wip-MDL-39798_master' of git://github.com/gjb2048/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-06-12 08:51:59 +12:00
Sam Hemelryk
754fa10916
Merge branch 'wip-MDL-39820_master_2' of git://github.com/gjb2048/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-06-12 08:48:00 +12:00