1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-13 23:49:04 +01:00
Commit Graph

1689 Commits

Author SHA1 Message Date
Thomas Tanghus
b5458d7784 Adjustments for inview handler etc. 2012-06-17 20:25:32 +02:00
Thomas Tanghus
258c08efba Moved parsing to the controller and js to contacts.js. 2012-06-17 20:25:32 +02:00
Thomas Tanghus
22aa2e235a Obsolete language="Javascript". 2012-06-17 20:25:32 +02:00
Thomas Tanghus
4dd13ffe1b Obsolete language="Javascript". 2012-06-17 20:25:32 +02:00
Thomas Tanghus
1008e676fb Styled address book entries. 2012-06-17 20:25:32 +02:00
Thomas Tanghus
13f2fcee23 Make the parsing in the controller, not in the template. Assign only relevant entries to the template. 2012-06-17 20:25:32 +02:00
Stephan Bergemann
d621126f11 now a little less in template - more in ajax controller 2012-06-17 20:25:32 +02:00
Stephan Bergemann
9eaf64b6d0 contacts app now lists contacts sorted by expandable/collapsable addressbooks 2012-06-17 20:25:32 +02:00
Thomas Tanghus
3669f9df17 Fix char encoding. 2012-06-16 18:38:20 +02:00
Thomas Tanghus
1c479a740e Fix string encoding probs. 2012-06-16 18:06:47 +02:00
Thomas Tanghus
f4f8c22bd4 Update stylesheet for type=url. 2012-06-15 04:32:01 +02:00
Thomas Tanghus
36851731e6 Use type=url for URL field. 2012-06-15 04:32:01 +02:00
Brice Maron
7149ad1e18 Merge branch 'master' into multi_app_dir
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
2012-06-14 21:16:59 +00:00
Thomas Tanghus
d8b662c25f Cleanup code. 2012-06-14 23:05:31 +02:00
Thomas Tanghus
2ac341c871 If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier... 2012-06-14 23:05:31 +02:00
Thomas Tanghus
130aaea934 Contacts: Fixes for CSRF. 2012-06-14 18:13:01 +02:00
Thomas Tanghus
d575d12c24 Remove debug statements. 2012-06-14 18:03:50 +02:00
Thomas Tanghus
160d641dc3 Contacts: Implement CSRF prevention. 2012-06-14 18:00:13 +02:00
Thomas Tanghus
24d8c297db Use the right csrf token. 2012-06-14 13:23:12 +02:00
Michael Gapczynski
6898f4256a Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
2012-06-13 15:17:46 -04:00
Thomas Tanghus
358f33865a Remove check for encryption. 2012-06-13 19:04:47 +02:00
Thomas Tanghus
4f83687744 Remove check for encryption. 2012-06-13 19:03:34 +02:00
Thomas Tanghus
df9ccd137d Remove debug statements. 2012-06-13 18:57:12 +02:00
Thomas Tanghus
aa73a32b89 Contacts: implemented CSRF prevention. 2012-06-13 17:35:42 +02:00
Thomas Tanghus
dc5b13a827 Contacts: Final (for now) fix to encoding probs on import. 2012-06-12 12:33:37 +02:00
Thomas Tanghus
f3e19ca230 Contacts: Final (for now) fix to encoding probs on import. 2012-06-12 12:32:37 +02:00
Thomas Tanghus
5c967cfd67 Fix copy/paste error. 2012-06-11 22:18:14 +02:00
Thomas Tanghus
9f1747a547 Fix js for missing address fields. 2012-06-11 22:15:56 +02:00
Thomas Tanghus
2c289d3a75 Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-) 2012-06-11 22:15:31 +02:00
Thomas Tanghus
1ebf3dc643 Fix js for missing address fields. 2012-06-11 22:14:21 +02:00
Thomas Tanghus
7a49ab0c9c Quick fix for index errors when not importing from files. 2012-06-11 22:14:21 +02:00
Thomas Tanghus
ba91bf5bae Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e 2012-06-11 22:14:21 +02:00
Thomas Tanghus
1ee05e12bd Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-) 2012-06-11 22:14:21 +02:00
Lukas Reschke
d9625f77ef Make some apps compatible 2012-06-11 19:07:51 +02:00
Bjoern Schiessle
6369935e7c replace "=0D=0A" (\r\n) with a simple "\n" in vards during import 2012-06-11 18:13:12 +02:00
Bjoern Schiessle
cd06ab6e6e make sure that contact data are always utf8 encoded to avoid encoding problems 2012-06-11 16:26:21 +02:00
Lukas Reschke
d16432d789 Revert 2012-06-11 13:27:32 +02:00
Thomas Tanghus
e80c624817 Contacts: Fix NOTE also on add, not just save. 2012-06-11 12:56:41 +02:00
Thomas Tanghus
0101088e95 Contacts: Fix NOTE also on add, not just save. 2012-06-11 12:55:54 +02:00
Lukas Reschke
3bb0cbff47 First try of implementing assignHTML 2012-06-11 12:45:07 +02:00
Thomas Tanghus
65c59b6c9d Copy/paste error. 2012-06-11 02:40:55 +02:00
Thomas Tanghus
5397dcf695 Contacts: 11th hour fix for invalid VCARD from CardDAV. 2012-06-10 20:56:55 +02:00
Thomas Tanghus
1bf36539f4 Contacts: 11th hour fix for invalid VCARD from CardDAV. 2012-06-10 20:54:52 +02:00
Thomas Tanghus
9326ec762b Fixed merge conflict. 2012-06-10 12:59:36 +02:00
Thomas Tanghus
197e853588 Contacts: Used non-existent var. 2012-06-10 12:48:39 +02:00
Thomas Tanghus
8bcb231022 Code cleanup. 2012-06-09 15:04:08 +02:00
Thomas Tanghus
3c07de4db6 Contacts: Use POST instead of GET. 2012-06-09 15:02:23 +02:00
Thomas Tanghus
587e16b51d Contacts: Use POST instead of GET. 2012-06-09 15:00:44 +02:00
Thomas Tanghus
7e5dca2468 Code cleanup. 2012-06-09 15:00:44 +02:00
Thomas Tanghus
b6127898de Don't fix bugs not present in this branch ;-) 2012-06-08 20:44:58 +02:00