5 Commits

Author	SHA1	Message	Date
Sam Tuke	8b01286a5d	Merged branch 'master'	2012-10-16 16:57:07 +01:00
Jörn Friedrich Dreyer	e59a1806cf	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
Lukas Reschke	777eb1d8b1	CSRF check in the settings	2012-07-07 15:27:04 +02:00
Bart Visscher	17e631bc5e	Use OC_JSON for json responses ... Create OC_JSON class, for single point of creating json responses. No real logic change, this just cleans up the code a bit.	2011-09-25 22:19:28 +02:00
Jan-Christoph Borchardt	4a5ee765cf	merged admin, help and settings to settings	2011-08-13 05:13:34 +02:00