a5baba84af
Only show the attachment elements if there are one.
2017-07-17 19:49:58 +00:00
1c8e74edce
Attachments now look fine.
2017-07-17 19:38:15 +00:00
f65d6531ca
Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
2017-07-15 10:36:56 +00:00
a58f9b3aaa
Merge pull request #3585 from annando/bugfix-like-signature
...
Bugfix: Signatures for likes hadn't been stored
2017-07-15 08:22:27 +02:00
2bad626be6
Bugfix: Signatures for likes hadn't been stored
2017-07-15 04:03:50 +00:00
b49a36f949
The attached image has now a class
2017-07-15 04:02:12 +00:00
Michael Vogel
db0efc3fa8
Merge pull request #3584 from tobiasd/20170714-missingstring
...
there was a string not marked for translation
2017-07-14 22:48:27 +02:00
b5f58d317e
there was a string not marked for translation
2017-07-14 15:21:08 +02:00
181947f774
Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
...
Conflicts:
include/text.php
2017-07-13 20:38:18 +00:00
86934119b1
Merge pull request #3580 from annando/issue-3571-2
...
Reworked "get_contact"
2017-07-13 08:34:59 +02:00
3334e0332d
Merge pull request #3582 from annando/duplicate-error
...
Avoid duplicate database errors when storing the conversations
2017-07-13 08:30:20 +02:00
e33a710d45
Merge pull request #3581 from annando/bugfix-markdown
...
Bugfix: Some special characters weren't converted correctly
2017-07-13 08:29:04 +02:00
4c7a197f4b
Avoid duplicate database errors when storing the conversations
2017-07-13 06:00:53 +00:00
beaa911bac
Bugfix: Some special characters weren't converted correctly
2017-07-13 05:57:37 +00:00
568abd537a
Fixed error reporting
2017-07-12 08:14:36 +00:00
Michael Vogel
cbca16de75
Merge pull request #3579 from tobiasd/20170712-de
...
DE translations
2017-07-12 08:29:10 +02:00
8654b028ec
DE translations
2017-07-12 08:26:26 +02:00
69f20959ff
Update existing contact records with data from probing
2017-07-12 06:07:22 +00:00
a47e1e13d7
Process all data that we can fetch via probing
2017-07-12 05:56:35 +00:00
a8db1282e2
Merge remote-tracking branch 'upstream/develop' into issue-3571-2
2017-07-12 05:41:58 +00:00
c54b7e84ab
Merge pull request #3578 from annando/probe-warning
...
Avoid "Invalid argument" warning in probing.
2017-07-12 07:21:31 +02:00
35b3723c4a
database logging now works for database errors
2017-07-11 19:14:49 +00:00
8ec7f1de56
Issue 3571: Reworked "get_contact" function
2017-07-11 18:32:35 +00:00
41ec057813
Avoid "Invalid argument" warning in probing.
2017-07-11 17:34:38 +00:00
81dedb3f92
Merge pull request #3577 from annando/2in1
...
Issue 3571 and Diaspora mail bugfix
2017-07-11 08:31:39 +02:00
Michael Vogel
ee015a249e
Merge pull request #3576 from tobiasd/20170710-messages
...
regenerated master messages.po file
2017-07-11 05:58:43 +02:00
363322ba78
Issue 3571 and Diaspora mail bugfix
2017-07-10 22:35:32 +00:00
e88a999a72
regenerated master messages.po file
2017-07-10 18:59:59 +02:00
Michael Vogel
896bf4046c
Merge pull request #3569 from tobiasd/20170702-delete
...
delete item from admin panel
2017-07-10 18:44:19 +02:00
Michael Vogel
ef3398f09a
Merge pull request #3573 from irhen/issue-3529-fix-mega-age
...
fix big age
2017-07-10 18:43:05 +02:00
dc41ac0f61
use drop_item and some magic
2017-07-10 14:55:40 +02:00
irhen
c6137ca0df
is empty check
2017-07-10 14:17:06 +03:00
6bbc1ac602
Merge pull request #3575 from annando/dfrn-update-copy
...
DFRN: Update the public item copy as well
2017-07-09 10:17:22 +02:00
5921fd03e5
Merge pull request #3574 from annando/further-expire-split
...
Split the delete process into a separate expire process
2017-07-09 10:15:34 +02:00
9f92fddb00
DFRN: Update the public item copy as well
2017-07-09 04:29:35 +00:00
Michael Vogel
6b1b02472a
Merge pull request #3570 from beardyunixer/boot
...
Fix/workaround weird load order issue.
2017-07-09 05:56:03 +02:00
Michael Vogel
0092cdef44
Merge pull request #3572 from deantownsley/contactfix_basic
...
Only delete uid=0 entries when cleaning up extra public entries
2017-07-09 05:55:19 +02:00
af181941db
Split the delete process into a separate expire process
2017-07-09 03:37:20 +00:00
irhen
534f79a5a5
fix big age
2017-07-08 23:30:30 +03:00
Michael Vogel
8863f0e234
Merge pull request #3554 from Alkarex/semaphore_warning
...
Hide semaphore warning
2017-07-08 18:32:07 +02:00
Thomas Willingham
11c5f471af
Fix/workaround weird load order issue.
2017-07-08 16:25:13 +01:00
Dean Townsley
11d271f3c5
Only delete uid=0 entries when cleaning up extra public entries
...
This delete can inadvertently remove contacts from normal users under
some conditions. Since it appears to be intended to only operate on
"public" (uid=0) contacts, this change constrains the delete query to
only uid=0 records.
2017-07-08 09:55:40 -05:00
Alexandre Alapetite
080da4777d
Use unset after unlock
...
https://github.com/friendica/friendica/pull/3554#issuecomment-313741392
2017-07-08 11:03:41 +02:00
d88584af69
Merge pull request #3567 from rjm6823/develop
...
Contacts page directory link
2017-07-08 08:36:54 +02:00
9304bb6422
Typos
2017-07-07 20:54:26 +02:00
56a57aaca4
Merge pull request #3564 from annando/1707-expire
...
Split expire.php in several processes / small worker changes
2017-07-07 19:47:22 +02:00
Michael Vogel
512e58a7db
Merge pull request #3568 from tobiasd/20170707-esde
...
DE and ES translations
2017-07-07 18:56:26 +02:00
Alexandre Alapetite
84972623f7
Order of semaphore processing
2017-07-07 18:26:43 +02:00
Alexandre Alapetite
3bb77d2686
Merge branch 'develop' into semaphore_warning
2017-07-07 17:49:52 +02:00
aabde5422b
allow the admin to delete an item by GUID from the admin panel
2017-07-07 10:38:07 +02:00
