Dan Poltawski
d4256630e7
Merge branch '40976-26' of git://github.com/samhemelryk/moodle
2013-10-22 12:14:41 +02:00
Dan Poltawski
3481222e57
MDL-42459 upgrade: fix upgrade step ordering
...
Also incremented version to be safe
2013-10-22 12:14:40 +02:00
Eloy Lafuente (stronk7)
bf928b2933
Merge branch 'MDL-42459-master' of git://github.com/damyon/moodle
...
Conflicts:
version.php
2013-10-22 12:14:29 +02:00
Dan Poltawski
a8261e2830
Merge branch 'MDL-29441-master' of git://github.com/andrewnicols/moodle
2013-10-22 12:11:48 +02:00
Dan Poltawski
0c7c5e767c
Merge branch 'MDL-42115-master' of git://github.com/jamiepratt/moodle
2013-10-22 12:11:45 +02:00
Dan Poltawski
616e57d926
Merge branch 'MDL-40045_master' of https://github.com/markn86/moodle
2013-10-22 12:11:45 +02:00
Marina Glancy
a90e023b4a
Merge branch 'MDL-26170_rss' of https://github.com/andyjdavis/moodle
2013-10-22 12:11:44 +02:00
Dan Poltawski
59dca9505b
Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle
2013-10-22 12:11:42 +02:00
Dan Poltawski
181b0b3c3e
Merge branch 'MDL-42117-master' of git://github.com/andrewnicols/moodle
2013-10-22 12:11:42 +02:00
Damyon Wiese
775a32c9b8
MDL-42459 Atto: Bye bye - see you in the plugins db!
2013-10-22 12:01:56 +08:00
Andrew Davis
54eb02a45c
MDL-26170 RSS: fixed RSS cache clearing when items are deleted
2013-10-22 10:29:05 +07:00
Andrew Nicols
d5367fb566
MDL-42117 JavaScript: Ensure that new activities are fully set up
...
We don't need to set up anything specifically for toolboxes any more, but
other third-party JS may require additional setup following new module
creation.
2013-10-22 11:26:44 +08:00
Andrew Nicols
b676db838b
MDL-42117 JavaScript: Don't rely on node data for course toolboxes
...
The YUI versions of getData and setData do not store the data in the DOM,
but in an instance of YUI. If you make modifications in one instance, but
apply them in another, then the data values are not accessible between
these two instances.
Additionally, there's no benefit to storing the instances on
initialisation - if anything, it increases the load overhead.
This change moves toolboxes to calculating their ancestors on click in the
same way it was done in the initialiser.
2013-10-22 11:26:36 +08:00
Rajesh Taneja
1c4d953cef
MDL-31405 Assignment: removed type in time shift reset status
...
Assignment reset shifts time for all assignments and not specific to
assignment type, hence removed type string from reset status
2013-10-22 11:10:32 +08:00
Marina Glancy
8f9560091f
Merge branch 'MDL-42239-master' of git://github.com/ankitagarwal/moodle
2013-10-22 14:08:12 +11:00
Ankit Agarwal
9c7f855b49
MDL-42239 calendar: Fix missing ids issue with mouseover panels
2013-10-22 10:39:32 +08:00
Dan Poltawski
b750557ba0
Merge branch 'MDL-42201_master' of https://github.com/markn86/moodle
2013-10-22 10:25:44 +08:00
Ankit Agarwal
0859a08d37
MDL-42173 administration: Fix alternate name warnings during registration
2013-10-22 10:03:29 +08:00
Marina Glancy
83a3e35e56
Merge branch 'wip-MDL-42177-master-three' of git://github.com/abgreeve/moodle
2013-10-22 09:48:57 +11:00
Adrian Greeve
0c76aa984c
MDL-42177 libraries: Unit tests for new functions that deal with user name fields.
...
functions with unit tests: get_required_user_name_fields, get_enabled_user_name_fields,
get_disabled_user_name_fields.
2013-10-21 14:15:15 +08:00
Adrian Greeve
1cc3a9aecc
MDL-42177 libraries: Additional checking of the fullnamedisplay language string.
...
If the language string is missing firstname or lastname, then when displaying the
user edit form it defaults to 'firstname lastname'
Previous logic has been moved out to new functions with unit tests.
2013-10-21 14:15:15 +08:00
Dan Poltawski
9c5ab08e5a
Merge branch 'MDL-34209-master' of git://github.com/andrewnicols/moodle
2013-10-21 13:58:14 +08:00
Jody Steele
add50b5ab0
MDL-38628 mod_assign: Allow a user to specify "No Grade" when grading an assignment submission
2013-10-21 16:47:05 +11:00
Marina Glancy
e4ffd3dc7b
Merge branch 'w43_MDL-42386_m26_etag' of https://github.com/skodak/moodle
2013-10-21 15:58:51 +11:00
Mark Nelson
e58c291cbb
MDL-40045 login: removed add_to_log call when a user updates their password
...
This add_to_log call is not being replaced by a user_updated event as the
call to $userauth->user_update_password should (and does in the case of
manual authentication - see MDL-41170) do this already when the password
is changed in the user table. If the authentication plugin is changing
the password externally then there is no need to call the user_updated
event as this should only be called whenever any update is made on the
user table.
2013-10-21 11:53:31 +08:00
Mark Nelson
f2f694f399
MDL-40045 user: replaced add_to_log call when the user list is viewed with an event
2013-10-21 11:53:31 +08:00
Mark Nelson
c76318d338
MDL-40045 user: replaced add_to_log call when a user profile is viewed with an event
2013-10-21 11:53:31 +08:00
Mark Nelson
c8974473d0
MDL-40045 auth: introduced PHPUnit test to ensure logging in via LDAP triggers an event
2013-10-21 11:53:31 +08:00
Mark Nelson
5991cabfd7
MDL-40045 auth: removed unnecessary add_to_log calls
...
Both LDAP and Shibboleth call complete_user_login which triggers
a user_loggedin event that handles the legacy call to add_to_log.
2013-10-21 11:53:30 +08:00
Mark Nelson
70f210c04f
MDL-42201 backup: introduced new automatic backup state
2013-10-21 11:51:12 +08:00
Dan Poltawski
2d0316d60d
Merge branch 'MDL-26244_url' of https://github.com/andyjdavis/moodle
2013-10-21 11:24:51 +08:00
Dan Poltawski
f381eede51
Merge branch 'MDL-42408_master' of https://github.com/dmonllao/moodle
2013-10-21 11:15:21 +08:00
David Monllao
a0e89a8fe3
MDL-42408 behat: Setting the site summary
2013-10-21 11:09:39 +08:00
Dan Poltawski
fb032ccb3f
Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle
...
Conflicts:
lib/upgrade.txt
mod/upgrade.txt
2013-10-21 10:57:44 +08:00
Andrew Davis
fa4fb78642
MDL-26244 mod_date:added some logic show or hide the file picker button based on repository availability
2013-10-21 08:49:38 +07:00
Dan Poltawski
8173f4cf01
Merge branch 'w43_MDL-42438_m26_yuicss' of https://github.com/skodak/moodle
2013-10-21 08:56:46 +08:00
Petr Škoda
7d26038d47
MDL-42438 load missing CSS for our simple YUI rollup
2013-10-19 21:04:26 +02:00
Petr Škoda
9cc5f32b22
MDL-42386 fix invalid etag comparison
...
Credit goes to Eloy Lafuente, thanks!
2013-10-18 14:48:40 +02:00
Dan Poltawski
4e47920f08
Moodle release 2.6beta
v2.6.0-beta
2013-10-18 16:21:45 +08:00
Dan Poltawski
2a3129b322
NOBUG: Fixed file access permissions
2013-10-18 16:16:18 +08:00
Dan Poltawski
8982470452
Merge branch 'install_master' of git://git.moodle.org/moodle-install
2013-10-18 16:16:11 +08:00
Dan Poltawski
c68bf34f83
Merge branch 'MDL-42411-master' of git://github.com/damyon/moodle
2013-10-17 16:29:05 +08:00
Damyon Wiese
5d5c4c0b73
MDL-43411 Backup: Fix restore from 1.9
...
The restore progress bars introduced a bug when restoring Moodle 1.9 backups.
build_plan needs to be surrounded with start_progress/end_progress with the mode
set to indeterminite or it throws coding errors.
2013-10-17 15:54:24 +08:00
Sam Hemelryk
f5593410af
MDL-40976 actionmenu: toggle button second click now hides
2013-10-17 09:14:29 +13:00
Eloy Lafuente (stronk7)
059d7bd275
Merge branch 'MDL-42380-master' of git://github.com/damyon/moodle
2013-10-16 15:19:36 +02:00
Jamie Pratt
f16ed06c2c
MDL-42115 exception when there are no questions
2013-10-16 19:40:04 +07:00
Damyon Wiese
2288969269
Merge branch 'MDL-42065_master' of https://github.com/sam-moodle/moodle
2013-10-16 15:45:40 +08:00
Petr Škoda
b2858b916a
MDL-42148 new overview of 3rd party libraries
...
Includes:
* each plugin has own thirdpartylibs.xml file
* added missing libraries
* fixed existing library infos
* new Site administration / Development / Third party libraries page
2013-10-16 14:48:29 +08:00
Petr Škoda
80dc19699c
MDL-42224 fix log output regression in auth test
2013-10-16 07:25:28 +02:00
Damyon Wiese
6de4beb8dd
MDL-42380 Course unit tests: Remove assert causing oracle unit tests to die
2013-10-16 13:20:33 +08:00