Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-11 23:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
19725 commits 3 branches 64 tags 246 MiB
Commit graph

19725 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roland Haeder
77cca70562
replaced some tabs -> spaces + added curly braces #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:56 +02:00
Roland Haeder
128c9b20e0
fixed curly braces + added more 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
e61b8f667e
it is documenation, right? :-) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
09384119b1
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
c7e256f9de
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
1a61cee5a7
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
f7ceea7a85
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
1de8e31df6
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
5b56f189ae
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:54 +02:00
Roland Häder
bc259cdc44
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:54 +02:00
Hypolite Petovan
dd4af5aba7
Merge pull request #5045 from tobiasd/20180514-msg 
regenerated master messages.po file
 2018-05-14 08:15:01 -04:00
Tobias Diekershoff
348ed5d1ba regenerated master messages.po file 2018-05-14 07:12:04 +02:00
Michael
f1b5e828db Fix for the slow spawning of workers 2018-05-14 05:02:18 +00:00
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