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

325 Commits

Author SHA1 Message Date
Thomas Tanghus
1be1467257 Removed redundant dutton 2013-04-17 23:01:30 +02:00
Thomas Tanghus
c3fa18e4a7 Merge branch 'contacts_backends' into contacts_oc6
Conflicts:
	contacts/ajax/categories/add.php
	contacts/ajax/contact/add.php
	contacts/appinfo/app.php
	contacts/appinfo/migrate.php
	contacts/css/contacts.css
	contacts/index.php
	contacts/js/app.js
	contacts/js/contacts.js
	contacts/js/groups.js
	contacts/lib/app.php
	contacts/lib/carddav/addressbook.php
	contacts/lib/sabre/backend.php
	contacts/lib/vcard.php
	contacts/templates/contacts.php
	contacts/thumbnail.php
2013-04-17 15:07:59 +02:00
Thomas Tanghus
3a42108028 Contacts: Limit height of address book list. Fix #1006 2013-04-12 12:34:03 +02:00
Thomas Tanghus
2bf485fd10 Contacts: Fix image upload form 2013-04-08 22:40:53 +02:00
Thomas Tanghus
fb7fd6fc2c Contacts: Make drag items opaque. 2013-04-06 17:13:18 +02:00
Thomas Tanghus
ee8cded40e Contacts: Add thumbnails to merge list and move list item to template. 2013-04-05 22:21:08 +02:00
Thomas Tanghus
32ba67735e Contacts: Better wording for merge dialog. 2013-04-05 19:06:26 +02:00
Thomas Tanghus
d48418a8cc Speling error 2013-04-05 18:27:41 +02:00
Thomas Tanghus
5194ef9442 Contacts: Add backend and address book to form data 2013-04-05 04:11:53 +02:00
Thomas Tanghus
0224d3a941 Contacts: Mark sub-tepmlates as such 2013-04-03 16:52:56 +02:00
Thomas Tanghus
9f61cc8d78 Contacts: Basic merge functionality 2013-04-03 16:43:18 +02:00
Thomas Tanghus
7693785933 Contacts: Importing, indexing and group extraction in working state. 2013-03-29 05:00:03 +01:00
Thomas Tanghus
da0b072e88 Contacts: Add address book selector to contact template. 2013-03-25 17:09:29 +01:00
Thomas Tanghus
3f30356ffd Contacts: Remove thumbnail from template. 2013-03-23 01:59:44 +01:00
Thomas Tanghus
c20071836b Contacts: Update list element template for thumbnail 2013-03-22 14:57:26 +01:00
Thomas Tanghus
7700572fb1 Contacts: fix element close mismatch. Fixes #789 2013-03-17 10:42:06 +01:00
Thomas Tanghus
3b736c2922 Contacts: fix element close mismatch. Fixes #789 2013-03-17 10:35:22 +01:00
Thomas Tanghus
d2774ebbf9 Contacts: Re-add add address book. Fixes #578 2013-03-14 23:17:41 +01:00
Thomas Tanghus
ca626859c4 Contacts: Re-add add address book. Fixes #578 2013-03-14 23:16:37 +01:00
Thomas Tanghus
6bfc422d67 Contacts: Much improved d'n'd. 2013-03-14 19:53:53 +01:00
Thomas Tanghus
86ed865275 Contacts: d'n'd item template 2013-03-12 00:30:05 +01:00
Thomas Tanghus
06291c9f41 Contacts: Use FontAwesome icon-cloud. 2013-03-05 02:31:13 +01:00
Thomas Tanghus
d5acb5b9ed Contacts: Fix uploading photo. 2013-03-04 15:11:55 +01:00
Thomas Tanghus
d39b8bcbd7 Contacts: Missing class for cloud icon. 2013-03-04 14:46:20 +01:00
Lukas Reschke
340c26681c Add missing ) 2013-03-02 00:13:51 +01:00
Lukas Reschke
bf7e180638 Replace echo with p 2013-02-28 18:26:55 +01:00
Lukas Reschke
374a005f71 Replace echo with p 2013-02-28 17:35:22 +01:00
Lukas Reschke
c6c040cefa Replace echo 2013-02-28 17:21:45 +01:00
Lukas Reschke
d870dac75c Replace html_select_options 2013-02-28 16:54:22 +01:00
Lukas Reschke
efb28d4aa3 Replace linkTo 2013-02-28 16:53:51 +01:00
Lukas Reschke
54b776e62d Replace getUserValue 2013-02-28 16:53:43 +01:00
Lukas Reschke
c8d92c2044 Replace translation strings
Grep: echo \$l\-\>t\(\'([^']*)\'\)
Replace with:p(\$l\-\>t\(\'\1\'\)\)

Grep: echo \$l\-\>t\(\"([^"]*)\"\)
Replace with: p(\$l\-\>t\(\"\1\"\)\)
2013-02-28 16:27:14 +01:00
Thomas Tanghus
36e4636a0b Contacts: Remove FontAwesome style from property select. Fix #625 2013-02-27 14:22:10 +01:00
Thomas Tanghus
9a302d211f Contacts: Showstopper: Fix firstrun action. Also fix #580 2013-02-16 23:01:07 +01:00
Thomas Tanghus
b48ef3db06 Contacts: Hide import initially to trigger loading addressbooks. 2013-02-12 22:06:35 +01:00
Thomas Tanghus
8830d8d8a4 Contacts: Some style fixes. 2013-02-12 21:04:58 +01:00
Thomas Tanghus
eb81746625 Contacts: Remove unused field. 2013-02-08 23:24:24 +01:00
Thomas Tanghus
8660371577 Contacts: Fix export link. 2013-02-08 19:11:52 +01:00
Thomas Tanghus
f5e78552a2 Contacts: Settings fix. 2013-02-08 19:11:52 +01:00
Bernhard Posselt
978dc8fe10 test 2013-02-07 00:33:47 +01:00
Thomas Tanghus
dc26384e89 Contacts: Don't show Setting header. Ref #524 2013-02-06 14:51:01 +01:00
Thomas Tanghus
0c6bf8cc4d Contacts: Use icon-plus for add button. 2013-02-03 13:33:48 +01:00
Thomas Tanghus
f8e40090cb Contacts: Removed unused files. 2013-01-25 16:55:08 +01:00
Thomas Tanghus
a2359a00b5 Contacts: More inline js in photo editor :-/ 2013-01-25 16:48:14 +01:00
Thomas Tanghus
dd508c2784 Contacts: Last inline js gone. 2013-01-25 16:22:38 +01:00
Thomas Tanghus
5475d3f16e Contacts: One more inline js var down - one more to go ;) 2013-01-25 16:09:51 +01:00
Thomas Tanghus
c5c8b29964 Contacts: Move check for indexed state to ajax call. 2013-01-25 15:08:56 +01:00
Thomas Tanghus
401fa38639 Contacts: Read queried contact id in app.js 2013-01-25 14:30:53 +01:00
Thomas Tanghus
41b819c350 Contacts: Corrected property menu entries. 2013-01-17 14:48:46 +01:00
Thomas Tanghus
48c23c0dc0 Contacts: Refactored adding single contact to group. Closes #443 2013-01-16 13:35:41 +01:00