Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kronolith remote organizer #118

Closed
wants to merge 28 commits into from
Closed

Kronolith remote organizer #118

wants to merge 28 commits into from

Conversation

ralflang
Copy link
Member

Addresses https://bugs.horde.org/ticket/3965 [#3965] Track the Organizer of events

Enhances Kronolith to handle external organizers. This is mostly useful to prevent email mess with external event invitations in a horde+thunderbird scenario.

Please review

@@ -64,6 +64,13 @@
protected $_creator = null;

/**
* The CAL-ADDRESS of the organizer of the event, if known.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The email address...

@yunosh
Copy link
Member

yunosh commented Mar 3, 2015

Can you please rebase. This merge doesn't resolve anymore.

…organizer

Conflicts:
	kronolith/docs/CHANGES
	kronolith/lib/Driver/Sql.php
	kronolith/package.xml
@ralflang
Copy link
Member Author

ralflang commented Mar 4, 2015

Rebasing didn't do - I manually merged the conflicts (Removing the table config from the driver and some package.xml/CHANGES foo).

@yunosh
Copy link
Member

yunosh commented Mar 4, 2015

Parse error: syntax error, unexpected '<<' (T_SL) in /home/jan/horde-develop/kronolith/lib/Driver/Sql.php on line 502

@ralflang
Copy link
Member Author

Closing this PR - I will open a new one against the rebased branch with cleaned history. This will be missing the packages.xml and CHANGES entries. I will readd them once you are OK with it.

@ralflang ralflang closed this Mar 10, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants