platal.git
15 years agoAdds TODOs.
Stéphane Jacob [Sat, 11 Apr 2009 18:30:32 +0000 (20:30 +0200)]
Adds TODOs.

15 years agoFixes small issue in name.func.inc.php.
Stéphane Jacob [Sat, 11 Apr 2009 16:53:05 +0000 (18:53 +0200)]
Fixes small issue in name.func.inc.php.

15 years agoAdds address, phone and fax edition in entreprise administration.
Stéphane Jacob [Fri, 10 Apr 2009 00:01:22 +0000 (02:01 +0200)]
Adds address, phone and fax edition in entreprise administration.

15 years agoAdds address edition in entreprise validation.
Stéphane Jacob [Thu, 9 Apr 2009 23:18:00 +0000 (01:18 +0200)]
Adds address edition in entreprise validation.

15 years agoFixes changes in graduation year.
Stéphane Jacob [Sat, 11 Apr 2009 16:28:11 +0000 (18:28 +0200)]
Fixes changes in graduation year.

15 years agoRemoves AX synchronisation from profile.
Stéphane Jacob [Sat, 11 Apr 2009 15:53:40 +0000 (17:53 +0200)]
Removes AX synchronisation from profile.

15 years agoMoves addresses to the new table and tries to geocode them.
Stéphane Jacob [Tue, 7 Apr 2009 22:00:18 +0000 (00:00 +0200)]
Moves addresses to the new table and tries to geocode them.

15 years agoMerge commit 'origin/master' into fusionax
Vincent Zanotti [Sat, 11 Apr 2009 01:19:01 +0000 (03:19 +0200)]
Merge commit 'origin/master' into fusionax

15 years agoAdds a safeguard in User::getLogin to prevent a null/empty login from returning a...
Vincent Zanotti [Sat, 11 Apr 2009 01:17:34 +0000 (03:17 +0200)]
Adds a safeguard in User::getLogin to prevent a null/empty login from returning a valid but random profile.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoMerge commit 'origin/master' into fusionax
Vincent Zanotti [Fri, 10 Apr 2009 17:00:59 +0000 (19:00 +0200)]
Merge commit 'origin/master' into fusionax

