974 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas Tanghus	ad653dddc9	Fix require statements. Fix for oc-1460.	2012-08-09 11:35:14 +02:00
Michael Gapczynski	14d67ba771	Start adding permission checks for addressbooks	2012-08-08 21:43:02 -04:00
Michael Gapczynski	34fdb2306c	Don't include shared addressbook if source not found	2012-08-08 19:12:59 -04:00
Jenkins for ownCloud	a4deaea7bb	[tx-robot] updated from transifex	2012-08-07 02:07:50 +02:00
Thomas Tanghus	50a4e8ed8d	Some UI improvements on the addressbooks settings.	2012-08-07 00:06:18 +02:00
Michael Gapczynski	9b2e8de621	Sharing backends for contacts and addressbooks	2012-08-06 16:11:03 -04:00
Michael Gapczynski	9fa545b2ec	Load icons for addressbooks, fix statuses for types other than files	2012-08-06 15:24:08 -04:00
Michael Gapczynski	2b37dd1aa2	Add share action back into addressbook settings, bump up z-index of dropdown so the autocomplete list is visible	2012-08-06 15:09:01 -04:00
Michael Gapczynski	6db5e23c77	Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/contacts/templates/part.chooseaddressbook.rowfields.php	2012-08-06 13:49:54 -04:00
Michael Gapczynski	693b496fdd	Lots of refactoring to share API	2012-08-06 11:27:13 -04:00
Jenkins for ownCloud	9cb83cf2af	[tx-robot] updated from transifex	2012-08-06 02:02:50 +02:00
Thomas Tanghus	3996dfa330	Correct path to ajax file.	2012-08-05 03:36:16 +02:00
Jenkins for ownCloud	c106e0e91d	[tx-robot] updated from transifex	2012-08-04 02:04:21 +02:00
Thomas Tanghus	e59775c602	Reorganize ajax scripts.	2012-08-03 21:32:27 +02:00
Thomas Tanghus	1d094c2631	Some fixes for keyboard shortcuts.	2012-08-03 21:32:27 +02:00
Thomas Tanghus	9553dc0da3	FF complained about missing charset.	2012-08-03 21:32:27 +02:00
Thomas Tanghus	3877804669	White space.	2012-08-03 21:32:27 +02:00
Thomas Tanghus	76f36ed875	Revert "Removed text/plain header." ... This reverts commit fa6d26b53c020940e38f632940f73dbbb56f6847.	2012-08-03 21:32:27 +02:00
Michael Gapczynski	4e99280907	Preparing for proper collection implementation	2012-08-03 15:05:45 -04:00
Jenkins for ownCloud	6498fe1a50	[tx-robot] updated from transifex	2012-08-03 02:04:12 +02:00
Thomas Tanghus	95c00c16f6	Return properly formatted jsondata.	2012-08-02 19:03:45 +02:00
Thomas Tanghus	8de619ce1d	Correct namespace usage.	2012-08-02 19:03:06 +02:00
Thomas Tanghus	5f315d9c3d	Remove logging	2012-08-02 19:01:55 +02:00
Thomas Tanghus	73bca9b8ca	I was a bit too fast in removing methods yesterday...	2012-08-02 18:57:03 +02:00
Thomas Tanghus	ceca4a1138	If first addressbook was empty it was seen as if there where no contacts at all.	2012-08-02 18:50:20 +02:00
Thomas Tanghus	a8c0bfe1d7	Line length...	2012-08-02 05:02:36 +02:00
Thomas Tanghus	76d1507677	Remove onunload handler when delete is cancelled.	2012-08-02 05:01:54 +02:00
Thomas Tanghus	732a921411	Use popup class style for ninja-mode help.	2012-08-02 04:18:44 +02:00
Thomas Tanghus	415a5ace5a	More files to delete \o/	2012-08-02 04:18:44 +02:00
Thomas Tanghus	af6ffc9505	Updated JS namespace.	2012-08-02 04:18:44 +02:00
Jenkins for ownCloud	4691f48d5c	[tx-robot] updated from transifex	2012-08-02 02:06:16 +02:00
Thomas Tanghus	4ff2f2aaf9	And then the missing files ;)	2012-08-02 00:02:07 +02:00
Thomas Tanghus	990e13cdd0	Addressbooks settings rewrite and cleanup.	2012-08-02 00:02:07 +02:00
Jenkins for ownCloud	251fa26217	[tx-robot] updated from transifex	2012-08-01 02:02:35 +02:00
Jenkins for ownCloud	abe547410b	[tx-robot] updated from transifex	2012-07-31 22:57:24 +02:00
Michael Gapczynski	9e16c8ae7c	Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js	2012-07-31 15:00:04 -04:00
jfd	26e6e4e5b7	use CURRENT_TIMESTAMP in default column definitions (sqlite, mysql, postgres and oracle DO understand it), change clob columns to text (clob will give sorting and uniqueness problems and in general is not what we want)	2012-07-31 19:00:54 +02:00
jfd	a57799bcec	escape all identifiers with backticks	2012-07-31 18:53:05 +02:00
Thomas Tanghus	14a44c6178	Changed fix parameter to OC.appSettings().	2012-07-31 14:18:32 +02:00
Thomas Tanghus	0db696e8c0	Unregister from personal settings.	2012-07-31 12:23:22 +02:00
Thomas Tanghus	76ede3d16e	Implemented app settings in popup.	2012-07-31 12:23:22 +02:00
Thomas Tanghus	3b2c7c5981	Fix errors when no addressbook.	2012-07-30 12:28:10 +02:00
Thomas Tanghus	b9e23c409e	Remove deprecated code.	2012-07-30 05:31:48 +02:00
Thomas Tanghus	06c8e0cfe6	Code style.	2012-07-30 05:31:06 +02:00
Thomas Tanghus	77dfaedc04	Check if the are contacts marked as deleted and warn if so.	2012-07-30 04:57:14 +02:00
Thomas Tanghus	c4796b93de	Fixed potential error in logging.	2012-07-30 04:57:14 +02:00
Thomas Tanghus	745e294b0c	Removed text/plain header.	2012-07-30 04:57:14 +02:00
Jenkins for ownCloud	088241b211	[tx-robot] updated from transifex	2012-07-30 02:05:41 +02:00
Jenkins for ownCloud	5ad09e696a	[tx-robot] updated from transifex	2012-07-29 02:06:29 +02:00
Jenkins for ownCloud	7a66a392f2	[tx-robot] updated from transifex	2012-07-28 02:05:38 +02:00