Commit Graph

18888 Commits

Author SHA1 Message Date
Tobias Diekershoff 9cb2369c15 update to the FI translation THX Kris 2018-04-18 07:57:16 +02:00
Tobias Diekershoff fda5ad647d
Merge pull request #4857 from annando/duplicated-tags
Avoid duplicated multibyte tags
2018-04-18 07:50:56 +02:00
Tobias Diekershoff 596b934a02
Merge pull request #4858 from annando/issue-4655
Issue 4655: Avoid multiplicated contact requests from the same account
2018-04-18 07:50:34 +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
Hypolite Petovan 961a6d29a9
Merge pull request #4856 from annando/dandelion
better support for the Diaspora app "Dandelion"
2018-04-17 12:50:06 -04:00
Michael 229d8eb0e9 better support for the Diaspora app "Dandelion" 2018-04-17 16:46:57 +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 7b6d1e1ab3
Merge pull request #4853 from annando/site-defaults
Default values for site configuration
2018-04-17 10:12:11 +02:00
Michael Vogel 865c7f79b9
Merge pull request #4852 from tobiasd/20180417-fi
update to the FI translation THX Kris
2018-04-17 07:24:48 +02:00
Michael e5583591d7 Default values for site configuration 2018-04-17 05:18:26 +00:00
Tobias Diekershoff 6f7de87088 update to the FI translation THX Kris 2018-04-17 07:17:46 +02:00
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
Hypolite Petovan e590610eee
Merge pull request #4848 from tobiasd/20180416-tos2
display the thing
2018-04-16 07:35:59 -04: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 H3 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 H3 eb01c61a56
Update Account-Basics.md 2018-04-13 21:41:41 +07:00
Andy H3 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 H3 62102cad74
Update Accesskeys.md 2018-04-13 12:29:10 +07:00
Andy H3 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 H3 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