Thomas Tanghus
|
b8eea32478
|
Coding style.
|
2012-07-20 00:18:23 +02:00 |
Thomas Tanghus
|
1cbddcf211
|
Code style
|
2012-07-20 00:18:23 +02:00 |
Thomas Tanghus
|
616f2f336e
|
Trigger loading of more contacts a bit earlier.
|
2012-07-20 00:18:23 +02:00 |
Thomas Tanghus
|
5c0c9bbdc1
|
Cleaning up a bit.
|
2012-07-20 00:18:23 +02:00 |
Thomas Tanghus
|
fc46322d4c
|
Tweak dragging.
|
2012-07-20 00:18:23 +02:00 |
Thomas Tanghus
|
87da179e6c
|
Eye candy for the draggables.
|
2012-07-20 00:18:23 +02:00 |
Thomas Tanghus
|
ec4891b7d3
|
Fixed require path.
|
2012-07-17 12:07:14 +02:00 |
Thomas Tanghus
|
2c9aa029a7
|
Added missing CSRF checks.
|
2012-07-17 12:04:34 +02:00 |
Thomas Tanghus
|
9326f4f535
|
Added hooks for postCreateUser to add default address book and calendar. Fixes oc-1265.
|
2012-07-17 10:45:15 +02:00 |
Thomas Tanghus
|
1f4d6896df
|
Wrong version comparison in update.php.
|
2012-07-17 03:59:41 +02:00 |
Thomas Tanghus
|
4b8a34df21
|
Wrong argument count in postCreateUser hook for contacts.
|
2012-07-17 01:37:28 +02:00 |
Thomas Tanghus
|
4de66880ed
|
If a contact wasn't loaded in the list you coulcn't access it from search result. Fixes oc-1264.
|
2012-07-17 01:35:35 +02:00 |
Thomas Tanghus
|
f128b96ac0
|
Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD. Fixes oc-1276.
|
2012-07-16 23:44:18 +02:00 |
Thomas Tanghus
|
eb2a15d58f
|
Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD. Fixes oc-1276.
|
2012-07-16 23:36:11 +02:00 |
Thomas Tanghus
|
d64300251b
|
Corrected javascript definition.
|
2012-07-16 21:21:37 +02:00 |
Thomas Tanghus
|
7a7ac58094
|
Remove obsolete code.
|
2012-07-16 01:46:16 +02:00 |
Thomas Tanghus
|
2035bc7905
|
Fix sorting - again :-P
|
2012-07-16 01:46:16 +02:00 |
Thomas Tanghus
|
0fb1a76113
|
Bold active address book.
|
2012-07-16 01:46:16 +02:00 |
Thomas Tanghus
|
25f50e8273
|
Set the address book of the active contact active.
|
2012-07-16 01:46:16 +02:00 |
Thomas Tanghus
|
8fba6b9bc7
|
UI part of addressbook merging.
|
2012-07-16 01:46:16 +02:00 |
Thomas Tanghus
|
502f420678
|
Wrap image uploading in anonymous function.
|
2012-07-16 01:46:16 +02:00 |
Thomas Tanghus
|
001a47afb0
|
Remove obsolete FIXMEs.
|
2012-07-16 01:46:16 +02:00 |
Thomas Tanghus
|
dd95149238
|
Also unlink unsuccessful imports.
|
2012-07-15 17:34:30 +02:00 |
Thomas Tanghus
|
160e701fbf
|
Make list droppable too instead of just the header.
|
2012-07-15 12:28:29 +02:00 |
Thomas Tanghus
|
db034f05ca
|
Improve temp file handling.
|
2012-07-15 12:28:29 +02:00 |
Thomas Tanghus
|
8b49e304e0
|
Hide file form field behind image so it will maybe work with IE...
|
2012-07-15 12:28:29 +02:00 |
Thomas Tanghus
|
48521fcfaa
|
Made notifications more flexible.
|
2012-07-15 12:28:29 +02:00 |
Thomas Tanghus
|
d71da67bee
|
Typo.
|
2012-07-15 12:28:29 +02:00 |
Thomas Tanghus
|
7af608881b
|
Added notification.
|
2012-07-15 12:28:29 +02:00 |
Thomas Tanghus
|
4e684b9e9d
|
Fixed sorting of addressbooks.
|
2012-07-15 12:28:29 +02:00 |
Thomas Tanghus
|
287285880c
|
Removed obsolete TODO.
|
2012-07-15 12:28:28 +02:00 |
Thomas Tanghus
|
eba4f08015
|
Refactored contacts import.
|
2012-07-15 04:17:30 +02:00 |
Thomas Tanghus
|
87912a8c65
|
Fix loading previous or next contact after deleting one.
|
2012-07-15 04:17:30 +02:00 |
Thomas Tanghus
|
140263003a
|
Give default address book a more intuitive name and replace spaces with underscores in uri.
|
2012-07-14 14:11:43 +02:00 |
Thomas Tanghus
|
d45d73eecf
|
Try to avoid occasional error messages.
|
2012-07-14 14:11:43 +02:00 |
Robin Appelman
|
b45d3ced79
|
fix remote and public.php
|
2012-07-13 22:44:35 +02:00 |
Michael Gapczynski
|
f496a9dea6
|
Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
|
2012-07-11 20:29:59 -04:00 |
Michael Gapczynski
|
ac395dced1
|
Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
|
2012-07-11 20:28:29 -04:00 |
Michael Gapczynski
|
4bf13adff2
|
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
|
2012-07-11 20:25:59 -04:00 |
Michael Gapczynski
|
e896c0a9e3
|
Fix addressbook sharing, formatItems() changed in past commits
|
2012-07-11 11:33:48 -04:00 |
Thomas Tanghus
|
9d2cbc88f0
|
Revert reversion of f5c329af98 :-P
|
2012-07-10 01:24:40 +02:00 |
Thomas Tanghus
|
34ac2ea1ba
|
Don't escape assigned values.
|
2012-07-10 01:24:40 +02:00 |
Thomas Tanghus
|
861c379255
|
Make sure the proper DOM is loaded and the right address book gets expanded.
|
2012-07-10 01:24:40 +02:00 |
Thomas Tanghus
|
0744e5a172
|
Look for the right field :-P
|
2012-07-10 01:24:40 +02:00 |
Thomas Tanghus
|
7cb74a0bf3
|
Reduce variables assigned.
|
2012-07-10 01:24:40 +02:00 |
Thomas Tanghus
|
50462903d6
|
Revert "Delay fetching of carddata and set ETag and size instead."
This reverts commit f5c329af98 .
|
2012-07-10 01:24:40 +02:00 |
Jörn Friedrich Dreyer
|
e59a1806cf
|
remove superfluous ?> at the end of .php files (left out apps/*/templates)
|
2012-07-09 16:51:16 +02:00 |
Thomas Tanghus
|
f5c329af98
|
Delay fetching of carddata and set ETag and size instead.
|
2012-07-09 01:48:42 +02:00 |
Thomas Tanghus
|
47aaca49a1
|
Rescan categories in small batches to reduce memory usage.
|
2012-07-09 00:16:14 +02:00 |
Thomas Tanghus
|
d1cf787197
|
Move code to OC_Contacts_App::scanCategories().
|
2012-07-09 00:15:37 +02:00 |
Thomas Tanghus
|
6d123e90f3
|
Remove deleted address book from list.
|
2012-07-08 23:38:03 +02:00 |
Thomas Tanghus
|
0b6cd8d203
|
Simplify VCF generation.
|
2012-07-08 23:36:52 +02:00 |
Thomas Tanghus
|
197086a952
|
Make it possible to import files using CR as eol.
|
2012-07-08 18:34:00 +02:00 |
Thomas Tanghus
|
dc8193fccb
|
Make it possible to import files using CR as eol.
|
2012-07-08 18:28:55 +02:00 |
Thomas Tanghus
|
334257d2b6
|
Implemented VCFExportPlugin.
|
2012-07-08 17:52:57 +02:00 |
Thomas Tanghus
|
747b7fbbfe
|
Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-)
|
2012-07-08 16:17:10 +02:00 |
Thomas Tanghus
|
f5c620006e
|
Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-)
|
2012-07-08 16:15:52 +02:00 |
Thomas Tanghus
|
97106f198f
|
Set the loading class on the property being changed, not on its container.
|
2012-07-08 16:11:45 +02:00 |
Thomas Tanghus
|
d730d3edd4
|
Set the loading class on the property being changed, not on its container.
|
2012-07-08 16:10:12 +02:00 |
Thomas Tanghus
|
25b95a9ec7
|
Improve checking for active addressbooks and creating default addressbook.
|
2012-07-08 15:41:38 +02:00 |
Thomas Tanghus
|
554cb2d3ab
|
Add missing requesttoken.
|
2012-07-08 14:48:49 +02:00 |
Thomas Tanghus
|
47f96e2d5e
|
Missing semi-colon.
|
2012-07-08 14:42:33 +02:00 |
Thomas Tanghus
|
746eef0d5c
|
Format error response correctly.
|
2012-07-08 14:31:40 +02:00 |
Thomas Tanghus
|
e6a60198e4
|
Return error messages in correct format.
|
2012-07-08 14:11:48 +02:00 |
Thomas Tanghus
|
2b22f0db0a
|
Add missing requesttoken.
|
2012-07-08 13:28:12 +02:00 |
Thomas Tanghus
|
75d01b065d
|
Make export batch size configurable.
|
2012-07-06 13:49:04 +02:00 |
Thomas Tanghus
|
cafbd02337
|
Fix endless loop when no addressbooks.
|
2012-07-06 13:24:56 +02:00 |
Thomas Tanghus
|
a1872412bf
|
Correct hack ;)
|
2012-07-06 12:59:07 +02:00 |
Thomas Tanghus
|
ab1b4f1f03
|
Fugly fixed include.
|
2012-07-06 12:59:07 +02:00 |
Thomas Tanghus
|
a5a1d929ca
|
No need for being protected.
|
2012-07-06 03:22:42 +02:00 |
Thomas Tanghus
|
59b38e668d
|
Missing requesttoken
|
2012-07-06 03:22:42 +02:00 |
Bart Visscher
|
5e0b80dc8d
|
Contacts: Fix copy&paste error
|
2012-07-05 17:12:52 +02:00 |
Thomas Tanghus
|
9d00f4d2fb
|
Correct db default value.
|
2012-07-05 00:40:11 +02:00 |
Thomas Tanghus
|
dac2c14ae9
|
Add missing CSRF check.
|
2012-07-05 00:37:08 +02:00 |
Thomas Tanghus
|
b11b6afbb9
|
Hopefully fix for drag'n'drop import in oc-813.
|
2012-07-05 00:25:38 +02:00 |
Thomas Tanghus
|
5d79444852
|
Missing update script.
|
2012-07-04 22:58:31 +02:00 |
Thomas Tanghus
|
706a13544b
|
Remove ugly activation hack.
|
2012-07-04 22:13:36 +02:00 |
Thomas Tanghus
|
b2eac08ad3
|
Query contacts in batches of 20. Possible fix for oc-1126.
|
2012-07-04 16:54:00 +02:00 |
Thomas Tanghus
|
5fb9b3e965
|
Disable expires header on thumbnail and photo.
|
2012-07-04 15:32:41 +02:00 |
Thomas Tanghus
|
6d3afb3857
|
Moved action buttons down to the add field menu. Fixes oc-1155.
|
2012-07-04 13:57:07 +02:00 |
Thomas Tanghus
|
f72a11f852
|
Moved action buttons down to the add field menu. Fixes oc-1155.
|
2012-07-04 13:49:39 +02:00 |
Michael Gapczynski
|
1e36e1f2cb
|
Use formatted shared addressbook in all cases, addressbooks out of order now
|
2012-07-03 11:36:57 -04:00 |
Michael Gapczynski
|
4185bd6292
|
Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app
|
2012-07-03 11:11:01 -04:00 |
Michael Gapczynski
|
77b582e4e6
|
Change getItems() return to a 3-dimensional array to handle multiple shares of the same item
|
2012-07-02 15:29:34 -04:00 |
Michael Gapczynski
|
0b9b1757fe
|
Add share action to addressbooks!
|
2012-06-30 21:06:49 -04:00 |
Michael Gapczynski
|
47f46890c8
|
Fix generateTarget() for contacts backend
|
2012-06-30 21:03:36 -04:00 |
Tom Needham
|
c7a4075aaa
|
Updates contacts migration provider
|
2012-06-30 22:56:47 +00:00 |
Michael Gapczynski
|
2418d9a1a9
|
Change registerBackend calls class argument to strings
|
2012-06-30 17:33:30 -04:00 |
Tom Needham
|
51173163ce
|
Contacts: align the bottom control buttons
|
2012-06-30 11:22:09 +00:00 |
Tom Needham
|
704a1c655e
|
Contacts: fix add contact icon path
|
2012-06-30 11:07:54 +00:00 |
Thomas Tanghus
|
a4614f83ff
|
Don't add duplicate contacts in the list when en-/disable an address book.
|
2012-06-29 23:18:47 +02:00 |
Georg Ehrke
|
bda0026374
|
fix birthday calendar
|
2012-06-29 15:43:18 +02:00 |
Thomas Tanghus
|
e04a605b9b
|
No need for this anymore.
|
2012-06-28 01:51:42 +02:00 |
Thomas Tanghus
|
a48aba316e
|
Smoother profile picture loading - hopefully.
|
2012-06-28 01:46:33 +02:00 |
Tom Needham
|
426193cf6c
|
Migration: Fix contacts and bookmarks
|
2012-06-27 21:18:31 +00:00 |
Thomas Tanghus
|
77b7f214d2
|
Load contactlist progressivly.
|
2012-06-27 22:44:28 +02:00 |
Bart Visscher
|
235515e84b
|
Something like this should do it for sharing contacts
|
2012-06-27 15:44:42 +02:00 |
Bjoern Schiessle
|
060a297260
|
enable highlighting of address in OSM.
|
2012-06-27 11:46:42 +02:00 |
Bjoern Schiessle
|
7af76e36e1
|
enable highlighting of address in OSM.
|
2012-06-27 11:41:52 +02:00 |
Thomas Tanghus
|
3edc40a68a
|
Load default categories if there are none,
|
2012-06-27 02:12:53 +02:00 |
Thomas Tanghus
|
823bef3a09
|
Ensure event handlers are being set when adding first contact.
|
2012-06-27 02:12:53 +02:00 |
Thomas Tanghus
|
afd9705283
|
Add check for return value.
|
2012-06-27 02:12:53 +02:00 |
Bart Visscher
|
b9e1033563
|
Basic framework for contacts sharing
|
2012-06-27 01:05:36 +02:00 |
Thomas Tanghus
|
cad282b73f
|
Added some error checking.
|
2012-06-26 18:15:24 +02:00 |
Thomas Tanghus
|
1b2d09f9ca
|
Added missing requesttoken.
|
2012-06-26 18:15:24 +02:00 |
Thomas Tanghus
|
d8b181cd84
|
Added error checking on all db queries.
|
2012-06-26 18:15:24 +02:00 |
Thomas Tanghus
|
db115429f7
|
Added createUser hook.
|
2012-06-26 18:15:24 +02:00 |
Thomas Tanghus
|
46e93168cd
|
Fix variable name.
|
2012-06-26 16:06:52 +02:00 |
Thomas Tanghus
|
bf756293c6
|
Added signals.
|
2012-06-26 05:26:50 +02:00 |
Thomas Tanghus
|
8df59852a4
|
Adjust pic width a bit.
|
2012-06-26 04:09:45 +02:00 |
Thomas Tanghus
|
b384d79bf8
|
Remove x-scrollbar from contacts list.
|
2012-06-25 23:32:03 +02:00 |
Thomas Tanghus
|
2ad93849ab
|
Idiot proof dialog ;-)
|
2012-06-25 19:33:51 +02:00 |
Thomas Tanghus
|
dc4b891327
|
Better visual feedback and prevent drop on self.
|
2012-06-25 18:24:15 +02:00 |
Thomas Tanghus
|
b8d6ad0431
|
Improve styling on draggables.
|
2012-06-25 18:24:15 +02:00 |
Thomas Tanghus
|
ef93bf223a
|
Try to conserve some memory. Should fix oc-1106 for master.
|
2012-06-25 17:26:44 +02:00 |
Thomas Tanghus
|
ad5aa5ac15
|
Try to conserve some memory. Should fix oc-1106 for stable4.
|
2012-06-25 17:16:34 +02:00 |
Thomas Tanghus
|
42a5cd21b9
|
Missing requesttoken.
|
2012-06-25 17:15:33 +02:00 |
Thomas Tanghus
|
56ed8ba70b
|
Select which address book to add a contact to. Fixes oc-1071.
|
2012-06-25 16:21:29 +02:00 |
Thomas Tanghus
|
052bd8efbb
|
Drag'n'Drop contacts between addressbook. Still needs some css magic.
|
2012-06-25 03:42:27 +02:00 |
Thomas Tanghus
|
e845e56749
|
Remove excessive debugging.
|
2012-06-24 22:25:32 +02:00 |
Thomas Tanghus
|
3afbc3d2dc
|
Add some DRYness to logging.
|
2012-06-24 22:25:32 +02:00 |
Thomas Tanghus
|
f10c51193b
|
Fixed function name.
|
2012-06-24 22:25:32 +02:00 |
Thomas Tanghus
|
0f9b9fa111
|
Remove unneeded parameter.
|
2012-06-24 16:07:18 +02:00 |
Thomas Tanghus
|
5393c0cfed
|
Click to select which address book to add to.
|
2012-06-24 16:03:10 +02:00 |
Thomas Tanghus
|
9e6d2f2f82
|
Improve prev/next selection on delete.
|
2012-06-24 15:07:44 +02:00 |
Brice Maron
|
b5e3e150eb
|
Correction of path looking for apps and css
|
2012-06-22 20:58:52 +00:00 |
Bart Visscher
|
96ec7a66bb
|
More session_write_close
|
2012-06-22 17:21:56 +02:00 |
Thomas Tanghus
|
1f06cdf81f
|
Small js fix.
|
2012-06-22 14:27:46 +02:00 |
Thomas Tanghus
|
07124ee38d
|
Cast translation to string.
|
2012-06-22 14:27:46 +02:00 |
Bart Visscher
|
82f39d3292
|
Contacts: Fix name and carddav-url encoding
|
2012-06-21 23:30:04 +02:00 |
Brice Maron
|
a5938e4e37
|
Merge branch 'master' into multi_app_dir
|
2012-06-21 20:19:31 +00:00 |
Thomas Tanghus
|
37d12144c2
|
Fix URL delimiter.
|
2012-06-21 22:03:57 +02:00 |
Thomas Tanghus
|
ad7154b344
|
Fix being able to link directly to contact, that I broke in other commit.
|
2012-06-21 22:02:17 +02:00 |
Brice Maron
|
e5c56b2433
|
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
|
10a0d5a46c
|
More changes for updating the contacts list.
|
2012-06-20 21:00:49 +02:00 |
Thomas Tanghus
|
dc8c188ffe
|
Better error checking.
|
2012-06-20 21:00:49 +02:00 |
Thomas Tanghus
|
426ed27be2
|
Make sure address books are shown even if empty.
|
2012-06-20 21:00:49 +02:00 |
Thomas Tanghus
|
0f1fe0b505
|
Log error as ERROR.
|
2012-06-20 21:00:49 +02:00 |
Thomas Tanghus
|
0b9a48b4b6
|
Re-add missing loadhandlers() call.
|
2012-06-19 14:56:21 +02:00 |
Thomas Tanghus
|
33aec973df
|
Loading of contacts was placed outside of $(document).ready() function.
|
2012-06-19 14:55:14 +02:00 |
Thomas Tanghus
|
e5feb4e1aa
|
Remove obsolete js.
|
2012-06-18 02:22:22 +02:00 |
Thomas Tanghus
|
73fd4c979a
|
Update js after contactlist change.
|
2012-06-18 02:21:29 +02:00 |
Thomas Tanghus
|
d8048414aa
|
Removed erroneous value attributes. Partial fix for oc-1029.
|
2012-06-18 00:39:38 +02:00 |
Thomas Tanghus
|
a4f53922c2
|
Removed erroneous value attributes. Partial fix for oc-1029.
|
2012-06-18 00:36:25 +02:00 |
Thomas Tanghus
|
cab4a634df
|
Save addressbook id to be able to rearrange contacts properly.
|
2012-06-17 23:14:02 +02:00 |
Thomas Tanghus
|
3efec3fde9
|
Make contact list fit in viewport.
|
2012-06-17 23:12:48 +02:00 |
Thomas Tanghus
|
ea4d8ccf70
|
Rearrange markup.
|
2012-06-17 23:12:11 +02:00 |
Thomas Tanghus
|
8337b30e43
|
Add thumbnail links so they are loaded when addressbook is expanded.
|
2012-06-17 23:09:25 +02:00 |
Thomas Tanghus
|
7d84c4741c
|
Use uasort instead of usort.
|
2012-06-17 21:50:49 +02:00 |
Thomas Tanghus
|
46a771d2e6
|
Sort addressbooks.
|
2012-06-17 21:47:15 +02:00 |
Thomas Tanghus
|
fb700de4a4
|
Add effect on addressbook show/hide.
|
2012-06-17 21:37:13 +02:00 |
Thomas Tanghus
|
9e4a41e9cb
|
Add effect on addressbook show/hide.
|
2012-06-17 21:34:56 +02:00 |
Thomas Tanghus
|
5a8f4b8783
|
Adjustments for inview handler etc.
|
2012-06-17 20:25:32 +02:00 |
Thomas Tanghus
|
b6b6d69158
|
Moved parsing to the controller and js to contacts.js.
|
2012-06-17 20:25:32 +02:00 |
Thomas Tanghus
|
2875901fc7
|
Obsolete language="Javascript".
|
2012-06-17 20:25:32 +02:00 |
Thomas Tanghus
|
91f5a1de39
|
Obsolete language="Javascript".
|
2012-06-17 20:25:32 +02:00 |
Thomas Tanghus
|
b1cfc99f63
|
Styled address book entries.
|
2012-06-17 20:25:32 +02:00 |
Thomas Tanghus
|
56d25d4d1b
|
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
|
92e35bd843
|
now a little less in template - more in ajax controller
|
2012-06-17 20:25:32 +02:00 |
Stephan Bergemann
|
7f485d1b20
|
contacts app now lists contacts sorted by expandable/collapsable addressbooks
|
2012-06-17 20:25:32 +02:00 |
Thomas Tanghus
|
4cbdd59859
|
Fix char encoding.
|
2012-06-16 18:38:20 +02:00 |
Thomas Tanghus
|
6642ef6a50
|
Fix string encoding probs.
|
2012-06-16 18:06:47 +02:00 |
Thomas Tanghus
|
effb6f1309
|
Update stylesheet for type=url.
|
2012-06-15 04:32:01 +02:00 |
Thomas Tanghus
|
8a68d09b0f
|
Use type=url for URL field.
|
2012-06-15 04:32:01 +02:00 |
Brice Maron
|
4753cc3ebd
|
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
|
96a3e28c2e
|
Cleanup code.
|
2012-06-14 23:05:31 +02:00 |
Thomas Tanghus
|
27ab6daeb0
|
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
|
47c03a0eff
|
Contacts: Fixes for CSRF.
|
2012-06-14 18:13:01 +02:00 |
Thomas Tanghus
|
3b58c7a407
|
Remove debug statements.
|
2012-06-14 18:03:50 +02:00 |
Thomas Tanghus
|
5b1a14f9ea
|
Contacts: Implement CSRF prevention.
|
2012-06-14 18:00:13 +02:00 |
Thomas Tanghus
|
756eb3548f
|
Use the right csrf token.
|
2012-06-14 13:23:12 +02:00 |
Michael Gapczynski
|
b5889d6ffe
|
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
|
3e339f3d66
|
Remove check for encryption.
|
2012-06-13 19:04:47 +02:00 |
Thomas Tanghus
|
613a122437
|
Remove check for encryption.
|
2012-06-13 19:03:34 +02:00 |
Thomas Tanghus
|
d33d599b1b
|
Remove debug statements.
|
2012-06-13 18:57:12 +02:00 |
Thomas Tanghus
|
bc1e8cb0a2
|
Contacts: implemented CSRF prevention.
|
2012-06-13 17:35:42 +02:00 |
Thomas Tanghus
|
cee9d400c0
|
Contacts: Final (for now) fix to encoding probs on import.
|
2012-06-12 12:33:37 +02:00 |
Thomas Tanghus
|
c44591e27a
|
Contacts: Final (for now) fix to encoding probs on import.
|
2012-06-12 12:32:37 +02:00 |
Thomas Tanghus
|
210b71502b
|
Fix copy/paste error.
|
2012-06-11 22:18:14 +02:00 |
Thomas Tanghus
|
e0a5e3e992
|
Fix js for missing address fields.
|
2012-06-11 22:15:56 +02:00 |
Thomas Tanghus
|
c75a7966de
|
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
|
2012-06-11 22:15:31 +02:00 |
Thomas Tanghus
|
ac11647d7a
|
Fix js for missing address fields.
|
2012-06-11 22:14:21 +02:00 |
Thomas Tanghus
|
4b86cbcb6f
|
Quick fix for index errors when not importing from files.
|
2012-06-11 22:14:21 +02:00 |
Thomas Tanghus
|
c75f9f9397
|
Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e
|
2012-06-11 22:14:21 +02:00 |
Thomas Tanghus
|
8af53829d5
|
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
|
2012-06-11 22:14:21 +02:00 |
Lukas Reschke
|
2b22c538c8
|
Make some apps compatible
|
2012-06-11 19:07:51 +02:00 |
Bjoern Schiessle
|
1d493a70e7
|
replace "=0D=0A" (\r\n) with a simple "\n" in vards during import
|
2012-06-11 18:13:12 +02:00 |
Bjoern Schiessle
|
739589f485
|
make sure that contact data are always utf8 encoded to avoid encoding problems
|
2012-06-11 16:26:21 +02:00 |
Lukas Reschke
|
c009bc4b87
|
Revert
|
2012-06-11 13:27:32 +02:00 |
Thomas Tanghus
|
74eece2620
|
Contacts: Fix NOTE also on add, not just save.
|
2012-06-11 12:56:41 +02:00 |
Thomas Tanghus
|
6d9947b3ff
|
Contacts: Fix NOTE also on add, not just save.
|
2012-06-11 12:55:54 +02:00 |
Lukas Reschke
|
6817a6b102
|
First try of implementing assignHTML
|
2012-06-11 12:45:07 +02:00 |
Thomas Tanghus
|
e79e18d866
|
Copy/paste error.
|
2012-06-11 02:40:55 +02:00 |
Thomas Tanghus
|
40f8419fdf
|
Contacts: 11th hour fix for invalid VCARD from CardDAV.
|
2012-06-10 20:56:55 +02:00 |
Thomas Tanghus
|
c898a8a6c9
|
Contacts: 11th hour fix for invalid VCARD from CardDAV.
|
2012-06-10 20:54:52 +02:00 |
Thomas Tanghus
|
746994c2be
|
Fixed merge conflict.
|
2012-06-10 12:59:36 +02:00 |
Thomas Tanghus
|
f90c8738ab
|
Contacts: Used non-existent var.
|
2012-06-10 12:48:39 +02:00 |
Thomas Tanghus
|
0f454215e7
|
Code cleanup.
|
2012-06-09 15:04:08 +02:00 |
Thomas Tanghus
|
59d16c5f9a
|
Contacts: Use POST instead of GET.
|
2012-06-09 15:02:23 +02:00 |
Thomas Tanghus
|
081e1874cb
|
Contacts: Use POST instead of GET.
|
2012-06-09 15:00:44 +02:00 |