bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity
13754 commits 3 branches 61 tags 179 MiB
Commit graph

13754 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
ca0e6cba02 Relaying of Diaspora comments now work with the new fields as well. 2016-12-28 13:30:55 +00:00
Michael
6a511066c4 Threaded comments will now be transmitted 2016-12-27 14:37:48 +00:00
Michael
ce4c542e37 Support for threaded comments 2016-12-27 12:59:15 +00:00
Michael Vogel
ca734f168c Merge pull request #3036 from Quix0r/rewrites/app_get_baseurl_static 
$a->get_baseurl() rewritten to App::get_baseurl() - 2nd PR
 2016-12-23 08:20:10 +01:00
Roland Häder
31cd3fb33c Coding convention continued: 
- added curly braces
- added spaces between if/foreach and brace
- made code block look nicer (spaces added, tabs replaced by space)
- added TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 17:13:34 +01:00
Roland Häder
9c81b4948e Coding convention applied: 
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 16:59:43 +01:00
Roland Häder
2325d81048 Code style changed: 
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
  line comments, use /* */ instead and a asterisk in front of every line.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 16:52:28 +01:00
Roland Häder
d82ed5d1b4 Continued with code convention: 
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 15:31:23 +01:00
Roland Häder
ad20c5504d Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
 2016-12-22 11:33:00 +01:00
Roland Häder
5d0db51fdf Beatification/coding convention: 
- added a lot spaces to make it look nicer
- added curly braces (coding convention)
- added needed spaces (coding convention)get_id
- removed obsolete $a = get_app() call

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 11:22:07 +01:00
Michael Vogel
9e689e8b9b Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links 
Diaspora: Complete /people/* links from fcontact or author domain
 2016-12-22 10:17:44 +01:00
Roland Häder
a314dbc562 removed conflict solving remains, took from upstream/develop 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 09:14:14 +01:00
Roland Häder
ef5838bbd2 was not missing in develop branch, but here. :-( 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 09:10:17 +01:00
Roland Häder
99c8fd36c0 applied coding convention rule 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 09:10:00 +01:00
Roland Häder
8b7d5d0efc Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 09:06:00 +01:00
Michael Vogel
584cf75af3 Merge pull request #3041 from rabuzarus/20161221_-_frio_notifications 
frio notifications templates + local date & profile link for the notifications page
 2016-12-22 07:31:07 +01:00
rabuzarus
747e97a7b2 frio: revert img.intro-photo to 80pxx80px 2016-12-22 01:54:41 +01:00
rabuzarus
2fcbba9410 provide local time for notifications 2016-12-22 00:28:52 +01:00
rabuzarus
125d2f24dd frio: add profile link to the notifications url 2016-12-21 23:17:55 +01:00
Roland Haeder
b3d33ee1e6
 		More curly braces added, left some TODOs behind 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:17:47 +01:00
Roland Haeder
d97b6a2eba
 		added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:04:09 +01:00
Roland Haeder
d80b82c55d no need for this else block 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 22:53:32 +01:00
rabuzarus
51c9a66fc3 frio: add notifications templates to frio 2016-12-21 20:39:07 +01:00
Roland Haeder
0436782e70
 		Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 20:01:51 +01:00
Michael Vogel
5a72d7527d Merge pull request #3040 from rabuzarus/20161221_-_frio_tooltip 
frio: append tooltip and hovercard to body element
 2016-12-21 18:53:00 +01:00
rabuzarus
8a9143023d frio: append hovercard to body element 2016-12-21 16:22:20 +01:00
rabuzarus
24a58ab2e6 frio: append bs tooltip to body element 2016-12-21 16:12:13 +01:00
Roland Häder
bb37cac772 added curly braces + space 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-21 09:30:49 +01:00
Hypolite Petovan
47f88bd625 proxy mod: Standards bearer 
- Enforced PSR-2 standards
- Normalized concatenation formatting
- Normalized string delimiters
- Normalized condition operators
- Collapsed directly nested conditions
- Used dvm::is_result
- Added comments
 2016-12-21 09:15:20 +01:00
Hypolite Petovan
1f94cb9aac proxy: Simplify url extension extraction 2016-12-21 09:14:49 +01:00
Hypolite Petovan
c0ec9c5907 proxy_url: Fix extension extraction for URLs containing a . after a ? 2016-12-21 09:14:09 +01:00
Hypolite Petovan
769b849665 url_from_contact_guid: move network constant to arg list 2016-12-20 20:52:42 -05:00
Michael Vogel
875110ab27 Merge pull request #3038 from Hypolite/bug/proxy_url_extension 
proxy_url: Fix extension extraction for URLs containing a . after a ? redux
 2016-12-20 22:44:34 +01:00
Roland Haeder
3befdc6920
 		used more App::get_baseurl() instead of get_app()->get_baseurl(). 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:51:54 +01:00
Roland Haeder
b4bc07fdcc
 		Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:32:00 +01:00
Hypolite Petovan
e54ee2e509 Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension 
# Conflicts:
#	include/follow.php
 2016-12-20 15:29:30 -05:00
Hypolite Petovan
b2768d8f1c proxy mod: Standards bearer 
- Enforced PSR-2 standards
- Normalized concatenation formatting
- Normalized string delimiters
- Normalized condition operators
- Collapsed directly nested conditions
- Used dvm::is_result
- Added comments
 2016-12-20 15:23:08 -05:00
Roland Haeder
bb06d9ce32
 		Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:17:19 +01:00
Roland Haeder
52f14ffa5f
 		Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:17:09 +01:00
Roland Haeder
6c0c9d542a
 		Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:16:49 +01:00
Hypolite Petovan
6e929934c5 proxy: Simplify url extension extraction 2016-12-20 15:14:43 -05:00
Hypolite Petovan
b631442760 Misc changes to url_from_contact_guid 
- Rename url_from_fcontact_guid to url_from_fcontact_guid
- Use network name constant
- Standards
 2016-12-20 14:33:33 -05:00
Hypolite Petovan
a99532707b Resolve conflict 2016-12-20 12:52:24 -05:00
Hypolite Petovan
e8e1f9253d Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links 
# Conflicts:
#	include/follow.php
 2016-12-20 12:50:36 -05:00
Hypolite Petovan
177f93f9a5 diaspora.php: Standards, standards everywhere 2016-12-20 12:49:50 -05:00
Hypolite Petovan
155e777d19 replace_people_guid: Break down nested calls 
- Fix typo in function name
- Fix arguments
- Simplify url_from_fcontact_guid
 2016-12-20 12:49:32 -05:00
Hypolite Petovan
4a7c3b9eef Diaspora: Fix class name case + add self 2016-12-20 12:44:15 -05:00
Roland Häder
de689583e2 added more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
 2016-12-20 17:58:34 +01:00
Michael Vogel
7141ce9163 Merge pull request #3030 from Hypolite/bug/proxy_url_extension 
proxy_url: Fix extension extraction for URLs containing a . after a ?
 2016-12-20 17:53:26 +01:00
Roland Häder
4805aa8fdb Don't cherry-pick: 
- reverted dbm::is_result() to count()

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 16:28:23 +01:00