Mikael Nordfeldth 95d415257a Merge branch 'nightly' into singpolyma/gnu-social-events-saveObjectFromActivity ...

Conflicts:
	plugins/Event/EventPlugin.php
	plugins/Event/classes/RSVP.php

I just fixed 'em with magic!

2016-01-03 13:08:34 +01:00

..

actions

RSVPs refer to Happening (event) by URI instead of ID now

2015-12-31 19:23:05 +01:00

classes

Merge branch 'nightly' into singpolyma/gnu-social-events-saveObjectFromActivity

2016-01-03 13:08:34 +01:00

css

Event upgraded to microformats2

2014-06-23 14:20:06 +02:00

forms

HTML5 required attribute for some input forms

2014-04-06 11:27:41 +02:00

js

Event upgraded to microformats2

2014-06-23 14:20:06 +02:00

lib

RSVPs refer to Happening (event) by URI instead of ID now

2015-12-31 19:23:05 +01:00

locale

Snapshot of the Transifex translation project - October 2015

2015-10-04 18:23:01 +02:00

EventPlugin.php

Merge branch 'nightly' into singpolyma/gnu-social-events-saveObjectFromActivity

2016-01-03 13:08:34 +01:00