Bugfixes in conflict resolution #23
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ring 'make import'" This reverts commit dbef487.
…for these to FALSE to prevent conflicts
…ic submission interface
…king 1hr set in DB as default
…e.email in case of troubles
…at purpose they serve
Reverting rails version to 2.3.5 as later versions generate many deprecation warnings
xCal is a direct port of iCal to XML. iCal only allows one of dtend and duration to be specified. The non-normative relax-ng schema in the relevant rfc reflects this. I removed the duration and not the dtend, as parsers have to support the datetime format anyways and there are parsers without support for the duration format. xCal [rfc 6321](https://tools.ietf.org/html/rfc6321#page-32): ``` (property-dtend | property-duration)? & ``` iCal [rfc 5545](https://tools.ietf.org/html/rfc5545#page52): ``` ; Either 'dtend' or 'duration' MAY appear in ; a 'eventprop', but 'dtend' and 'duration' ; MUST NOT occur in the same 'eventprop'. ; dtend / duration / ```
There are iCal parsers without support for duration values. As dtend has the same format as dtstart, parsers which don't support it have no chance anyways.
Corrections to formats of calendar exports for standards compliance
remove packages which should be installed as gems, update some instructions
…el resources fields
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These are some bug fixes for the conflict detection, especially with relation to one person being at two events at the same time.