2253 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Thomas Tanghus	e17096fe50	Merge branch 'master' of github.com:owncloud/apps into contacts_rework	2012-10-01 23:47:44 +02:00
Jenkins for ownCloud	47256caeed	[tx-robot] updated from transifex	2012-10-01 02:10:27 +02:00
Thomas Tanghus	6187c4ad62	Merge branch 'master' of github.com:owncloud/apps into contacts_rework	2012-09-30 11:06:28 +02:00
Thomas Tanghus	01a009d18e	Merge branch 'master' of github.com:owncloud/apps into vcategories_db	2012-09-30 11:04:54 +02:00
Thomas Tanghus	605e4e7c93	Change requesttoken to oc_requesttoken.	2012-09-30 07:30:51 +02:00
Thomas Tanghus	fd5d70bf7a	Merge branch 'master' of github.com:owncloud/apps into vcategories_db	2012-09-30 06:46:28 +02:00
Thomas Tanghus	bf4b770920	Merge branch 'contacts_rework' of github.com:owncloud/apps into contacts_rework	2012-09-30 06:44:33 +02:00
Thomas Tanghus	848139e563	Merge branch 'master' of github.com:owncloud/apps into contacts_rework	2012-09-30 06:43:14 +02:00
Thomas Tanghus	2a3a3241e3	Added button to go back to list.	2012-09-30 06:42:16 +02:00
Thomas Tanghus	096a45b393	Also show standard image if id is not set, for example when rendering not saved contact.	2012-09-30 06:40:57 +02:00
Thomas Tanghus	ce2535521b	Add 'Other' as standard email type.	2012-09-30 06:40:04 +02:00
Thomas Tanghus	68e409cac7	Insert a rendered contact in the list.	2012-09-30 06:38:53 +02:00
Thomas Tanghus	ee54413419	Some work on the header styling	2012-09-30 06:37:16 +02:00
Thomas Tanghus	2bcb9647f8	Return contact structure after adding	2012-09-30 06:35:43 +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
raghu	79b8a27ba0	A Polyfill for Placeholders added to the contacts_rework branch	2012-09-25 16:39:32 +05:30
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
Jenkins for ownCloud	b4e2b32d61	[tx-robot] updated from transifex	2012-09-20 02:12:48 +02:00
Jenkins for ownCloud	2308a4b69f	[tx-robot] updated from transifex	2012-09-19 02:07:43 +02:00
Jenkins for ownCloud	cd94a72dde	[tx-robot] updated from transifex	2012-09-18 02:03:55 +02:00
Jenkins for ownCloud	dea0406702	[tx-robot] updated from transifex	2012-09-17 20:43:17 +02:00
Jenkins for ownCloud	2f80fc751d	[tx-robot] updated from transifex	2012-09-17 17:01:13 +02:00
Thomas Tanghus	6b77479899	First work on new Contacts js and group based UI.	2012-09-17 16:15:31 +02:00
Thomas Tanghus	993c8f36f1	Missed one 'contacts' => 'contact' update.	2012-09-17 02:17:41 +02:00
Thomas Tanghus	11d9539a29	Merge branch 'vcategories_db' into contacts_rework	2012-09-17 02:05:58 +02:00
Thomas Tanghus	99cac70666	Merge branch 'master' of github.com:owncloud/apps into contacts_rework	2012-09-17 02:05:31 +02:00
Thomas Tanghus	fc62459aa2	Merge branch 'master' of github.com:owncloud/apps into vcategories_db	2012-09-17 02:05:08 +02:00
Thomas Tanghus	9571e4077c	Use types (event/contact) instead of app names for vcategories. Also purge category/object relations on object deletion.	2012-09-17 02:03:28 +02:00
Thomas Tanghus	b15dfbba0d	Don't open multiple eamil composers on click.	2012-09-16 18:53:26 +02:00
Thomas Tanghus	a31f47405a	Merge branch 'master' of github.com:owncloud/apps into contacts_rework	2012-09-16 14:23:13 +02:00
Thomas Tanghus	dd42d05ac6	Merge branch 'master' of github.com:owncloud/apps into vcategories_db	2012-09-16 14:19:59 +02:00
Thomas Tanghus	0d3d1593c1	Removed context menu test.	2012-09-16 14:13:22 +02:00
Thomas Tanghus	a80604e0e8	Merge branch 'master' of github.com:owncloud/apps into contacts_rework	2012-09-16 14:07:18 +02:00
Jenkins for ownCloud	cc466a5a76	[tx-robot] updated from transifex	2012-09-15 02:07:46 +02:00
Thomas Tanghus	b0b25c043d	Merge branch 'master' of github.com:owncloud/apps into vcategories_db	2012-09-13 18:17:58 +02:00
Thomas Tanghus	2fc7f0f12c	Merge branch 'master' of github.com:owncloud/apps into contacts_rework	2012-09-13 02:15:14 +02:00
Thomas Tanghus	2d5d1e1c5c	Mark newly added contact as active. oc-1694.	2012-09-13 02:10:15 +02:00
Thomas Tanghus	6dabd60e5a	Merge branch 'master' of github.com:owncloud/apps into contacts_rework	2012-09-12 23:01:49 +02:00
Thomas Tanghus	3992402f1a	Removed debug statement.	2012-09-12 21:19:15 +02:00
Thomas Tanghus	740995ced3	Use category format const.	2012-09-11 15:33:09 +02:00