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

306 Commits

Author SHA1 Message Date
Bart Visscher
d696522f3a Merge branch 'routing' 2012-10-27 15:07:15 +02:00
Lukas Reschke
0f88c4a051 Check if url is valid 2012-10-12 14:51:17 +02:00
Thomas Tanghus
0f419bf436 Silenced console logging. 2012-10-05 03:50:45 +02:00
Thomas Tanghus
d253b77a49 Also show correct links for addressbooks. 2012-10-03 18:47:02 +02:00
Thomas Tanghus
605e4e7c93 Change requesttoken to oc_requesttoken. 2012-09-30 07:30:51 +02:00
Bart Visscher
a4f5478d06 Merge branch 'master' into routing
Conflicts:
	gallery/lib/tiles.php
2012-09-28 21:43:48 +02:00
Thomas Tanghus
b15dfbba0d Don't open multiple eamil composers on click. 2012-09-16 18:53:26 +02:00
Thomas Tanghus
0d3d1593c1 Removed context menu test. 2012-09-16 14:13:22 +02:00
Thomas Tanghus
2d5d1e1c5c Mark newly added contact as active. oc-1694. 2012-09-13 02:10:15 +02:00
Thomas Tanghus
c7ccfb9b4a Don't look up permissions from list. 2012-09-09 18:51:22 +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
Bart Visscher
d31248007e Merge branch 'master' into routing
Conflicts:
	gallery/lib/tiles.php
2012-09-07 15:45:35 +02:00
Bart Visscher
b179feeea2 Fix whitespace in contacts 2012-09-07 14:32:45 +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
4852932fb5 Contacts: Improve firstrun. 2012-09-06 16:35:46 +02:00
Thomas Tanghus
46cc491eae Also disable dis-/enabling shared addressbook. 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
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
742f175872 Disable editing shared calendars name. 2012-09-06 02:12:22 +02:00
Thomas Tanghus
9818045fea Another try on keyboard shortcuts. Why doesn't '?' have the same key code?!? 2012-09-03 01:06:20 +02:00
Thomas Tanghus
8912d86927 Fixed keyboard shortcut. 2012-09-03 00:29:59 +02:00
Thomas Tanghus
c33e5b0517 Simplify showing intro when no contacts. For reasons unknown also fixes oc-1588. 2012-09-01 06:41:36 +02:00
Bart Visscher
b5cb037e73 Fix linkTo calls for new routing 2012-08-31 18:05:49 +02:00
Thomas Tanghus
b1e38e8829 Show correct CardDAV URL. 2012-08-31 05:12:19 +02:00
Jörn Friedrich Dreyer
114ba38fa8 unify permissions (2/3): change apps to use OC::PERMISSION_X 2012-08-31 01:12:02 +02:00
Thomas Tanghus
51940b01a7 Only update contacts list once import has finished. 2012-08-30 18:43:01 +02:00
Thomas Tanghus
4564f569c1 Make sure initial addressbook is marked active to avoid false permission errors. 2012-08-30 18:43:01 +02:00
Michael Gapczynski
b5b59ad153 Remove jquery.inview files from contacts app 2012-08-26 18:54:21 -04:00
Thomas Tanghus
3e92c3b0ae Permission checking for shared addressbooks/contacts. 2012-08-23 22:03:36 +02:00
Thomas Tanghus
9619c8aa42 Fix for deleting queued contacts. 2012-08-23 22:03:35 +02:00
Thomas Tanghus
070bb410ba Add support for IMPP properties. 2012-08-22 18:51:17 +02:00
Thomas Tanghus
94545fc092 Email type list wasn't initialized. 2012-08-22 12:40:35 +02:00
Thomas Tanghus
8bd01c044f Minor layout change. 2012-08-22 12:40:35 +02:00
Thomas Tanghus
ded6b9ba46 Preliminary support for Apple X-ABLabel. Also for oc-1508. 2012-08-21 03:57:48 +02:00
Thomas Tanghus
d55a01eeb0 Added types to emails. Support for custom types. Partial fix for oc-1508. 2012-08-21 00:20:18 +02:00
Thomas Tanghus
d16ea83f24 Try to align and float contact parts better. 2012-08-21 00:20:18 +02:00
Michael Gapczynski
d80d66fe58 Merge branch 'share_api'
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php
2012-08-19 22:29:01 -04:00
Thomas Tanghus
1d9d5e64e9 Merge addressbooks. 2012-08-16 00:25:32 +02:00
Michael Gapczynski
839b873656 Merge branch 'master' into share_api
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
2012-08-14 10:22:13 -04:00
Thomas Tanghus
7ebe70e85c Readded refresh param. 304 and ETag is still sent so shouldn't matter. 2012-08-12 17:30:09 +02:00
Michael Gapczynski
a1ac3767ce Merge branch 'master' into share_api
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
Thomas Tanghus
696a330c37 Another take at profile photo/thumbnail caching. oc-839. 2012-08-09 16:32:05 +02:00
Thomas Tanghus
50a4e8ed8d Some UI improvements on the addressbooks settings. 2012-08-07 00:06:18 +02: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
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
Thomas Tanghus
3996dfa330 Correct path to ajax file. 2012-08-05 03:36:16 +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
95c00c16f6 Return properly formatted jsondata. 2012-08-02 19:03:45 +02:00