Commit Graph

3 Commits (2.4)

Author SHA1 Message Date
noud 2903493205 Merge branch 'master' into develop
Conflicts:
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
2012-12-13 16:03:35 +01:00
noud 079ce88793 RESTfull sync
Let RESTfull only work conform the web pages (to Christophes wish),
so add/edit event apart from add/edit attribute.
(there is annotation in the code to revert back to full RESTfull and
add/edit the attribute(s) alongside add/edit the event.)
2012-12-11 16:11:45 +01:00
noud e4dafd3882 RESTfull sync
RESTfull attribute add, edit and view, to be usefull in sync.
2012-12-10 11:32:40 +01:00