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

1367 Commits

Author SHA1 Message Date
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
Thomas Tanghus
4e470cb2bf Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-09-11 14:21:01 +02:00
Thomas Tanghus
fbfe8aab45 Transitional filter-by-category design take 1. 2012-09-11 14:19:28 +02:00
Jenkins for ownCloud
25e2ed9d56 [tx-robot] updated from transifex 2012-09-11 02:07:59 +02:00
Jenkins for ownCloud
26f8359f28 [tx-robot] updated from transifex 2012-09-10 02:06:30 +02:00
Thomas Tanghus
c7ccfb9b4a Don't look up permissions from list. 2012-09-09 18:51:22 +02:00
Thomas Tanghus
818ddc1d13 And spell permissions correctly ;) 2012-09-09 18:48:28 +02:00
Thomas Tanghus
d321fe1549 Get permissions when loading contact. 2012-09-09 18:43:46 +02:00
Michael Gapczynski
475de65901 Update getChildren() for calendar and addressbook share backends 2012-09-08 23:11:40 -04:00
Jenkins for ownCloud
5005796479 [tx-robot] updated from transifex 2012-09-09 02:05:19 +02:00
Thomas Tanghus
0b42a3fb83 Edit dialog remained if you deleted an address book while editing it. oc-1657 2012-09-08 03:59:35 +02:00
Thomas Tanghus
c4c6323432 Addressbook selection didn't show if there was only one. 2012-09-08 03:50:38 +02:00
Jenkins for ownCloud
427494c428 [tx-robot] updated from transifex 2012-09-08 02:07:51 +02:00
Bart Visscher
d31248007e Merge branch 'master' into routing
Conflicts:
	gallery/lib/tiles.php
2012-09-07 15:45:35 +02:00
Thomas Mueller
089b7e8f8a adding space between) and { 2012-09-07 15:21:03 +02:00
Bart Visscher
b179feeea2 Fix whitespace in contacts 2012-09-07 14:32:45 +02:00
Bart Visscher
0986558df2 Remove empty lines at end of file 2012-09-07 14:25:28 +02:00
Bart Visscher
739c86b734 Remove php close tag from end of file.
See also http://stackoverflow.com/questions/4410704/php-closing-tag
2012-09-07 14:24:56 +02:00
Jenkins for ownCloud
4f919e91f3 [tx-robot] updated from transifex 2012-09-07 02:10:31 +02:00
Thomas Tanghus
56606afd1e Contacts: Localized sorting. 2012-09-06 23:46:07 +02:00
Thomas Tanghus
e0f9ed99d3 Don't disable displayname when adding adressbook. 2012-09-06 23:26:09 +02:00
Thomas Tanghus
d261bb9a90 Disable excessive debugging when importing. 2012-09-06 23:26:09 +02:00
Thomas Tanghus
4852932fb5 Contacts: Improve firstrun. 2012-09-06 16:35:46 +02:00
Thomas Tanghus
09f7b632d4 Permission check in OC_Contacts_Addressbook::find() 2012-09-06 16:02:00 +02:00
Thomas Tanghus
46cc491eae Also disable dis-/enabling shared addressbook. 2012-09-06 05:23:38 +02:00
Thomas Tanghus
84e867669f Only return first - and only - addressbook in the shared addressbooks array. 2012-09-06 05:23:38 +02:00
Thomas Tanghus
d735be702d Make bottom controls pwettier. 2012-09-06 05:23:38 +02:00
Thomas Tanghus
c7b116f3d7 Reminder to unshare on delete when a method is provided. 2012-09-06 05:23:37 +02:00
Thomas Tanghus
aefe7db84c Don't write translated shared by strings to db, instead have a shared indicator on the addressbook. 2012-09-06 02:12:22 +02:00
Thomas Tanghus
35ce5f1afb Set data-owner in addressbook list. 2012-09-06 02:12:22 +02:00
Thomas Tanghus
742f175872 Disable editing shared calendars name. 2012-09-06 02:12:22 +02:00
Jenkins for ownCloud
7325961335 [tx-robot] updated from transifex 2012-09-06 02:07:14 +02:00
Thomas Tanghus
f644e832a2 Change calendar_objects.calendardata and contacts_addressbooks.carddata back to clob. Fix for oc-1641. 2012-09-05 17:24:41 +02:00
Thomas Tanghus
1d94d98668 Addressbook selection dialig didn't show names or descriptions. 2012-09-05 16:45:18 +02:00
Jenkins for ownCloud
17d9ef3b01 [tx-robot] updated from transifex 2012-09-05 02:06:20 +02:00
Thomas Tanghus
4ac74a5e67 Also check parents permissions when updating/deleting contact. 2012-09-04 13:40:29 +02:00
Jenkins for ownCloud
f7a8eabf4e [tx-robot] updated from transifex 2012-09-04 02:04:35 +02:00