961 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Appelman	019fef640a	merge master into gallery	2012-10-28 12:58:16 +01:00
Robin Appelman	3b0ce012d7	Revert "[tx-robot] updated from transifex" due to merge conflicts ... This reverts commit a468d47dfb2ca740e25edfac3b11a6ea21ee1546.	2012-10-28 12:53:13 +01:00
Jenkins for ownCloud	f353a19ab9	[tx-robot] updated from transifex	2012-10-28 00:02:30 +02:00
Bart Visscher	c2d29f20f7	Merge remote-tracking branch 'git://github.com/susinths/apps' ... Conflicts: calendar/ajax/event/edit.form.php calendar/lib/object.php	2012-10-27 16:36:06 +02:00
Bart Visscher	d696522f3a	Merge branch 'routing'	2012-10-27 15:07:15 +02:00
Jenkins for ownCloud	9e01d27c0b	[tx-robot] updated from transifex	2012-10-27 00:03:27 +02:00
Jenkins for ownCloud	d0e06b6d6d	[tx-robot] updated from transifex	2012-10-26 02:08:14 +02:00
Jenkins for ownCloud	6ff83b2c6a	[tx-robot] updated from transifex	2012-10-25 09:36:01 +02:00
Jenkins for ownCloud	b299f3a5d1	[tx-robot] updated from transifex	2012-10-24 02:10:00 +02:00
Jenkins for ownCloud	78f16969fd	[tx-robot] updated from transifex	2012-10-23 02:11:00 +02:00
Brice Maron	b1cb8a044b	Fix some style	2012-10-22 21:11:36 +00:00
Jenkins for ownCloud	22a6d095e6	[tx-robot] updated from transifex	2012-10-22 02:11:04 +02:00
Jenkins for ownCloud	38086a5b34	[tx-robot] updated from transifex	2012-10-21 02:11:26 +02:00
Jenkins for ownCloud	36bb2fc7aa	[tx-robot] updated from transifex	2012-10-20 02:09:57 +02:00
Susinthiran Sithamparanathan	9c3ba7bed0	Update Contacts and Calendar with namespaces for Sabre 1.7.1	2012-10-18 23:08:26 +02:00
Jenkins for ownCloud	62a5aad742	[tx-robot] updated from transifex	2012-10-18 22:59:03 +02:00
Jenkins for ownCloud	2ce8dc0cc3	[tx-robot] updated from transifex	2012-10-18 02:09:11 +02:00
Jenkins for ownCloud	6a6d91c4bb	[tx-robot] updated from transifex	2012-10-16 23:34:50 +02:00
Thomas Tanghus	2bd762c86f	Unshare Calendar/Event/Addressbook/Contact on delete.	2012-10-16 22:25:03 +02:00
Thomas Tanghus	506fe0b9f9	Remove stray error_log statement.	2012-10-16 22:24:03 +02:00
Jenkins for ownCloud	df74b0f862	[tx-robot] updated from transifex	2012-10-16 02:11:11 +02:00
Jenkins for ownCloud	3ed636ae11	[tx-robot] updated from transifex	2012-10-14 02:11:45 +02:00
Jenkins for ownCloud	11f063b481	[tx-robot] updated from transifex	2012-10-13 02:11:52 +02:00
Lukas Reschke	0f88c4a051	Check if url is valid	2012-10-12 14:51:17 +02:00
Jenkins for ownCloud	015d58ba64	[tx-robot] updated from transifex	2012-10-12 02:08:54 +02:00
Jenkins for ownCloud	249aac82ff	[tx-robot] updated from transifex	2012-10-11 02:10:53 +02:00
Jenkins for ownCloud	89928d59de	[tx-robot] updated from transifex	2012-10-10 02:12:53 +02:00
Jenkins for ownCloud	8a2b073e53	[tx-robot] updated from transifex	2012-10-08 02:09:32 +02:00
Jenkins for ownCloud	1e4c2fa6e4	[tx-robot] updated from transifex	2012-10-06 02:10:11 +02:00
Thomas Tanghus	0f419bf436	Silenced console logging.	2012-10-05 03:50:45 +02:00
Thomas Tanghus	b8d6b7bcfb	Fix regression where contact photo was included in json response.	2012-10-05 02:09:52 +02:00
Jenkins for ownCloud	4244cc0e6f	[tx-robot] updated from transifex	2012-10-05 02:07:51 +02:00
Jenkins for ownCloud	0b1c1b4e05	[tx-robot] updated from transifex	2012-10-04 02:09:41 +02:00
Thomas Tanghus	d253b77a49	Also show correct links for addressbooks.	2012-10-03 18:47:02 +02:00
Jenkins for ownCloud	a2c7488354	[tx-robot] updated from transifex	2012-10-03 02:10:29 +02:00
Thomas Tanghus	d9a3f56b9d	Don't prevent calendar and contant data deletion on user deletion because of sharing permissions.	2012-10-02 23:22:29 +02:00
Frank Karlitschek	b251ab38b5	bump the required field of all the shipped apps to 4.9 which is the internal verson number of ownCloud 4.5	2012-10-02 12:21:25 +02:00
Jenkins for ownCloud	c91c4cf47d	[tx-robot] updated from transifex	2012-10-02 02:08:07 +02:00
Jenkins for ownCloud	47256caeed	[tx-robot] updated from transifex	2012-10-01 02:10:27 +02:00
Thomas Tanghus	605e4e7c93	Change requesttoken to oc_requesttoken.	2012-09-30 07:30:51 +02:00
Jenkins for ownCloud	10ecb7789f	[tx-robot] updated from transifex	2012-09-30 02:07:43 +02:00
Lukas Reschke	230a10c954	Fix another XSS	2012-09-29 16:13:42 +02:00
Lukas Reschke	55963432e6	Fix XSS ... See 1c766278bac06d9a8cc91ee5928d5f317771750c	2012-09-29 16:13:37 +02:00
Jenkins for ownCloud	934b46e497	[tx-robot] updated from transifex	2012-09-29 02:08:53 +02:00
Bart Visscher	a4f5478d06	Merge branch 'master' into routing ... Conflicts: gallery/lib/tiles.php	2012-09-28 21:43:48 +02:00
Jenkins for ownCloud	bba9e57ad2	[tx-robot] updated from transifex	2012-09-28 02:08:20 +02:00
Jenkins for ownCloud	168be09747	[tx-robot] updated from transifex	2012-09-27 02:04:37 +02:00
Jenkins for ownCloud	546fe328e5	[tx-robot] updated from transifex	2012-09-26 13:27:02 +02:00
Jenkins for ownCloud	0aec65e5e7	[tx-robot] updated from transifex	2012-09-24 02:05:00 +02:00
Jenkins for ownCloud	5aba072881	[tx-robot] updated from transifex	2012-09-22 02:05:30 +02:00