Conflicts:
modules/email.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoImplements administrator actions on Google Apps accounts (password synchronization...
Vincent Zanotti [Fri, 10 Apr 2009 15:28:41 +0000 (17:28 +0200)]
Implements administrator actions on Google Apps accounts (password synchronization, status change).

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoImproves the user GoogleApps page: slightly better layout, shorter page, and no more...
Vincent Zanotti [Fri, 10 Apr 2009 15:27:49 +0000 (17:27 +0200)]
Improves the user GoogleApps page: slightly better layout, shorter page, and no more GET-based actions.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoFixes an "undefined variable" error in modules/email.php.
Vincent Zanotti [Fri, 10 Apr 2009 12:19:08 +0000 (14:19 +0200)]
Fixes an "undefined variable" error in modules/email.php.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoMerge commit 'origin/platal-0.10.0'
Vincent Zanotti [Fri, 10 Apr 2009 00:07:11 +0000 (02:07 +0200)]
Merge commit 'origin/platal-0.10.0'

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoProperly handles the case where an admin search for a good looking IP-address that...
Vincent Zanotti [Wed, 8 Apr 2009 12:14:05 +0000 (14:14 +0200)]
Properly handles the case where an admin search for a good looking IP-address that can't in facts be translated to its 32bits representation.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoFixes the hruid generation when mass-importing a new promotion.
Vincent Zanotti [Fri, 10 Apr 2009 00:02:55 +0000 (02:02 +0200)]
Fixes the hruid generation when mass-importing a new promotion.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoProperly handles the case where an admin search for a good looking IP-address that...
Vincent Zanotti [Wed, 8 Apr 2009 12:14:05 +0000 (14:14 +0200)]
Properly handles the case where an admin search for a good looking IP-address that can't in facts be translated to its 32bits representation.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoForgotten file...
Aymeric Augustin [Sun, 5 Apr 2009 19:13:48 +0000 (21:13 +0200)]
Forgotten file...

15 years agoSave each OpenId transaction in an unique session variable and pass its id in the...
Aymeric Augustin [Sun, 5 Apr 2009 19:09:58 +0000 (21:09 +0200)]
Save each OpenId transaction in an unique session variable and pass its id in the URL.

15 years agoMake the OpenId login work even if the user is not logged in on Polytechnique.org.
Aymeric Augustin [Sun, 5 Apr 2009 18:54:48 +0000 (20:54 +0200)]
Make the OpenId login work even if the user is not logged in on Polytechnique.org.
TODO: do not pass all parameters in the URL, it is twice longer than IE's limit.

15 years agoMerge branch 'platal-0.10.0'
Vincent Zanotti [Sun, 5 Apr 2009 09:09:10 +0000 (11:09 +0200)]
Merge branch 'platal-0.10.0'

15 years agoFinally re-adds jquery.autocomplete.js to the tree, as our source is 403-ing us....
Vincent Zanotti [Sun, 5 Apr 2009 09:07:53 +0000 (11:07 +0200)]
Finally re-adds jquery.autocomplete.js to the tree, as our source is 403-ing us. The reason is that the autocomplete plugin is now official; we can't use it directly though, as our code is not yet compatible with this new updated version.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoFixes a typo and a grammar mistake in comments added in the previous commit.
Vincent Zanotti [Sat, 4 Apr 2009 13:11:52 +0000 (15:11 +0200)]
Fixes a typo and a grammar mistake in comments added in the previous commit.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoPrevents password hashs from being broadcasted by email (Closes #965).
Vincent Zanotti [Sat, 4 Apr 2009 10:13:49 +0000 (12:13 +0200)]
Prevents password hashs from being broadcasted by email (Closes #965).

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoAdds entreprises edition interface.
Stéphane Jacob [Mon, 30 Mar 2009 20:10:07 +0000 (22:10 +0200)]
Adds entreprises edition interface.

15 years agoFixes mentoring.
Stéphane Jacob [Sun, 29 Mar 2009 17:11:43 +0000 (19:11 +0200)]
Fixes mentoring.

15 years agoGets rid of functions.
Stéphane Jacob [Sun, 29 Mar 2009 16:02:16 +0000 (18:02 +0200)]
Gets rid of functions.

15 years agoFixes small mistakes.
Stéphane Jacob [Sun, 29 Mar 2009 14:33:47 +0000 (16:33 +0200)]
Fixes small mistakes.

15 years agoAdds admin page for sectors.
Stéphane Jacob [Sat, 28 Mar 2009 18:47:31 +0000 (19:47 +0100)]
Adds admin page for sectors.

15 years agoDisplays alternate sector names in profile edition.
Stéphane Jacob [Sat, 28 Mar 2009 16:46:40 +0000 (17:46 +0100)]
Displays alternate sector names in profile edition.

15 years agoFixes some sectors related issues.
Stéphane Jacob [Sat, 28 Mar 2009 15:26:39 +0000 (16:26 +0100)]
Fixes some sectors related issues.

15 years agoPolishes sectors list creation, adds alternative name of sectors.
Stéphane Jacob [Sat, 28 Mar 2009 14:42:51 +0000 (15:42 +0100)]
Polishes sectors list creation, adds alternative name of sectors.

15 years agoMerge commit 'origin/master' into fusionax
Stéphane Jacob [Mon, 23 Mar 2009 21:05:05 +0000 (22:05 +0100)]
Merge commit 'origin/master' into fusionax

15 years agoFixes the layout of the password box for cookie-authenticated users (the box was...
Vincent Zanotti [Mon, 23 Mar 2009 14:53:06 +0000 (15:53 +0100)]
Fixes the layout of the password box for cookie-authenticated users (the box was too narrow, and all three columns were overflowing).
An alternative option would be to move the "Submit" button to the next line.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoAvoids disabling the Google Apps account when a user account is disabled.
Vincent Zanotti [Mon, 23 Mar 2009 13:47:28 +0000 (14:47 +0100)]
Avoids disabling the Google Apps account when a user account is disabled.
This matches the behavior of email forwarding (requested by Gadz.org).

Also adds a reminder to the admin, so that she doesn't forget to properly remove the forwardings when needed.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoRemoves confusing reset button.
Stéphane Jacob [Sun, 22 Mar 2009 15:22:37 +0000 (16:22 +0100)]
Removes confusing reset button.

15 years agoMerge branch 'platal-0.10.0'
Vincent Zanotti [Thu, 19 Mar 2009 00:05:44 +0000 (01:05 +0100)]
Merge branch 'platal-0.10.0'

15 years agoFixes notification email on removal of "nom d'usage" -- the email was sent to the...
Vincent Zanotti [Thu, 19 Mar 2009 00:04:12 +0000 (01:04 +0100)]
Fixes notification email on removal of "nom d'usage" -- the email was sent to the former bestalias email address.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
15 years agoFix condition to build submodules.
Florent Bruneau [Tue, 17 Mar 2009 22:25:53 +0000 (23:25 +0100)]
Fix condition to build submodules.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoTmp job functions.
Stéphane Jacob [Sat, 7 Mar 2009 11:18:55 +0000 (12:18 +0100)]
Tmp job functions.

15 years agoUpdates university list.
Stéphane Jacob [Tue, 17 Mar 2009 17:13:15 +0000 (18:13 +0100)]
Updates university list.

15 years agoChanges corps options to something more politicaly correct.
Stéphane Jacob [Tue, 17 Mar 2009 16:55:58 +0000 (17:55 +0100)]
Changes corps options to something more politicaly correct.

15 years agoAdds twitter icon.
Stéphane Jacob [Sun, 8 Mar 2009 23:15:53 +0000 (00:15 +0100)]
Adds twitter icon.

15 years agoFixes sector autocomplete on job edition interface.
Stéphane Jacob [Sun, 8 Mar 2009 21:48:26 +0000 (22:48 +0100)]
Fixes sector autocomplete on job edition interface.

15 years agoFixes job deletion.
Stéphane Jacob [Sun, 8 Mar 2009 18:35:09 +0000 (19:35 +0100)]
Fixes job deletion.

15 years agoAdds address for entreprise.
Stéphane Jacob [Sun, 8 Mar 2009 17:39:14 +0000 (18:39 +0100)]
Adds address for entreprise.

15 years agoAdds job address to the job interface, makes more uniform address related names.
Stéphane Jacob [Sun, 8 Mar 2009 15:58:54 +0000 (16:58 +0100)]
Adds job address to the job interface, makes more uniform address related names.

15 years agoImproves job edition and email combobox display.
Stéphane Jacob [Sat, 7 Mar 2009 12:20:22 +0000 (13:20 +0100)]
Improves job edition and email combobox display.

15 years agoFixes addresses validation when the user chooses a geocoded address.
Stéphane Jacob [Thu, 5 Mar 2009 20:16:45 +0000 (21:16 +0100)]
Fixes addresses validation when the user chooses a geocoded address.

15 years agoHelps ISO 3166-1 non-countries to be properly geocoded.
Stéphane Jacob [Thu, 5 Mar 2009 08:14:11 +0000 (09:14 +0100)]
Helps ISO 3166-1 non-countries to be properly geocoded.

15 years agoSwitches to a 3-state geocoding: the user can choose to keep the geocoded properties...
Stéphane Jacob [Wed, 4 Mar 2009 15:40:44 +0000 (16:40 +0100)]
Switches to a 3-state geocoding: the user can choose to keep the geocoded properties with his text.

15 years agoMerge commit 'origin/master' into fusionax
Florent Bruneau [Wed, 4 Mar 2009 22:06:53 +0000 (23:06 +0100)]
Merge commit 'origin/master' into fusionax

15 years agoFix whitespace at the end of the 'Send email to group members' form's textarea.
Olivier Le Floch [Wed, 4 Mar 2009 00:45:57 +0000 (01:45 +0100)]
Fix whitespace at the end of the 'Send email to group members' form's textarea.

Signed-off-by: Olivier Le Floch <olivier.le-floch@polytechnique.org>
15 years agoShorten the quick search fields, needs to be weighed against the current qucik search...
Olivier Le Floch [Wed, 4 Mar 2009 00:27:05 +0000 (01:27 +0100)]
Shorten the quick search fields, needs to be weighed against the current qucik search solution which does not expose a button. Next solution will probably display a more complete quick search form when the quicksearch field is selected.

Signed-off-by: Olivier Le Floch <olivier.le-floch@polytechnique.org>
15 years agoThere is no planisphere anymore in Xnet.
Stéphane Jacob [Wed, 4 Mar 2009 00:34:24 +0000 (01:34 +0100)]
There is no planisphere anymore in Xnet.

15 years agoFully switches profile.js to jquery.
Stéphane Jacob [Sun, 1 Mar 2009 22:52:47 +0000 (23:52 +0100)]
Fully switches profile.js to jquery.

15 years agoFixes education degree edition.
Stéphane Jacob [Mon, 2 Mar 2009 22:06:51 +0000 (23:06 +0100)]
Fixes education degree edition.

15 years agoTmp jobs.
Stéphane Jacob [Sun, 1 Mar 2009 22:55:36 +0000 (23:55 +0100)]
Tmp jobs.

15 years agoFixes absence of PostalText related error.
Stéphane Jacob [Sun, 1 Mar 2009 12:26:41 +0000 (13:26 +0100)]
Fixes absence of PostalText related error.

15 years agoMinor typos.
Stéphane Jacob [Sun, 1 Mar 2009 01:28:49 +0000 (02:28 +0100)]
Minor typos.

15 years agoWe accord correctly the verb when the mail is to a women.
João Pedro Athayde Marcondes de André [Wed, 25 Feb 2009 17:56:45 +0000 (18:56 +0100)]
We accord correctly the verb when the mail is to a women.

15 years ago****** pmwiki.
Florent Bruneau [Mon, 23 Feb 2009 12:36:19 +0000 (13:36 +0100)]
****** pmwiki.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoMerge commit 'origin/master' into fusionax
Florent Bruneau [Sun, 22 Feb 2009 14:02:47 +0000 (15:02 +0100)]
Merge commit 'origin/master' into fusionax

15 years agoUse last version of the core.
Florent Bruneau [Sun, 22 Feb 2009 14:00:49 +0000 (15:00 +0100)]
Use last version of the core.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Sun, 22 Feb 2009 14:00:16 +0000 (15:00 +0100)]
Merge commit 'origin/platal-0.10.0'

15 years agoFix core version.
Florent Bruneau [Sat, 21 Feb 2009 21:05:47 +0000 (22:05 +0100)]
Fix core version.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoAdds a postal formated address to the addresses data.
Stéphane Jacob [Sat, 21 Feb 2009 16:03:38 +0000 (17:03 +0100)]
Adds a postal formated address to the addresses data.

15 years agoAvoid null gids.
Florent Bruneau [Sat, 21 Feb 2009 08:23:20 +0000 (09:23 +0100)]
Avoid null gids.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoGets rid of all references to the old geoloc_* and adresses tables.
Stéphane Jacob [Thu, 19 Feb 2009 12:28:50 +0000 (13:28 +0100)]
Gets rid of all references to the old geoloc_* and adresses tables.

15 years agoAdds picture for the Ordine al Merito della Repubblica italiana.
Stéphane Jacob [Fri, 20 Feb 2009 22:00:53 +0000 (23:00 +0100)]
Adds picture for the Ordine al Merito della Repubblica italiana.

15 years agoOoops (cf 20c5c7).
Stéphane Jacob [Wed, 21 Jan 2009 20:40:41 +0000 (21:40 +0100)]
Ooops (cf 20c5c7).

15 years agoFinishes to move functions from geoloc.inc.php to geocoding.inc.php,
Stéphane Jacob [Wed, 18 Feb 2009 20:45:48 +0000 (21:45 +0100)]
Finishes to move functions from geoloc.inc.php to geocoding.inc.php,
adapts them to the new geocoding, trashes the planisphere.

15 years agoNon geocoded addresses could not be saved.
Stéphane Jacob [Wed, 18 Feb 2009 21:23:14 +0000 (22:23 +0100)]
Non geocoded addresses could not be saved.

15 years agoUpdates userset.inc.php for the new profile_address and geoloc_countries tables.
Stéphane Jacob [Wed, 18 Feb 2009 12:05:22 +0000 (13:05 +0100)]
Updates userset.inc.php for the new profile_address and geoloc_countries tables.

15 years agoUpdates paypal and manageurs interaction files to use with the new profile_address...
Stéphane Jacob [Tue, 17 Feb 2009 14:54:14 +0000 (15:54 +0100)]
Updates paypal and manageurs interaction files to use with the new profile_address table.

15 years agoMerge branch 'platal-0.10.0'
Vincent Zanotti [Wed, 18 Feb 2009 12:40:04 +0000 (13:40 +0100)]
Merge branch 'platal-0.10.0'

15 years agoAdds a missing XSRF token on Xnet's directory synchronization page.
Vincent Zanotti [Wed, 18 Feb 2009 12:38:48 +0000 (13:38 +0100)]
Adds a missing XSRF token on Xnet's directory synchronization page.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
15 years agoAdds ME and RS flags accordingly to the update of the ISO 3166-1 code, adds EU flag.
Stéphane Jacob [Tue, 17 Feb 2009 22:17:37 +0000 (23:17 +0100)]
Adds ME and RS flags accordingly to the update of the ISO 3166-1 code, adds EU flag.

15 years agoUpdates country table.
Stéphane Jacob [Tue, 17 Feb 2009 00:20:32 +0000 (01:20 +0100)]
Updates country table.

15 years agoMerge commit 'origin/master' into fusionax
Stéphane Jacob [Mon, 16 Feb 2009 00:59:04 +0000 (01:59 +0100)]
Merge commit 'origin/master' into fusionax

15 years agoImproves code for geocoding thanks to Vincent, fixes issue with street numbers when...
Stéphane Jacob [Sun, 15 Feb 2009 17:47:29 +0000 (18:47 +0100)]
Improves code for geocoding thanks to Vincent, fixes issue with street numbers when only the street name is geocoded.

15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Sun, 15 Feb 2009 13:46:21 +0000 (14:46 +0100)]
Merge commit 'origin/platal-0.10.0'

15 years agoFix a SQL injection vulnerability on a public page o_O.
Florent Bruneau [Sun, 15 Feb 2009 09:30:45 +0000 (10:30 +0100)]
Fix a SQL injection vulnerability on a public page o_O.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFixes geolocalization.
Stéphane Jacob [Sun, 15 Feb 2009 02:32:31 +0000 (03:32 +0100)]
Fixes geolocalization.

15 years agoSwitches geolocalization to Google Maps.
Stéphane Jacob [Fri, 13 Feb 2009 00:56:24 +0000 (01:56 +0100)]
Switches geolocalization to Google Maps.

15 years agoBetter organisation in profile.js.
Stéphane Jacob [Thu, 12 Feb 2009 13:25:02 +0000 (14:25 +0100)]
Better organisation in profile.js.

15 years agoMerge commit 'origin/master' into fusionax
Florent Bruneau [Sat, 7 Feb 2009 00:21:18 +0000 (01:21 +0100)]
Merge commit 'origin/master' into fusionax

15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Sat, 7 Feb 2009 00:20:52 +0000 (01:20 +0100)]
Merge commit 'origin/platal-0.10.0'

15 years agoResurrect events/rss.tpl and xnetgrp/announce-rss.tpl that were lost in a
Florent Bruneau [Sat, 7 Feb 2009 00:18:13 +0000 (01:18 +0100)]
Resurrect events/rss.tpl and xnetgrp/announce-rss.tpl that were lost in a
bad conflict resolution some times ago.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoMerge commit 'origin/master' into fusionax
Florent Bruneau [Sun, 1 Feb 2009 13:28:20 +0000 (14:28 +0100)]
Merge commit 'origin/master' into fusionax

Conflicts:

core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoUse last version of the core-lib.
Florent Bruneau [Sun, 1 Feb 2009 13:27:02 +0000 (14:27 +0100)]
Use last version of the core-lib.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Sun, 1 Feb 2009 13:26:08 +0000 (14:26 +0100)]
Merge commit 'origin/platal-0.10.0'

