friendica/friendica
6
2
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-09-22 09:40:54 +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
Hypolite Petovan
f937dabc9e
 		Merge pull request #5044 from annando/no-feed-reshare 
We mustn't reshare a feed item (only DFRN and Diaspora)
 2018-05-13 18:31:58 -04:00
Michael Vogel
24ef818d0d
 		Merge pull request #5038 from tobiasd/20180519-3834 
dont delete but remove from your stream
 2018-05-13 22:24:59 +02:00
Michael
57bd073ffd We mustn't reshare a feed item (only DFRN and Diaspora) 2018-05-13 18:31:01 +00:00
Hypolite Petovan
3228bb614c
 		Merge pull request #5037 from Quix0r/rewrites/curly-braces-is-result-usage-001 
Rewrites/curly braces is result usage 001
 2018-05-13 10:05:38 -04:00
Hypolite Petovan
288b508e2a
 		Merge pull request #5041 from M-arcus/patch-1 
[TASK] Automatic installation: Install theme
 2018-05-13 10:03:11 -04:00
Hypolite Petovan
cc7ce61e2d
 		Merge pull request #5040 from tobiasd/20180513-lng 
FI and PL translation updates
 2018-05-13 09:59:29 -04:00
Roland Häder
99440f3c56
 		Beatification: 
- added space after curly braces (MrPetovan)
- added TODO for possible rewrite candidate

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 14:21:53 +02:00
Marcus Müller
64a799198a
 		[TASK] Automatic installation: Install theme 2018-05-13 12:50:53 +02:00
Tobias Diekershoff
2a75c7aa00 update FI translations THX Kris 2018-05-13 12:02:09 +02:00
Tobias Diekershoff
78330c44a8 update PL translations THX waldis 2018-05-13 12:01:25 +02:00
Tobias Diekershoff
17dda0fc43 dont delete but remove from your stream 2018-05-13 11:10:34 +02:00
Hypolite Petovan
ec626fb76c
 		Merge pull request #5036 from Alkarex/fix-constants 
Fix wrong use of class constants
 2018-05-13 04:38:32 -04:00
Alexandre Alapetite
736c76d068 Simplify constant names 
https://github.com/friendica/friendica/pull/5036#discussion_r187792865
 2018-05-13 10:34:33 +02:00
Roland Häder
87dbe03521
 		reverted back ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:20:15 +02:00
Alexandre Alapetite
41a8c62bee Fix wrong use of class constants 
http://php.net/manual/language.oop5.constants.php
 2018-05-13 10:07:15 +02:00
Roland Häder
445cc1cb99
 		Fixes: 
- brought back comment (ops)
- DBM is the class name (not dbm)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:06:43 +02:00
Roland Häder
8d9547777e
 		Ops, was redundant here. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:05:31 +02:00
Roland Häder
594f946ad6
 		No extra empty line here 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:04:49 +02:00
Roland Häder
3191fee763
 		Ops, one to much ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:02:47 +02:00
Hypolite Petovan
97ef838abe
 		Merge pull request #5035 from annando/no-optimize 
Automatic table optimisation is deactivated by default now
 2018-05-13 01:55:09 -04:00
Michael
249d84c0b3 Automatic table optimisation is deactivated by default now 2018-05-13 05:41:05 +00:00
Hypolite Petovan
37da0ccf9e
 		Merge pull request #5032 from tobiasd/20180512-lng 
DE, FI and PL translation updates
 2018-05-12 05:45:38 -04:00
Tobias Diekershoff
f34ee8f858 update FI translations THX Kris 2018-05-12 10:36:59 +02:00
Tobias Diekershoff
75982db524 update PL translations THX waldis 2018-05-12 10:36:18 +02:00
Tobias Diekershoff
2435388aa7 update DE translations 2018-05-12 10:35:32 +02:00
Hypolite Petovan
ee143e32d1
 		Merge pull request #5031 from annando/fix-sql 
Avoid SQL error with empty "bd" field
 2018-05-11 15:43:23 -04:00
Michael
926c9719e0 Avoid SQL error with empty "bd" field 2018-05-11 15:27:19 +00:00
Hypolite Petovan
d4e3f3f4bb
 		Merge pull request #5030 from annando/fix-sql 
Fix SQL error during postupdate
 2018-05-11 11:20:30 -04:00
Michael
79a343a69a Only set the "updated" value when it contains a value 2018-05-11 10:44:28 +00:00
Michael
f9c695e78d Fix SQL error during postupdate 2018-05-11 09:20:59 +00:00
Tobias Diekershoff
a2dbf17a3d
 		Merge pull request #5028 from annando/probe-insert 
Insert a gcontact on probing, but not insert a contact
 2018-05-11 10:26:32 +02:00
Michael
8d8f2a1845 Change the community value as well 2018-05-11 08:04:01 +00:00
Michael
78271e88f5 Insert a gcontact on probing, but not insert a contact 2018-05-11 05:44:31 +00:00
Hypolite Petovan
ce0c31a594
 		Merge pull request #5024 from annando/invisible-posts 
Fix: Public items werent visible under certain circumstances
 2018-05-10 19:31:05 -04:00
Michael
914a4e2e0a Fix: Public items werent visible under certain circumstances 2018-05-10 22:06:34 +00:00
Hypolite Petovan
0b4c831740
 		Merge pull request #5023 from annando/dba-error 
Fix SQL error
 2018-05-10 16:27:31 -04:00
Pierre Rudloff
6a654df444 Add a new contact to test rel=2 in tests 
See https://github.com/friendica/friendica/pull/5022#discussion_r187416029
 2018-05-10 22:21:55 +02:00
Michael
3d2bc7700e Fix SQL error 2018-05-10 20:14:51 +00:00
Pierre Rudloff
7893d96ad8 Add link to test doc on documentation home 2018-05-10 20:04:30 +02:00
Pierre Rudloff
3195d6e125 Add API tests 2018-05-10 19:12:00 +02:00
Hypolite Petovan
4d5408f3b1
 		Merge pull request #5018 from annando/issue-4997 
Issue 4997: Avoid database duplicates
 2018-05-10 09:53:37 -04:00
Michael
6d4f3e8ee2 Issue 4997: Avoid database duplicates 2018-05-10 12:49:28 +00:00
Hypolite Petovan
09a2c1d76b
 		Merge pull request #5017 from annando/dfrn-relay 
Adopt the relay definition according to the suggestions from @jaywink
 2018-05-10 08:18:53 -04:00
Hypolite Petovan
86ac44bd4e
 		Merge pull request #5016 from annando/fix-blocked 
Corrects falsely blocked contacts because of some bug in the develop branch
 2018-05-10 08:18:04 -04:00
Hypolite Petovan
68591e2179
 		Merge pull request #5015 from annando/issue-4772 
Issue 4772: Display posts with uid=0 as well
 2018-05-10 08:17:27 -04:00
Roland Häder
5debcbb5a6
 		added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-10 13:07:22 +02:00
Roland Häder
cf9fa51f2f
 		Continued: 
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-10 13:07:21 +02:00
Roland Häder
f66cb9b0a3
 		added more curly braces + a bit more usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-10 13:07:21 +02:00
Michael
40d3e7982c Adopt the relay definition according to the suggestions from @jaywink 2018-05-10 11:04:18 +00:00
Michael
aafc314ccc Corrects falsely blocked contacts because of some bug in the develop branch 2018-05-10 10:41:32 +00:00