MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
14787 commits 3 branches 0 tags 96 MiB
Commit graph

14787 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roland Häder fda99e39c1
used ltrim() for removing (any) trailing space 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 21:22:05 +01:00
Roland Häder b97561e0c4
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 21:20:20 +01:00
Hypolite Petovan 632d77cfb1 Merge pull request #3251 from rabuzarus/20170320_-_fix_fbrowser 
Bugfix: fbrowser did insert 2 Pictures instead of only 1
 2017-03-25 16:13:31 -04:00
rabuzarus 8bbf43b9dd Remove the AjaxUpload element when jot modal is closed 2017-03-25 21:10:57 +01:00
Hypolite Petovan d78acd5408 Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons 2017-03-25 16:09:46 -04:00
Hypolite Petovan f6ef6f0c7a Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-03-25 16:09:10 -04:00
Hypolite Petovan 91eeb30bf9 Merge pull request #3265 from annando/1703-remove-linefeeds 
Remove unneeded linefeeds in HTML output
 2017-03-25 16:06:53 -04:00
Hypolite Petovan f1a75a57fe Merge pull request #3257 from annando/1703-gcontact 
Improved gcontact handling
 2017-03-25 15:35:41 -04:00
Michael 18a2b48d1d Remove unneeded linefeeds 2017-03-25 19:31:32 +00:00
Michael 585c2119d7 Remove the "call by reference" 2017-03-25 18:00:56 +00:00
Roland Häder 9ddb032bf2
strange that this curly brace didn't make it in. now it is, thanks to @annando 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 18:32:33 +01:00
Roland Häder 33fa1e79af
some spaces ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 18:32:21 +01:00
Michael 444de52859 Use of exceptions 2017-03-25 16:56:04 +00:00
Tobias Diekershoff 6e35c49cb9 Merge pull request #3263 from annando/1601-api-statuses-lookup 
More GNU Social compatibility for the API
 2017-03-25 16:26:21 +01:00
Tobias Diekershoff 81eec6b2b5 Merge pull request #3264 from annando/1703-avoid-api-error 
Avoid API error when calling "/api/friendica/profile/show"
 2017-03-25 16:25:20 +01:00
Michael adf9ed64bb Avoid API error when calling "/api/friendica/profile/show" 2017-03-25 14:16:21 +00:00
Roland Häder 66f5e104b1
and without self:: ;-( 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 15:13:38 +01:00
Roland Häder 952f2218ed
there is already $this->backend around, needs renaming 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 15:12:41 +01:00
Roland Häder 0e6b009425
fixed another parser error, opps 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 15:04:07 +01:00
Roland Häder fccdc63964
Opps, fixed parser error. indending was confusing here 
+ added much more curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 14:56:23 +01:00
Roland Häder 73ee285212
rewrote for() loop to foreach() + added curly braces/spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 14:33:59 +01:00
Roland Häder 006b4b88b2
Continued: 
- added curly braces/spaces
- converted multiple single-line comments into one multi-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 14:07:59 +01:00
Roland Häder 4d731dd838
Convention: 
- comment blocks with 2 stars at beinging are doc-tags, with only star is a
  regular multi-line comment
- added curly braces + spaces
- removed TODO, there needs to be a way of writing this better than using @

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:58:50 +01:00
Roland Häder a391ab9a99
was a bit confusing for me or I was not sleeping to much ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:46:51 +01:00
Roland Häder 89bd080e7e
don't kill when no result is found, this may break communication, thanks to @annando explaining it 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:42:09 +01:00
Roland Häder 6d5826e188
PHP5 does not support native type-hints, except array + used dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:38:11 +01:00
Roland Häder 83dec2f815
fixed indending + closed own internal todo: better usage of x() 
removed todo

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:37:46 +01:00
Roland Häder 48a1d97f46
closed internal TODO, added parentheses as this is a minimized if/else block 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:30:12 +01:00
Roland Häder b830d839f0
added a space 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:27:52 +01:00
Roland Häder 1d48801d70
Continued: 
- added spaces
- made a code block even

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:25:51 +01:00
Roland Häder 177a0c8320
Continued: 
- used dbm::is_result() to avoid E_WARNING when false is returned
- added curly braces + some spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:23:15 +01:00
Roland Häder e503141b0c
added spaces and curly braces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:18:39 +01:00
Roland Häder 67707247c8
Continued: 
- added curly braces/spaces
- changed lower-case SQL keywords to upper-case
- used dbm::is_result() instead of count() (avoids warning in case of false is
  returned)

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:15:42 +01:00
Roland Häder c1287df655
removed old-lost code + internal TODO closed 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:12:41 +01:00
Roland Häder fd468f20fd
merged 2 if() into one, closes internal TODO 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:08:56 +01:00
Roland Häder 47ae5a9a47
removed parentheses, added curly ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:07:33 +01:00
Roland Häder 2f5c796886
removed TODO, one day this all needs refacturizing ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:02:09 +01:00
Roland Häder 1514fdaead
rewrote to static approach and if() condition can be simplified. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:00:10 +01:00
Roland Häder d64dafec63
removed parentheses and indended it for better readability 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 12:55:39 +01:00
Roland Häder bd4cee8c21
added spaces/curly braces and TODO for better using trim() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 12:53:48 +01:00
Roland Häder a70a2381c9
removed old-lost code 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 12:49:17 +01:00
Roland Häder 506af8b556
changed "and" -> && according to CR 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 12:47:47 +01:00
Roland Häder 689b81171e
added spaces, removed parentheses. there is more ahead than just this one. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 12:44:24 +01:00
Michael a9dfd1fcb7 One more API call added 2017-03-25 11:31:31 +00:00
Michael 4665cda00e Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup 2017-03-25 11:25:47 +00:00
Tobias Diekershoff eb482c3acf Merge pull request #3262 from annando/1703-no-no-utf 
"no_utf" wasn't in use anymore - it is now removed completely
 2017-03-25 12:01:53 +01:00
Michael 0d49143a63 "no_utf" wasn't in use anymore - it is now removed completely 2017-03-25 10:51:00 +00:00
Michael a419bbe7c7 Hypolite is right (not always, but in this case) 2017-03-25 10:11:02 +00:00
Michael 5060300138 Reset the static variable $baseurl 2017-03-25 10:07:45 +00:00
Tobias Diekershoff 3b28f5a992 Merge pull request #3259 from Hypolite/issue/#3256 
Upgrade PHP-Markdown + enable hard_wrap
 2017-03-25 10:14:43 +01:00