Commit graph

18929 commits

Author SHA1 Message Date
Hypolite Petovan 0334e49d8e
Merge pull request #4850 from tobiasd/20180416-newinfo
new info mail address
2018-04-16 14:35:57 -04:00
Tobias Diekershoff 150843af5f new info mail address 2018-04-16 17:28:19 +02:00
Marcus Müller 791071a1c6
[CLEANUP] Code: Remove function 2018-04-16 14:56:02 +02:00
Hypolite Petovan e590610eee
Merge pull request #4848 from tobiasd/20180416-tos2
display the thing
2018-04-16 07:35:59 -04:00
Marcus Müller 03748ddd64
[FEATURE] Install Script: Add first version 2018-04-16 10:57:27 +02:00
Tobias Diekershoff f3c8631cbd display the thing 2018-04-16 10:25:39 +02:00
Michael Vogel d5fd87232e
Merge pull request #4847 from tobiasd/20180416-tos
profile data is transmitted to other nodes
2018-04-16 10:12:17 +02:00
Tobias Diekershoff 72a2896d1f profile data is transmitted to other nodes 2018-04-16 09:27:16 +02:00
Michael Vogel 072d446c95
Merge pull request #4846 from tobiasd/20180416-lng
update to the PL translation THX waldis
2018-04-16 08:50:47 +02:00
Tobias Diekershoff 537394e45c update to the PL translation THX waldis 2018-04-16 07:09:08 +02:00
Hypolite Petovan 12a71f0155
Merge pull request #4845 from annando/diaspora-forums
Forum posts now show the author when posted to Diaspora
2018-04-15 16:35:30 -04:00
Michael 6eba2ccd9b Forum posts now show the author when posted to Diaspora 2018-04-15 19:01:19 +00:00
Hypolite Petovan c7e6d229ec
Merge pull request #4842 from tobiasd/20180415-deluser
notify admin when user deletes account
2018-04-15 06:41:44 -04:00
Tobias Diekershoff d149541dba notify admin when user deletes account 2018-04-15 11:39:05 +02: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
Hypolite Petovan e7680a40d4
Merge pull request #4840 from AndyHee/doc20180413
Update Making-Friends.md
2018-04-14 07:50:08 -04:00
Andy H c039c30837
Update Making-Friends.md
Major changes to some outdated sections. 
Minor improvements, elsewhere.
2018-04-14 16:27:49 +07:00
Tobias Diekershoff aa99cab918
Merge pull request #4839 from annando/profile-update
Update the "photo" and "thumb" field in the "profile" table
2018-04-14 11:04:33 +02:00
Michael a53f01bacc Update the "photo" and "thumb" field in the "profile" table 2018-04-14 08:03:15 +00:00
Hypolite Petovan ca614db66a
Merge pull request #4837 from annando/improved-callstack
Don't show multiple calls from the "dba" class
2018-04-13 20:26:41 -04: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
Tobias Diekershoff 7f51284471
Merge pull request #4834 from AndyHee/doc20180413
Update Account-Basics.md
2018-04-13 17:01:12 +02:00
Andy H eb01c61a56
Update Account-Basics.md 2018-04-13 21:41:41 +07:00
Andy H 8686c12478
Update Account-Basics.md
Minor changes to wording + rm dead link
2018-04-13 21:25:16 +07:00
Hypolite Petovan 60e8ada6d6
Merge pull request #4824 from M-arcus/patch-1
[BUGFIX] DB: Don't check DNS on IPs
2018-04-13 07:41:33 -04:00
Michael Vogel ce24c01ada
Merge pull request #4829 from tobiasd/20180413-lng
update to the FI translation THX Kris
2018-04-13 11:43:41 +02:00
Tobias Diekershoff ab8ed767bb
Merge pull request #4827 from AndyHee/doc20180413
Update Accesskeys.md
2018-04-13 10:02:02 +02:00
Marcus Müller 3761797e5f
Merge branch 'develop' into patch-1 2018-04-13 09:41:24 +02:00
Andy H 62102cad74
Update Accesskeys.md 2018-04-13 12:29:10 +07:00
Andy H 84d2906bb0
Update Accesskeys.md 2018-04-13 12:27:19 +07:00
Tobias Diekershoff 27267d8e63 update to the FI translation THX Kris 2018-04-13 07:21:05 +02:00
Tobias Diekershoff 053cad1de5 update to the NL translation THX Karel 2018-04-13 07:20:36 +02:00
Andy H 145efbda7a
Update Accesskeys.md
Expand intro
Format keys,
Capitalization
Style
Line breaks
2018-04-13 11:03:22 +07:00
Hypolite Petovan 966ebc7a5b
Merge pull request #4825 from M-arcus/patch-3
[BUGFIX] Domain Check: Remove DNS_PTR from check
2018-04-12 19:48:09 -04:00
Michael Vogel c882dc8baf
Merge pull request #4823 from rabuzarus/20180412_-_enable_remote_user_if_local_user
local_user() could also be a remote_user()
2018-04-12 23:43:43 +02:00
Marcus Müller 89ba3b78ff
[BUGFIX] DB: Remove host DNS_PTR check
DNS_PTR checks fail on some domains and result in the return value `false`, even if the domain is valid and reachable.
2018-04-12 19:32:04 +02:00
Marcus Müller f9c34fee5a
[BUGFIX] Network: Remove URL/domain DNS_PTR checks 2018-04-12 19:28:52 +02:00
Marcus Müller e382dfcfbd
[BUGFIX] DB: Don't check DNS on IPs
Fixes https://github.com/friendica/friendica/issues/4786
2018-04-12 19:14:53 +02:00
rabuzarus 130e16968e local_user() could also be a remote_user() 2018-04-12 17:10:48 +02:00
Hypolite Petovan 33d60efd8e
Merge pull request #4822 from annando/issue-4816
Issue-4816: Avoid SQL errors / Unarchive living relais servers
2018-04-12 07:13:27 -04:00
Michael Vogel 7e004aab9b
Merge pull request #4821 from tobiasd/20180412-lng
DE and NL translation updates THX Karel and S.Krumbholz
2018-04-12 11:03:49 +02:00
Michael Vogel d372014d2e
Merge pull request #4820 from tobiasd/20180412-contactreason
added missiing information to theme templates
2018-04-12 11:03:12 +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
Tobias Diekershoff 9cadee1d32 DE and NL translation updates THX Karel and S.Krumbholz 2018-04-12 10:41:49 +02:00
Tobias Diekershoff 00311af79b added missiing information to theme templates 2018-04-12 10:33:28 +02: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
Hypolite Petovan d934425d62
Merge pull request #4812 from tobiasd/20180411-noreply
noreply should not be translate-able in email addresses
2018-04-11 18:59:17 -04:00
Michael 88eaef6704 Merge branch 'issue-4816' of github.com:annando/friendica into issue-4816 2018-04-11 19:21:23 +00:00