friendica/friendica
6
2
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-09-22 22:42:30 +02:00
Code Issues Projects Releases 3 Packages Wiki Activity
21463 commits 3 branches 67 tags 250 MiB
Commit graph

21463 commits

This branch
This branch
All branches
Author SHA1 Message Date
Angristan
de99189325
 		chmod 777 is a bad practice 2018-04-13 20:54:02 +02: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
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
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
Hypolite Petovan
98c9aefcbb
 		Merge pull request #4813 from tobiasd/20180411-homeexample 
added example home css and html file
 2018-04-11 07:58:17 -04:00
Hypolite Petovan
fd92343f38
 		Merge pull request #4811 from tobiasd/20180411-lng3 
translation updates
 2018-04-11 07:55:57 -04:00
Tobias Diekershoff
c7969b2f52 more text 2018-04-11 11:25:16 +02:00
Tobias Diekershoff
df0430cb48 added example home css and html file 2018-04-11 11:03:18 +02:00
Tobias Diekershoff
ef8e984c62 noreply should not be translate-able in email addresses 2018-04-11 08:17:44 +02:00
Tobias Diekershoff
4fbea5088a translation updates 2018-04-11 08:02:38 +02:00
Michael Vogel
4a67bc60b0
 		Merge pull request #4808 from tobiasd/20180410-deis 
Updates to DE and IS translation
 2018-04-10 18:37:48 +02:00
Tobias Diekershoff
3119eabce5 IS translation THX Sveinn í Felli 2018-04-10 18:30:59 +02:00
Tobias Diekershoff
71218ecff9 DE translations THX Copiis 2018-04-10 18:30:17 +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
Hypolite Petovan
d6893a45fe
 		Merge pull request #4802 from Rudloff/feature/api_get_user 
api_get_user() should not return false right away if the number in the URL is not a valid user
 2018-04-10 05:28:56 -04:00
Pierre Rudloff
f3d98b2864 api_get_user() should not return false right away if the number in the URL is not a valid user 2018-04-10 10:46:10 +02:00
Tobias Diekershoff
799bd75fb2
 		Merge pull request #4801 from annando/ignore-callstack 
Ignore function "call_user_func_array" in the callstack
 2018-04-10 10:04:25 +02:00
Michael
ea9b4cc523 Ignore function "call_user_func_array" in the callstack 2018-04-10 05:55:36 +00:00
Michael Vogel
8faf5efcad
 		Merge pull request #4800 from tobiasd/20180410-lng 
Updates to the EN-GB, EN-US and FI-FI translations
 2018-04-10 07:34:53 +02:00