2 Commits

Author	SHA1	Message	Date
Ralf Becker	439d23490d	merged contacts_and_resources branch again with HEAD ... all further development will be in HEAD now everyone using the contacts_and_resources branch, update again to HEAD with: cvs update -dPA calendar	2005-11-08 23:15:14 +00:00
Ralf Becker	c7c6404500	next step: ... - view & edit is now integrated in the views - view has now buttons to edit, edit-series, copy, delete and delete-series - add: participants/resources can now be set via the url - conflict check is coded, but need testing and a conflict display	2005-06-14 21:54:17 +00:00