Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 08:22:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
13751 commits 3 branches 64 tags 246 MiB
Commit graph

13751 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
1f93024ed6 Workaround for vanished database connections while authentication 2016-12-20 15:59:28 +01:00
Tobias Diekershoff
d4c3dcf2fc Merge pull request #3032 from annando/1612-auth-ejabber 
Workaround for vanished database connections while authentication
 2016-12-20 15:45:18 +01:00
Tobias Diekershoff
cc16369b6f Merge pull request #3033 from annando/1612-object-type 
The object type "photo" is deprecated and was replaced by "image"
 2016-12-20 15:44:07 +01:00
Tobias Diekershoff
c1193c9c13 Merge pull request #3034 from annando/1612-no-archive 
Only distribute items to active contacts
 2016-12-20 15:42:41 +01:00
Roland Häder
4f26bee453 Changed $a->get_baseurl() to App::get_baseurl() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:45:36 +01:00
Roland Häder
b69d82e64c Continued a bit: 
- added more curly braces around conditional blocks
- added space between "if" and brace
- aligned "=>" (will do with more if wanted)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:42:10 +01:00
Roland Häder
a883514604 Opps, forgot this ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:38:23 +01:00
Roland Häder
a25b628286 added curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:36:09 +01:00
Roland Häder
ace8f753ac added much more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/events.php
	mod/network.php
	mod/suggest.php
	mod/uexport.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
 2016-12-20 11:59:13 +01:00
Roland Häder
5f41375ad3 Continued: 
- added curly braces + spaces
- added todo about testing empty/non-empty strings

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:41:20 +01:00
Roland Häder
fc9dbc0899 added spaces + curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:38:28 +01:00
Roland Häder
f3529e7dbc added spaces + curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:36:27 +01:00
Roland Häder
2e908ebbbf added more curly braces + fixed space->tab for code indentation. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:33:42 +01:00
Roland Häder
4780df394d added curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/notify.php
 2016-12-20 11:28:39 +01:00
Roland Häder
fd0e2a9406 added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:22:22 +01:00
Roland Häder
fa444f373c added curly braces + space between "if" and brace + added missing @param 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:19:23 +01:00
Roland Häder
e05a8e9974 added curly braces + space between "if" and brace + added TODO 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:15:15 +01:00
Roland Häder
6ab84bf520 added curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:04:53 +01:00
Roland Häder
40dc3774e4 Also here (was committed in other branch, too. :-( ) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:02:57 +01:00
Roland Häder
a9bed1422e added more curyl braces + spaces between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:44:59 +01:00
Roland Häder
4dfe64bd5a Coding convention: 
- added curly braces
- added space between "if" and brace
- also added TODO (old-lost code?)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:40:17 +01:00
Roland Häder
65e1cd728c Coding convention: 
- added curly braces
- added space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:40:09 +01:00
Roland Häder
abff6372dd Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/lock.php
 2016-12-20 10:12:31 +01:00
Michael
4c77ae2fe9 Only distribute items to active contacts 2016-12-20 07:13:22 +00:00
Michael
6e46987515 The object type "photo" is deprecated and was replaced by "image" 2016-12-20 07:10:47 +00:00
Michael
75711a947e Workaround for vanished database connections while authentication 2016-12-20 07:08:03 +00:00
Hypolite Petovan
81d003cad1 Diaspora: Complete /people/* links from fcontact or author domain 2016-12-19 23:30:50 -05:00
Hypolite Petovan
403d1f987f proxy_url: Fix extension extraction for URLs containing a . after a ? 2016-12-19 20:19:26 -05:00
Roland Häder
884f44ce94 *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:27:16 +01:00
Roland Häder
c43389f79a No more needed ... util/typo.php is there. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:23:09 +01:00
Roland Häder
e06cac420b Use [] instead of test. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:23:09 +01:00
Roland Häder
7f1da5b1a9 added lint.sh which needs to be executed like this: 
$ ./util/lint.sh

No parameters needed. It will use "php -l" (current interpreter) for checking
for syntax errors in all PHP scripts.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:23:09 +01:00
Roland Häder
4615f39836 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-19 14:21:26 +01:00
Michael Vogel
52f12ee28d Merge pull request #3010 from Quix0r/rewrites/mixed-static-object-reference-calls 
Rewrites: mixed static object reference calls (and very sadly more ...)
 2016-12-19 14:12:50 +01:00
Michael Vogel
cae6a0c9fb Merge pull request #3026 from tobiasd/20161219-lng 
DE translation of the core
 2016-12-19 14:09:57 +01:00
Tobias Diekershoff
85dec3cf30 DE translation of the core 2016-12-19 12:22:47 +01:00
Roland Häder
ff569756ee Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/follow.php
 2016-12-19 09:40:34 +01:00
Michael Vogel
fd1afcbd35 Merge pull request #3025 from tobiasd/20161219-messagespo 
regenerated master messages.po file
 2016-12-19 08:40:49 +01:00
Tobias Diekershoff
5507a2caeb regenerated master messages.po file 2016-12-19 07:47:52 +01:00
Tobias Diekershoff
6aba536957 Merge pull request #3023 from annando/1612-attachment-link 
Bugfix: Reimported Friendica posts from pump.io had the links missing.
 2016-12-19 07:44:42 +01:00
Tobias Diekershoff
5a4c5ac8f7 Merge pull request #3024 from beardyunixer/develop 
This error message had me confused for about twenty minutes.  I couldn't
 2016-12-19 07:44:10 +01:00
Thomas Willingham
a58d8d2c71 This error message had me confused for about twenty minutes. I couldn't 
figure out what was wrong with my imagick install that would make it give
me an orange button if it was installed.  Of course, the problem was that
it wasn't installed, and the message was worded badly.  This is a bit less
confusing.
 2016-12-19 00:10:11 +00:00
Michael
8cab220387 Bugfix: Reimported Friendica posts from pump.io had the links missing. 2016-12-18 23:39:44 +00:00
Tobias Diekershoff
b3fa0a4e90 Merge pull request #3022 from annando/1612-ostatus-follow2 
Ostatus: The follow/unfollow XML should now be even more compliant.
 2016-12-18 22:27:02 +01:00
Michael
3f6fd4bf84 Mastodon: Hopefully we can now detect reshares better 2016-12-18 20:34:34 +00:00
Michael
a8e80ef0a6 Ostatus: The follow/unfollow XML should now be even more compliant. 2016-12-18 20:02:13 +00:00
Tobias Diekershoff
463a80e91d Merge pull request #3021 from annando/1612-ostatus-follow 
OStatus: Follow/Unfollow should now work again.
 2016-12-18 19:11:34 +01:00
Michael
099f51c7b5 Removal of test code 2016-12-18 17:36:48 +00:00
Michael
bc323b0bfa OStatus: Follow/Unfollow should now work again. 2016-12-18 17:10:38 +00:00
Tobias Diekershoff
e92135a2dc Merge pull request #3014 from annando/1612-missing-self-contact 
Create missing self contact
 2016-12-15 18:44:44 +01:00