]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoUpdate the photo albums cache on upload, album deletion or renaming
rabuzarus [Sun, 25 Dec 2016 15:58:38 +0000 (16:58 +0100)]
Update the photo albums cache on upload, album deletion or renaming

7 years agoMerge pull request #3045 from rabuzarus/20161225_-_frio_colorbox_workaround
Michael Vogel [Sun, 25 Dec 2016 05:47:56 +0000 (06:47 +0100)]
Merge pull request #3045 from rabuzarus/20161225_-_frio_colorbox_workaround

Bugfix: fix handling with colorbox popups in frio

7 years agoBugfix: fix handling with colorbox popups in frio
rabuzarus [Sun, 25 Dec 2016 00:47:18 +0000 (01:47 +0100)]
Bugfix: fix handling with colorbox popups in frio

7 years agoMerge pull request #3044 from rabuzarus/20161224_-_update_perfect_scrollbar
Michael Vogel [Sat, 24 Dec 2016 11:49:05 +0000 (12:49 +0100)]
Merge pull request #3044 from rabuzarus/20161224_-_update_perfect_scrollbar

update perfect-scrollbar to version 0.6.15

7 years agoMerge pull request #3042 from rabuzarus/20161223_-_todo_doxygen
Michael Vogel [Sat, 24 Dec 2016 11:48:23 +0000 (12:48 +0100)]
Merge pull request #3042 from rabuzarus/20161223_-_todo_doxygen

correct doxygen @todo

7 years agoupdate perfect-scrollbar to version 0.6.15
rabuzarus [Sat, 24 Dec 2016 01:27:17 +0000 (02:27 +0100)]
update perfect-scrollbar to version 0.6.15

7 years agocorrect doxygen @todo
rabuzarus [Fri, 23 Dec 2016 17:31:42 +0000 (18:31 +0100)]
correct doxygen @todo

7 years agoMerge pull request #3036 from Quix0r/rewrites/app_get_baseurl_static
Michael Vogel [Fri, 23 Dec 2016 07:20:10 +0000 (08:20 +0100)]
Merge pull request #3036 from Quix0r/rewrites/app_get_baseurl_static

$a->get_baseurl() rewritten to App::get_baseurl() - 2nd PR

7 years agoCoding convention continued:
Roland Häder [Thu, 22 Dec 2016 16:12:34 +0000 (17:12 +0100)]
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>
7 years agoCoding convention applied:
Roland Häder [Thu, 22 Dec 2016 15:58:50 +0000 (16:58 +0100)]
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>
7 years agoCode style changed:
Roland Häder [Thu, 22 Dec 2016 15:50:40 +0000 (16:50 +0100)]
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>
7 years agoContinued with code convention:
Roland Häder [Thu, 22 Dec 2016 14:30:23 +0000 (15:30 +0100)]
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>
7 years agoMerge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
Roland Häder [Thu, 22 Dec 2016 10:33:00 +0000 (11:33 +0100)]
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

7 years agoBeatification/coding convention:
Roland Häder [Thu, 22 Dec 2016 10:21:50 +0000 (11:21 +0100)]
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>
7 years agoMerge pull request #3031 from Hypolite/bug/fix-diaspora-people-links
Michael Vogel [Thu, 22 Dec 2016 09:17:44 +0000 (10:17 +0100)]
Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links