15 years agoFix vcard for users that don't have a pro address.
Olivier Le Floch [Sat, 31 Jan 2009 12:46:15 +0000 (13:46 +0100)]
Fix vcard for users that don't have a pro address.

Signed-off-by: Olivier Le Floch <olivier.le-floch@polytechnique.org>
15 years agoClarify the navigation links between the simple and advanced search forms
Olivier Le Floch [Sat, 31 Jan 2009 17:23:33 +0000 (18:23 +0100)]
Clarify the navigation links between the simple and advanced search forms

Signed-off-by: Olivier Le Floch <olivier.le-floch@polytechnique.org>
15 years agoRemove advice to Netscape 4 users : if they're still using Netscape, they probably...
Olivier Le Floch [Sat, 31 Jan 2009 13:41:15 +0000 (14:41 +0100)]
Remove advice to Netscape 4 users : if they're still using Netscape, they probably won't update to anything newer anyway

Signed-off-by: Olivier Le Floch <olivier.le-floch@polytechnique.org>
15 years agoAdd 'Search' button to the quick search field
Olivier Le Floch [Sat, 31 Jan 2009 13:38:28 +0000 (14:38 +0100)]
Add 'Search' button to the quick search field
This will help less web-savy users use this search field.

Signed-off-by: Olivier Le Floch <olivier.le-floch@polytechnique.org>
15 years agoFix HTML tag inclusion : <ul> is not allowed inside <p>
Olivier Le Floch [Sat, 31 Jan 2009 12:59:57 +0000 (13:59 +0100)]
Fix HTML tag inclusion : <ul> is not allowed inside <p>

Signed-off-by: Olivier Le Floch <olivier.le-floch@polytechnique.org>
15 years agoFix vcard for users that don't have a pro address.
Olivier Le Floch [Sat, 31 Jan 2009 12:46:15 +0000 (13:46 +0100)]
Fix vcard for users that don't have a pro address.

Signed-off-by: Olivier Le Floch <olivier.le-floch@polytechnique.org>
15 years agoUpdate core.
Florent Bruneau [Sun, 25 Jan 2009 21:17:02 +0000 (22:17 +0100)]
Update core.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoMerge commit 'origin/master' into fusionax
Florent Bruneau [Sun, 25 Jan 2009 21:15:56 +0000 (22:15 +0100)]
Merge commit 'origin/master' into fusionax