1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
Commit Graph

720 Commits

Author SHA1 Message Date
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
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
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
Jenkins for ownCloud
89b82943c4 [tx-robot] updated from transifex 2012-07-27 02:04:26 +02:00
Jenkins for ownCloud
49856c0b7e [tx-robot] updated from transifex 2012-07-26 08:04:12 +02:00
Jenkins for ownCloud
042370c852 [tx-robot] updated from transifex 2012-07-26 08:03:10 +02:00
Michael Gapczynski
93556984f2 Merge branch 'master' into share_api
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
2012-07-25 17:08:18 -04:00
Michael Gapczynski
d01ee747aa Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Thomas Tanghus
5517430d9b Remove unused ajax file. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
d55d41df8a Cache DOM lookups, general cleanup. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
039ed4f48d Cleaner event handling. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
15132e443c No need to set checksum on PHOTO. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
c88ced278c Cleaner variable handling. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
8dc02e114c Make sure notifier cleans up. 2012-07-23 01:17:38 +02:00