Diaspora: Complete /people/* links from fcontact or author domain

7 years agoremoved conflict solving remains, took from upstream/develop
Roland Häder [Thu, 22 Dec 2016 08:14:14 +0000 (09:14 +0100)]
removed conflict solving remains, took from upstream/develop

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agowas not missing in develop branch, but here. :-(
Roland Häder [Thu, 22 Dec 2016 08:10:17 +0000 (09:10 +0100)]
was not missing in develop branch, but here. :-(

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoapplied coding convention rule
Roland Häder [Thu, 22 Dec 2016 08:09:27 +0000 (09:09 +0100)]
applied coding convention rule

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoMerge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
Roland Häder [Thu, 22 Dec 2016 08:06:00 +0000 (09:06 +0100)]
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static

7 years agoMerge pull request #3041 from rabuzarus/20161221_-_frio_notifications
Michael Vogel [Thu, 22 Dec 2016 06:31:07 +0000 (07:31 +0100)]
Merge pull request #3041 from rabuzarus/20161221_-_frio_notifications

frio notifications templates + local date & profile link for the notifications page

7 years agofrio: revert img.intro-photo to 80pxx80px
rabuzarus [Thu, 22 Dec 2016 00:54:41 +0000 (01:54 +0100)]
frio: revert img.intro-photo to 80pxx80px

7 years agoprovide local time for notifications
rabuzarus [Wed, 21 Dec 2016 23:28:52 +0000 (00:28 +0100)]
provide local time for notifications

7 years agofrio: add profile link to the notifications url
rabuzarus [Wed, 21 Dec 2016 22:17:55 +0000 (23:17 +0100)]
frio: add profile link to the notifications url

7 years agoMore curly braces added, left some TODOs behind
Roland Haeder [Wed, 21 Dec 2016 22:17:22 +0000 (23:17 +0100)]
More curly braces added, left some TODOs behind

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoadded curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
Roland Haeder [Wed, 21 Dec 2016 22:04:09 +0000 (23:04 +0100)]
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agono need for this else block
Roland Haeder [Wed, 21 Dec 2016 21:53:08 +0000 (22:53 +0100)]
no need for this else block

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agofrio: add notifications templates to frio
rabuzarus [Wed, 21 Dec 2016 19:39:07 +0000 (20:39 +0100)]
frio: add notifications templates to frio

7 years agoMerge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
Roland Haeder [Wed, 21 Dec 2016 19:01:51 +0000 (20:01 +0100)]
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoMerge pull request #3040 from rabuzarus/20161221_-_frio_tooltip
Michael Vogel [Wed, 21 Dec 2016 17:53:00 +0000 (18:53 +0100)]
Merge pull request #3040 from rabuzarus/20161221_-_frio_tooltip

frio: append tooltip and hovercard to body element

7 years agofrio: append hovercard to body element
rabuzarus [Wed, 21 Dec 2016 15:22:20 +0000 (16:22 +0100)]
frio: append hovercard to body element

7 years agofrio: append bs tooltip to body element
rabuzarus [Wed, 21 Dec 2016 15:12:13 +0000 (16:12 +0100)]
frio: append bs tooltip to body element

7 years agoadded curly braces + space
Roland Häder [Wed, 21 Dec 2016 08:30:49 +0000 (09:30 +0100)]
added curly braces + space

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoproxy mod: Standards bearer
Hypolite Petovan [Tue, 20 Dec 2016 20:23:08 +0000 (15:23 -0500)]
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

7 years agoproxy: Simplify url extension extraction
Hypolite Petovan [Tue, 20 Dec 2016 20:14:43 +0000 (15:14 -0500)]
proxy: Simplify url extension extraction

7 years agoproxy_url: Fix extension extraction for URLs containing a . after a ?
Hypolite Petovan [Tue, 20 Dec 2016 01:19:26 +0000 (20:19 -0500)]
proxy_url: Fix extension extraction for URLs containing a . after a ?

7 years agourl_from_contact_guid: move network constant to arg list
Hypolite Petovan [Wed, 21 Dec 2016 01:52:42 +0000 (20:52 -0500)]
url_from_contact_guid: move network constant to arg list

7 years agoMerge pull request #3038 from Hypolite/bug/proxy_url_extension
Michael Vogel [Tue, 20 Dec 2016 21:44:34 +0000 (22:44 +0100)]
Merge pull request #3038 from Hypolite/bug/proxy_url_extension

proxy_url: Fix extension extraction for URLs containing a . after a ? redux

7 years agoused more App::get_baseurl() instead of get_app()->get_baseurl().
Roland Haeder [Tue, 20 Dec 2016 20:51:25 +0000 (21:51 +0100)]
used more App::get_baseurl() instead of get_app()->get_baseurl().

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoContinued with coding convention:
Roland Haeder [Tue, 20 Dec 2016 20:31:05 +0000 (21:31 +0100)]
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>
7 years agoMerge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension
Hypolite Petovan [Tue, 20 Dec 2016 20:29:30 +0000 (15:29 -0500)]
Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension

# Conflicts:
# include/follow.php

7 years agoproxy mod: Standards bearer
Hypolite Petovan [Tue, 20 Dec 2016 20:23:08 +0000 (15:23 -0500)]
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

7 years agoContinued with coding convention:
Roland Haeder [Tue, 20 Dec 2016 20:16:01 +0000 (21:16 +0100)]
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>
7 years agoContinued with coding convention:
Roland Haeder [Tue, 20 Dec 2016 20:15:53 +0000 (21:15 +0100)]
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>
7 years agoContinued with coding convention:
Roland Haeder [Tue, 20 Dec 2016 20:13:50 +0000 (21:13 +0100)]
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>
7 years agoproxy: Simplify url extension extraction
Hypolite Petovan [Tue, 20 Dec 2016 20:14:43 +0000 (15:14 -0500)]
proxy: Simplify url extension extraction

7 years agoMisc changes to url_from_contact_guid
Hypolite Petovan [Tue, 20 Dec 2016 19:33:33 +0000 (14:33 -0500)]
Misc changes to url_from_contact_guid

- Rename url_from_fcontact_guid to url_from_fcontact_guid
- Use network name constant
- Standards

7 years agoResolve conflict
Hypolite Petovan [Tue, 20 Dec 2016 17:52:24 +0000 (12:52 -0500)]
Resolve conflict

7 years agoMerge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links
Hypolite Petovan [Tue, 20 Dec 2016 17:50:36 +0000 (12:50 -0500)]
Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links

# Conflicts:
# include/follow.php

7 years agodiaspora.php: Standards, standards everywhere
Hypolite Petovan [Tue, 20 Dec 2016 17:49:50 +0000 (12:49 -0500)]
diaspora.php: Standards, standards everywhere

7 years agoreplace_people_guid: Break down nested calls
Hypolite Petovan [Tue, 20 Dec 2016 17:49:32 +0000 (12:49 -0500)]
replace_people_guid: Break down nested calls

- Fix typo in function name
- Fix arguments
- Simplify url_from_fcontact_guid

7 years agoDiaspora: Fix class name case + add self
Hypolite Petovan [Tue, 20 Dec 2016 17:44:15 +0000 (12:44 -0500)]
Diaspora: Fix class name case + add self

7 years agoadded more curly braces + space between "if" and brace
Roland Häder [Tue, 20 Dec 2016 16:43:46 +0000 (17:43 +0100)]
added more curly braces + space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/admin.php

7 years agoMerge pull request #3030 from Hypolite/bug/proxy_url_extension
Michael Vogel [Tue, 20 Dec 2016 16:53:26 +0000 (17:53 +0100)]
Merge pull request #3030 from Hypolite/bug/proxy_url_extension

proxy_url: Fix extension extraction for URLs containing a . after a ?

7 years agoDon't cherry-pick:
Roland Häder [Tue, 20 Dec 2016 15:28:23 +0000 (16:28 +0100)]
Don't cherry-pick:
- reverted dbm::is_result() to count()

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoDon't cherry-pick: reverted unrelated changes (dbm::is_result())
Roland Häder [Tue, 20 Dec 2016 15:21:59 +0000 (16:21 +0100)]
Don't cherry-pick: reverted unrelated changes (dbm::is_result())

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoOnly distribute items to active contacts
Michael [Tue, 20 Dec 2016 07:13:22 +0000 (07:13 +0000)]
Only distribute items to active contacts

7 years agoThe object type "photo" is deprecated and was replaced by "image"
Michael [Tue, 20 Dec 2016 07:10:47 +0000 (07:10 +0000)]
The object type "photo" is deprecated and was replaced by "image"

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/like.php
mod/photos.php
mod/subthread.php

7 years agoWorkaround for vanished database connections while authentication
Michael [Tue, 20 Dec 2016 07:08:03 +0000 (07:08 +0000)]
Workaround for vanished database connections while authentication

7 years agoMerge pull request #3032 from annando/1612-auth-ejabber
Tobias Diekershoff [Tue, 20 Dec 2016 14:45:18 +0000 (15:45 +0100)]
Merge pull request #3032 from annando/1612-auth-ejabber

Workaround for vanished database connections while authentication

7 years agoMerge pull request #3033 from annando/1612-object-type
Tobias Diekershoff [Tue, 20 Dec 2016 14:44:07 +0000 (15:44 +0100)]
Merge pull request #3033 from annando/1612-object-type

The object type "photo" is deprecated and was replaced by "image"

7 years agoMerge pull request #3034 from annando/1612-no-archive
Tobias Diekershoff [Tue, 20 Dec 2016 14:42:41 +0000 (15:42 +0100)]
Merge pull request #3034 from annando/1612-no-archive

Only distribute items to active contacts

7 years agoChanged $a->get_baseurl() to App::get_baseurl()
Roland Häder [Tue, 20 Dec 2016 11:45:16 +0000 (12:45 +0100)]
Changed $a->get_baseurl() to App::get_baseurl()

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoContinued a bit:
Roland Häder [Tue, 20 Dec 2016 11:36:51 +0000 (12:36 +0100)]
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>
7 years agoOpps, forgot this ...
Roland Häder [Tue, 20 Dec 2016 11:36:51 +0000 (12:36 +0100)]
Opps, forgot this ...

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded curly braces + space between "if" and brace
Roland Häder [Tue, 20 Dec 2016 11:35:18 +0000 (12:35 +0100)]
added curly braces + space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded much more curly braces + space between "if" and brace
Roland Häder [Tue, 20 Dec 2016 10:56:34 +0000 (11:56 +0100)]
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

7 years agoContinued:
Roland Häder [Tue, 20 Dec 2016 10:39:53 +0000 (11:39 +0100)]
Continued:

- added curly braces + spaces
- added todo about testing empty/non-empty strings

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded spaces + curly braces
Roland Häder [Tue, 20 Dec 2016 10:38:16 +0000 (11:38 +0100)]
added spaces + curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded spaces + curly braces
Roland Häder [Tue, 20 Dec 2016 10:36:03 +0000 (11:36 +0100)]
added spaces + curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded more curly braces + fixed space->tab for code indentation.
Roland Häder [Tue, 20 Dec 2016 10:33:04 +0000 (11:33 +0100)]
added more curly braces + fixed space->tab for code indentation.

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded curly braces + space between "if" and brace
Roland Häder [Tue, 20 Dec 2016 10:27:40 +0000 (11:27 +0100)]
added curly braces + space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/notify.php

7 years agoadded curly braces + space between "if" and brace + initialized $result (was only...
Roland Häder [Tue, 20 Dec 2016 10:21:32 +0000 (11:21 +0100)]
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>
7 years agoadded curly braces + space between "if" and brace + added missing @param
Roland Häder [Tue, 20 Dec 2016 10:18:54 +0000 (11:18 +0100)]
added curly braces + space between "if" and brace + added missing @param

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded curly braces + space between "if" and brace + added TODO
Roland Häder [Tue, 20 Dec 2016 10:14:30 +0000 (11:14 +0100)]
added curly braces + space between "if" and brace + added TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded curly braces + space between "if" and brace
Roland Häder [Tue, 20 Dec 2016 10:04:29 +0000 (11:04 +0100)]
added curly braces + space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoAlso here (was committed in other branch, too. :-( )
Roland Häder [Tue, 20 Dec 2016 10:02:57 +0000 (11:02 +0100)]
Also here (was committed in other branch, too. :-( )

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded more curyl braces + spaces between "if" and brace
Roland Häder [Tue, 20 Dec 2016 09:44:27 +0000 (10:44 +0100)]
added more curyl braces + spaces between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoCoding convention:
Roland Häder [Tue, 20 Dec 2016 09:39:06 +0000 (10:39 +0100)]
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>
7 years agoCoding convention:
Roland Häder [Tue, 20 Dec 2016 09:35:28 +0000 (10:35 +0100)]
Coding convention:
- added curly braces
- added space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoCoding convention applied:
Roland Häder [Tue, 20 Dec 2016 09:10:33 +0000 (10:10 +0100)]
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

7 years agoOnly distribute items to active contacts
Michael [Tue, 20 Dec 2016 07:13:22 +0000 (07:13 +0000)]
Only distribute items to active contacts

7 years agoThe object type "photo" is deprecated and was replaced by "image"
Michael [Tue, 20 Dec 2016 07:10:47 +0000 (07:10 +0000)]
The object type "photo" is deprecated and was replaced by "image"

7 years agoWorkaround for vanished database connections while authentication
Michael [Tue, 20 Dec 2016 07:08:03 +0000 (07:08 +0000)]
Workaround for vanished database connections while authentication

7 years agoDiaspora: Complete /people/* links from fcontact or author domain
Hypolite Petovan [Tue, 20 Dec 2016 04:30:50 +0000 (23:30 -0500)]
Diaspora: Complete /people/* links from fcontact or author domain

7 years agoproxy_url: Fix extension extraction for URLs containing a . after a ?
Hypolite Petovan [Tue, 20 Dec 2016 01:19:26 +0000 (20:19 -0500)]
proxy_url: Fix extension extraction for URLs containing a . after a ?

7 years ago*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding conventi...
Roland Häder [Mon, 19 Dec 2016 13:26:13 +0000 (14:26 +0100)]
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoNo more needed ... util/typo.php is there.
Roland Häder [Wed, 14 Dec 2016 15:43:03 +0000 (16:43 +0100)]
No more needed  ... util/typo.php is there.

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoUse [] instead of test.
Roland Häder [Wed, 14 Dec 2016 11:51:20 +0000 (12:51 +0100)]
Use [] instead of test.

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded lint.sh which needs to be executed like this:
Roland Häder [Wed, 14 Dec 2016 11:45:11 +0000 (12:45 +0100)]
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>
7 years agoMerge remote-tracking branch 'upstream/develop' into develop
Roland Häder [Mon, 19 Dec 2016 13:21:26 +0000 (14:21 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop

7 years agoMerge pull request #3010 from Quix0r/rewrites/mixed-static-object-reference-calls
Michael Vogel [Mon, 19 Dec 2016 13:12:50 +0000 (14:12 +0100)]
Merge pull request #3010 from Quix0r/rewrites/mixed-static-object-reference-calls

Rewrites: mixed static object reference calls (and very sadly more ...)

7 years agoMerge pull request #3026 from tobiasd/20161219-lng
Michael Vogel [Mon, 19 Dec 2016 13:09:57 +0000 (14:09 +0100)]
Merge pull request #3026 from tobiasd/20161219-lng

DE translation of the core

7 years agoDE translation of the core
Tobias Diekershoff [Mon, 19 Dec 2016 11:22:47 +0000 (12:22 +0100)]
DE translation of the core

7 years agoMerge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object...
Roland Häder [Mon, 19 Dec 2016 08:40:34 +0000 (09:40 +0100)]
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

7 years agoMerge pull request #3025 from tobiasd/20161219-messagespo
Michael Vogel [Mon, 19 Dec 2016 07:40:49 +0000 (08:40 +0100)]
Merge pull request #3025 from tobiasd/20161219-messagespo

regenerated master messages.po file

7 years agoregenerated master messages.po file
Tobias Diekershoff [Mon, 19 Dec 2016 06:47:52 +0000 (07:47 +0100)]
regenerated master messages.po file

7 years agoMerge pull request #3023 from annando/1612-attachment-link
Tobias Diekershoff [Mon, 19 Dec 2016 06:44:42 +0000 (07:44 +0100)]
Merge pull request #3023 from annando/1612-attachment-link

Bugfix: Reimported Friendica posts from pump.io had the links missing.

7 years agoMerge pull request #3024 from beardyunixer/develop
Tobias Diekershoff [Mon, 19 Dec 2016 06:44:10 +0000 (07:44 +0100)]
Merge pull request #3024 from beardyunixer/develop

This error message had me confused for about twenty minutes.  I couldn't

7 years agoThis error message had me confused for about twenty minutes. I couldn't
Thomas Willingham [Mon, 19 Dec 2016 00:10:11 +0000 (00:10 +0000)]
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.

7 years agoBugfix: Reimported Friendica posts from pump.io had the links missing.
Michael [Sun, 18 Dec 2016 23:39:44 +0000 (23:39 +0000)]
Bugfix: Reimported Friendica posts from pump.io had the links missing.