nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
18893 commits 2 branches 55 tags 148 MiB
Commit graph

1032 commits

Author SHA1 Message Date
Michael da06416426 Merge remote-tracking branch 'upstream/develop' into dfrn-reshare 2018-04-19 05:44:06 +00:00
Tobias Diekershoff fda5ad647d
Merge pull request #4857 from annando/duplicated-tags 
Avoid duplicated multibyte tags
 2018-04-18 07:50:56 +02:00
Michael 8a730b2d85 Issue 4655: Avoid multiplicated contact requests from the same account 2018-04-18 05:02:59 +00:00
Michael ed87e634ed Avoid duplicated multibyte tags 2018-04-18 05:00:28 +00:00
Michael f99af007ae Replaced queries 2018-04-18 04:59:33 +00:00
Michael 88353ce56f Merge remote-tracking branch 'upstream/develop' into dfrn-reshare 2018-04-18 03:12:13 +00:00
Hypolite Petovan 6d2d15a80d
Merge pull request #4782 from Alkarex/fix-update-password 
Fix update password rehash
 2018-04-17 07:25:52 -04:00
Tobias Diekershoff 72a2896d1f profile data is transmitted to other nodes 2018-04-16 09:27:16 +02:00
Michael 6eba2ccd9b Forum posts now show the author when posted to Diaspora 2018-04-15 19:01:19 +00:00
Alexandre Alapetite 360e2e6342 Revert removal of legacy_password column 
https://github.com/friendica/friendica/pull/4782#issuecomment-380978218
 2018-04-15 11:12:32 +02:00
Alexandre Alapetite 991a3d959e Revert "Remove SQL column legacy_password" 
This reverts commit 82f1f2f00e.
 2018-04-15 10:51:22 +02:00
Michael a53f01bacc Update the "photo" and "thumb" field in the "profile" table 2018-04-14 08:03:15 +00:00
Michael ce7f451196 Don't show multiple calls from the "dba" class to show the essential parts of the callstack 2018-04-13 20:09:12 +00:00
Marcus Müller f9c34fee5a
[BUGFIX] Network: Remove URL/domain DNS_PTR checks 2018-04-12 19:28:52 +02:00
Michael 4fd4d277f0 Store in lowercase to avoid duplicates 2018-04-12 08:55:36 +00:00
Michael e83e31a968 Merge remote-tracking branch 'upstream/develop' into issue-4816 2018-04-12 08:53:56 +00:00
Hypolite Petovan 9d928417a1
Merge pull request #4817 from annando/relais-duplicates 
Avoid sending relay posts to servers that already received content
 2018-04-11 19:00:34 -04:00
Michael 88eaef6704 Merge branch 'issue-4816' of github.com:annando/friendica into issue-4816 2018-04-11 19:21:23 +00:00
Michael edcf1466a7 Relay: Avoid sending relay posts to servers that already received content 2018-04-11 19:01:25 +00:00
Michael 75f97db4ec Issue-4816: Avoid SQL errors / Unarchive living relais servers 2018-04-11 18:56:22 +00:00
Tobias Diekershoff 0cab448ba1 make it unreadable... almost 2018-04-11 14:12:53 +02:00
Tobias Diekershoff ef8e984c62 noreply should not be translate-able in email addresses 2018-04-11 08:17:44 +02:00
Tobias Diekershoff 9d5abaca1c
Merge pull request #4807 from annando/archival-days 
We can now define the days after a contact is archived
 2018-04-10 14:34:18 +02:00
Michael 869d8ab12d We can now define the days after a contact is archived 2018-04-10 11:10:02 +00:00
Tobias Diekershoff eaff717696
Merge pull request #4806 from MrPetovan/task/improve-strikethrough-support 
[BBCode] Improve support for strikethrough
 2018-04-10 12:44:40 +02:00
Hypolite Petovan 369518e7b6 [BBCode] Improve support for strikethrough 2018-04-10 06:23:40 -04:00
Michael ea9b4cc523 Ignore function "call_user_func_array" in the callstack 2018-04-10 05:55:36 +00:00
Hypolite Petovan c7ad76f9ab Prevent empty $uid from messing up the PreloadConfigAdapter 2018-04-09 21:24:22 -04:00
Michael 08abf65f7b Old database functions had been replaced in the workers 2018-04-09 21:34:23 +00:00
Michael 105f3ca747 Relay: Avoid empty tags / Always use the "relay account" 2018-04-09 05:53:23 +00:00
Michael 5c2b54009e The magic link is added at more places 2018-04-08 19:17:50 +00:00
Alexandre Alapetite e860cdf6a8 Swap if / elseif 
https://github.com/friendica/friendica/pull/4782#discussion_r179947984
 2018-04-08 16:02:25 +02:00
Alexandre Alapetite 82f1f2f00e Remove SQL column legacy_password 2018-04-08 14:53:12 +02:00
Alexandre Alapetite cb26cd6d5d Remove legacy_password test 2018-04-08 14:42:18 +02:00
Alexandre Alapetite 129f6806f6 Fix update password rehash 
Fixes https://github.com/friendica/friendica/issues/4743
The logic for updating password was wrong:
b0a764b14c (diff-1466bb1a0a37fe9f7cf52eda8f3b431aR150)
 2018-04-08 12:40:35 +02:00
Michael a75858f02c Don't queue relay posts 2018-04-08 09:46:47 +00:00
Pierre Rudloff b3235c2d02 Implement parts of the list API: 
lists/statuses
lists/destroy
lists/update
lists/create
lists/ownerships
 2018-04-07 19:16:47 +02:00
Michael d0dfe2aa64 Fix: Empty answers in DFRN can be okay 2018-04-07 10:02:43 +00:00
Michael Vogel 5af9fa0be1
Merge pull request #4764 from MrPetovan/bug/4755-use-sender-header-invite 
Use Sender: header for invite emails
 2018-04-07 08:31:14 +02:00
Michael Vogel 29d18a7ed7
Merge pull request #4765 from MrPetovan/bug/4730-fix-profile-list 
Fix contact profile visibility list
 2018-04-07 08:23:32 +02:00
Hypolite Petovan 37505f8f28 Fix variable name typo in ContactSelector::profileAssign 2018-04-06 21:54:53 -04:00
Hypolite Petovan 7413dc62f0 Remove trailing whitespaces in Content\ContactSelector 2018-04-06 21:54:22 -04:00
Hypolite Petovan a86d1806ae Add App->getSenderEmailAddress method 2018-04-06 21:47:16 -04:00
Hypolite Petovan 8b5341b84c Fix event id typo in Model\Event 2018-04-06 20:58:09 -04:00
Michael 8d68e865c1 Fixes warning "missing terminating ] for character class" 2018-04-06 09:11:10 +00:00
Michael Vogel 05cff59f70
Merge pull request #4722 from MrPetovan/task/add-content_filter-hook 
Add content_filter hook
 2018-04-06 06:42:52 +02:00
Michael 4a909fcfcf Bugfix: The rendering with images with width and height was broken 2018-04-05 06:01:36 +00:00
Hypolite Petovan 34fd442821 Rename social.disable_cw pconfig to system.disable_cw 2018-04-04 23:08:48 -04:00
Hypolite Petovan 41db5f0912 Display content warning as title if collapsing is deactivated 2018-04-04 23:08:48 -04:00
Michael 08c85c425b Added support of alt texts in images 2018-04-04 22:23:17 +00:00