clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,202 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

15202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hypolite Petovan 8db4437ed7 Restores bold text for text dropdown button 2017-03-25 21:33:34 -04:00
Hypolite Petovan fa9ce4721a Fix superfluous comment box top margin 2017-03-25 21:29:13 -04:00
Hypolite Petovan c01c7ad746 Fix .btn-link hover/focus color 2017-03-25 21:28:53 -04:00
Hypolite Petovan 5b7c8d8631 Fix indent in search_item.tpl 2017-03-25 20:45:03 -04:00
Hypolite Petovan 359c246ef9 Various fixes 
- Removed superfluous CSS rule
- Fixed whitespace
- Restored separators in search_item.tpl
 2017-03-25 20:43:33 -04:00
Hypolite Petovan d7f80bf7e7 Merge branch 'develop' into improvement/frio-action-links-to-buttons 
# Conflicts:
#	view/theme/frio/js/filebrowser.js
#	view/theme/frio/templates/filebrowser.tpl
 2017-03-25 20:27:26 -04:00
Hypolite Petovan 7850abcee3 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2017-03-25 20:16:27 -04:00
rabuzarus aeb999c4d9 enable fbrowser for mobile view 2017-03-25 23:33:53 +01:00
Roland Haeder 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 Haeder 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
rabuzarus b6ab3bdd36 make use of Config class 2017-03-25 21:07:12 +01: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
rabuzarus a2ad013830 some work on code standards compliance 2017-03-25 19:12:16 +01:00
Michael 585c2119d7 Remove the "call by reference" 2017-03-25 18:00:56 +00:00
Roland Haeder 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 Haeder 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 Haeder 66f5e104b1
and without self:: ;-( 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 15:13:38 +01:00
Roland Haeder 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 Haeder 0e6b009425
fixed another parser error, opps 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 15:04:07 +01:00
Roland Haeder 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 Haeder 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 Haeder 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 Haeder 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 Haeder 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 Haeder 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 Haeder 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 Haeder 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 Haeder 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 Haeder b830d839f0
added a space 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:27:52 +01:00
Roland Haeder 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 Haeder 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 Haeder e503141b0c
added spaces and curly braces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:18:39 +01:00
Roland Haeder 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 Haeder 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 Haeder 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 Haeder 47ae5a9a47
removed parentheses, added curly ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:07:33 +01:00
Roland Haeder 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 Haeder 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 Haeder 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 Haeder 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