Diffusion roundcubemail-plugins-kolab e52bc0a1582e

Merge branch 'master' into dev/elastic
e52bc0a1582e
Actions

Description

Merge branch 'master' into dev/elastic

Conflicts:
plugins/calendar/calendar_ui.js

Details

Provenance

machniak	Authored on Mar 16 2018, 8:25 AM
mollekopf	Pushed on Aug 22 2023, 5:55 AM

Parents

R14:b96508f0211e: Calendar: Removed classic skin support
R14:77aa438b51b7: Fix unstoppable "Loading..." message on events export

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

77aa438b51b7 Fix unstoppable "Loading..." message on events export
Author
machniak
Browse Repository
No Builds
No Audits
239783c3dd57 T2313: Prevent from PHP fatal errors caused by double timezone spec. in…
Author
machniak
Browse Repository
No Builds
No Audits
9483a0b13c54 Code indentation fix
Author
machniak
Browse Repository
No Builds
No Audits
c6e0395dd9ae We accept iTip replies with older SEQUENCE but no significant changes…
Author
machniak
Browse Repository
No Builds
No Audits
a689f3dce632 Support unicode characters in UIDs on MySQL (Bifrost#T75336)
Author
machniak
Browse Repository
No Builds
No Audits

Changes (9)

Path

Size

plugins/

calendar/

calendar.php

calendar_ui.js

libcalendaring/

lib/

libcalendaring_itip.php

libkolab/

SQL/

mysql.initial.sql

mysql/

	2018021300.sql
	2017071900.sql

oracle.initial.sql

sqlite.initial.sql

	libkolab/			SQL/
	calendar/	drivers/	database/	SQL/

	oracle/
	mysql/

	2018021300.sql
	2013011000.sql

	sqlite/
	mysql/

	2018021300.sql
	2013011000.sql

R14:e52bc0a1582e

View Options

plugins/calendar/calendar.php

View Options

plugins/calendar/calendar_ui.js

View Options

plugins/libcalendaring/lib/libcalendaring_itip.php

View Options

plugins/libkolab/SQL/mysql.initial.sql

View Options

plugins/libkolab/SQL/mysql/2018021300.sql

View Options

plugins/libkolab/SQL/oracle.initial.sql

View Options

plugins/libkolab/SQL/oracle/2018021300.sql

View Options

plugins/libkolab/SQL/sqlite.initial.sql

View Options

plugins/libkolab/SQL/sqlite/2018021300.sql

Merge branch 'master' into dev/elastice52bc0a1582eActions

Description

Details

Event Timeline

Merged Changes

Changes (9)

R14:e52bc0a1582e

plugins/calendar/calendar.php

plugins/calendar/calendar_ui.js

plugins/libcalendaring/lib/libcalendaring_itip.php

plugins/libkolab/SQL/mysql.initial.sql

plugins/libkolab/SQL/mysql/2018021300.sql

plugins/libkolab/SQL/oracle.initial.sql

plugins/libkolab/SQL/oracle/2018021300.sql

plugins/libkolab/SQL/sqlite.initial.sql

plugins/libkolab/SQL/sqlite/2018021300.sql

Merge branch 'master' into dev/elastic
e52bc0a1582e
Actions