rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-12 23:09:15 +01:00
Code Issues Releases Activity
2,079 Commits 18 Branches 95 Tags 40 MiB
7e43b68a18
Commit Graph

2079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Thomas Tanghus
b1dfc19797 Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-) 
Conflicts:

	apps/contacts/ajax/uploadphoto.php
 2012-06-08 20:43:42 +02:00
Thomas Tanghus
00167a480c Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-) 2012-06-08 20:39:54 +02:00
Brice Maron
7009e70bf5 Merge branch 'master' into multi_app_dir 2012-06-07 19:11:55 +00:00
Thomas Tanghus
4dcc78670d Contacts: Attempt to make file upload work in ICS Chrome. 2012-06-07 20:29:16 +02:00
Thomas Tanghus
5bb678a528 Break text to fit in dialog. 2012-06-07 20:29:15 +02:00
Thomas Tanghus
57865be069 Edited combobox to adhere to coding standards and added a dblclick handler. 2012-06-07 16:44:54 +02:00
Thomas Tanghus
2b3e33bfbd Contacts: Import upload button was obscured on Android browser. 2012-06-07 10:58:15 +02:00
Thomas Tanghus
b28e050cf3 Contacts: Import upload button was obscured on Android browser. 2012-06-07 10:55:40 +02:00
Thomas Tanghus
ac962ab584 A bit of pixel-pushing. 2012-06-07 10:55:40 +02:00
Brice Maron
a7baf611f0 Change app path logic in templates 2012-06-06 20:24:16 +00:00