rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-01 13:24:10 +01:00
Code Issues Releases Activity
536 Commits 18 Branches 95 Tags 40 MiB
c399942c73
Commit Graph

536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brice Maron
c399942c73 Merge branch 'master' into multi_app_dir 2012-06-21 20:19:31 +00:00
Thomas Tanghus
b41b2c38b8 Fix URL delimiter. 2012-06-21 22:03:57 +02:00
Thomas Tanghus
a48debb3c9 Fix being able to link directly to contact, that I broke in other commit. 2012-06-21 22:02:17 +02:00
Brice Maron
ad23207303 Merge branch 'master' into multi_app_dir 
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
 2012-06-21 17:15:35 +00:00
Thomas Tanghus
b3b67ab2cb More changes for updating the contacts list. 2012-06-20 21:00:49 +02:00
Thomas Tanghus
1f6bb63f8d Better error checking. 2012-06-20 21:00:49 +02:00
Thomas Tanghus
a82a4e467b Make sure address books are shown even if empty. 2012-06-20 21:00:49 +02:00
Thomas Tanghus
a534cc54d4 Log error as ERROR. 2012-06-20 21:00:49 +02:00
Thomas Tanghus
b4056f75ca Re-add missing loadhandlers() call. 2012-06-19 14:56:21 +02:00
Thomas Tanghus
dc65727235 Loading of contacts was placed outside of $(document).ready() function. 2012-06-19 14:55:14 +02:00
Thomas Tanghus
08813e1c27 Remove obsolete js. 2012-06-18 02:22:22 +02:00
Thomas Tanghus
23a1f455c4 Update js after contactlist change. 2012-06-18 02:21:29 +02:00
Thomas Tanghus
826b91ac83 Removed erroneous value attributes. Partial fix for oc-1029. 2012-06-18 00:36:25 +02:00
Thomas Tanghus
b6f00dd64d Save addressbook id to be able to rearrange contacts properly. 2012-06-17 23:14:02 +02:00
Thomas Tanghus
0f46f846ad Make contact list fit in viewport. 2012-06-17 23:12:48 +02:00
Thomas Tanghus
5e14a77c65 Rearrange markup. 2012-06-17 23:12:11 +02:00
Thomas Tanghus
618eab7208 Add thumbnail links so they are loaded when addressbook is expanded. 2012-06-17 23:09:25 +02:00
Thomas Tanghus
fce46bbe95 Use uasort instead of usort. 2012-06-17 21:50:49 +02:00
Thomas Tanghus
085be8dc4b Sort addressbooks. 2012-06-17 21:47:15 +02:00
Thomas Tanghus
53365e4b48 Add effect on addressbook show/hide. 2012-06-17 21:37:13 +02:00
Thomas Tanghus
ce732f4104 Add effect on addressbook show/hide. 2012-06-17 21:34:56 +02:00
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
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
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
f3e19ca230 Contacts: Final (for now) fix to encoding probs on import. 2012-06-12 12:32:37 +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