]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoAdd Text_Highlighter to Composer
Hypolite Petovan [Wed, 5 Apr 2017 04:31:49 +0000 (00:31 -0400)]
Add Text_Highlighter to Composer

- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments

Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php.

7 years agoMerge branch 'develop' of https://github.com/Hypolite/friendica into develop
Hypolite Petovan [Wed, 5 Apr 2017 01:48:36 +0000 (21:48 -0400)]
Merge branch 'develop' of https://github.com/Hypolite/friendica into develop

7 years agoMerge pull request #3286 from annando/issue-1720
Tobias Diekershoff [Tue, 4 Apr 2017 05:50:33 +0000 (07:50 +0200)]
Merge pull request #3286 from annando/issue-1720

Issue 1720: Group filter and new tab don't like each other

7 years agoSome little standard stuff
Michael [Tue, 4 Apr 2017 05:39:43 +0000 (05:39 +0000)]
Some little standard stuff

7 years agoIssue 1720: Group filter and new tab don't like each other
Michael [Tue, 4 Apr 2017 05:35:04 +0000 (05:35 +0000)]
Issue 1720: Group filter and new tab don't like each other

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Tue, 4 Apr 2017 02:06:09 +0000 (22:06 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoMerge pull request #3254 from Quix0r/rewrites/coding-convention-split2
Hypolite Petovan [Mon, 3 Apr 2017 10:38:10 +0000 (06:38 -0400)]
Merge pull request #3254 from Quix0r/rewrites/coding-convention-split2

Rewrites/coding convention split2

7 years agoMerge branch 'develop' into rewrites/coding-convention-split2
Hypolite Petovan [Mon, 3 Apr 2017 10:35:27 +0000 (06:35 -0400)]
Merge branch 'develop' into rewrites/coding-convention-split2

7 years agoMerge pull request #3284 from annando/issue-3278
Hypolite Petovan [Mon, 3 Apr 2017 02:49:07 +0000 (22:49 -0400)]
Merge pull request #3284 from annando/issue-3278

Issue 3278: Attachments in Reshares should now work

7 years agoMerge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons
rabuzarus [Sun, 2 Apr 2017 21:15:57 +0000 (23:15 +0200)]
Merge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons

Frio: Turn action links into buttons

7 years agoRemoved unneeded comment
Michael [Sun, 2 Apr 2017 20:43:54 +0000 (20:43 +0000)]
Removed unneeded comment

7 years agoIssue 3278: Attachments in Reshares should now work
Michael [Sun, 2 Apr 2017 19:18:11 +0000 (19:18 +0000)]
Issue 3278: Attachments in Reshares should now work

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Sun, 2 Apr 2017 14:01:30 +0000 (10:01 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoMerge pull request #3279 from Hypolite/improvement/add-composer
Michael Vogel [Sun, 2 Apr 2017 12:57:37 +0000 (14:57 +0200)]
Merge pull request #3279 from Hypolite/improvement/add-composer

Add Composer

7 years agoMerge pull request #3283 from annando/issue-2957-2
Hypolite Petovan [Sun, 2 Apr 2017 12:56:35 +0000 (08:56 -0400)]
Merge pull request #3283 from annando/issue-2957-2

Issue 2957: The avatar problem with mastodon should now be solved

7 years agoAdd links to EN pages in DE help
Hypolite Petovan [Sun, 2 Apr 2017 12:54:11 +0000 (08:54 -0400)]
Add links to EN pages in DE help

7 years agoIssue 2957: The avatar problem with mastodon should now finally be solved
Michael [Sun, 2 Apr 2017 12:37:22 +0000 (12:37 +0000)]
Issue 2957: The avatar problem with mastodon should now finally be solved

7 years agoMerge pull request #3282 from annando/1704-platform-name
Tobias Diekershoff [Sun, 2 Apr 2017 08:03:57 +0000 (10:03 +0200)]
Merge pull request #3282 from annando/1704-platform-name

Show real platform names

7 years agoShow real platform names
Michael [Sun, 2 Apr 2017 07:53:55 +0000 (07:53 +0000)]
Show real platform names

7 years agoMerge pull request #3281 from annando/issue-3206-2957
Hypolite Petovan [Sun, 2 Apr 2017 01:24:28 +0000 (21:24 -0400)]
Merge pull request #3281 from annando/issue-3206-2957

Mastodon: plink for reshares, missing hostnames for avatars

7 years agoAdd EOF newline to composer.json
Hypolite Petovan [Sun, 2 Apr 2017 01:09:36 +0000 (21:09 -0400)]
Add EOF newline to composer.json

7 years agoMastodon: plink for reshares, missing hostnames for avatars
Michael [Sat, 1 Apr 2017 23:39:19 +0000 (23:39 +0000)]
Mastodon: plink for reshares, missing hostnames for avatars

7 years agofrio: Fix help pages inline code display
Hypolite Petovan [Sat, 1 Apr 2017 21:58:35 +0000 (17:58 -0400)]
frio: Fix help pages inline code display

7 years agoAdd Composer documentation
Hypolite Petovan [Sat, 1 Apr 2017 21:58:21 +0000 (17:58 -0400)]
Add Composer documentation

7 years agoMerge branch 'develop' into rewrites/coding-convention-split2
Roland Häder [Sat, 1 Apr 2017 20:16:08 +0000 (22:16 +0200)]
Merge branch 'develop' into rewrites/coding-convention-split2

7 years agoadded spaces + used x ()
Roland Haeder [Sat, 1 Apr 2017 19:46:57 +0000 (21:46 +0200)]
added spaces + used x ()

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoMerge pull request #3280 from annando/issue-3142-2
Hypolite Petovan [Sat, 1 Apr 2017 18:32:27 +0000 (14:32 -0400)]
Merge pull request #3280 from annando/issue-3142-2

Issue 3142: mcrypt is no more (as well as phpseclib)

7 years agoStandards ...
Michael [Sat, 1 Apr 2017 17:08:11 +0000 (17:08 +0000)]
Standards ...

7 years agoMore mcrypt is removed
Michael [Sat, 1 Apr 2017 10:07:12 +0000 (10:07 +0000)]
More mcrypt is removed

7 years agoDocumentation added
Michael [Sat, 1 Apr 2017 09:05:56 +0000 (09:05 +0000)]
Documentation added

7 years agoIssue 3142: mcrypt is no more (as well as phpseclib)
Michael [Sat, 1 Apr 2017 08:28:42 +0000 (08:28 +0000)]
Issue 3142: mcrypt is no more (as well as phpseclib)

7 years agoMove MobileDetect library to vendor
Hypolite Petovan [Sat, 1 Apr 2017 03:05:07 +0000 (23:05 -0400)]
Move MobileDetect library to vendor

- Bumped the version to 2.8.25 (from 2.8.11)

7 years agoReplace existing autoloader with Composer-supplied
Hypolite Petovan [Sat, 1 Apr 2017 03:02:38 +0000 (23:02 -0400)]
Replace existing autoloader with Composer-supplied

- Move Friendica namespace to `src`
- Move required `ezyang/htmlpurifier` to vendor
- Remove existing static autoloader
- Change boot.php reference to the autoloader

7 years agoComposer: Add vendor directry
Hypolite Petovan [Sat, 1 Apr 2017 02:34:30 +0000 (22:34 -0400)]
Composer: Add vendor directry

- Add gitignore to avoid committing libraries' .git folder

7 years agoAdd composer.json
Hypolite Petovan [Sat, 1 Apr 2017 02:33:18 +0000 (22:33 -0400)]
Add composer.json

7 years agoAdd executable composer.phar in util
Hypolite Petovan [Fri, 31 Mar 2017 23:24:10 +0000 (01:24 +0200)]
Add executable composer.phar in util

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Fri, 31 Mar 2017 23:14:27 +0000 (19:14 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoContinued with CR:
Roland Haeder [Fri, 31 Mar 2017 19:04:08 +0000 (21:04 +0200)]
Continued with CR:
- added spaces as requested
- removed parentheses from include/require calls as they are no functions

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agospace-time contines ...
Roland Haeder [Fri, 31 Mar 2017 18:55:50 +0000 (20:55 +0200)]
space-time contines ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agospace-time!
Roland Haeder [Fri, 31 Mar 2017 18:52:32 +0000 (20:52 +0200)]
space-time!

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoContinued a bit:
Roland Haeder [Fri, 31 Mar 2017 18:51:18 +0000 (20:51 +0200)]
Continued a bit:
- converted multiple single-line comments into one multi-line comment
- added spaces (space-time!)

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoadded space, marked rest 86 occurrences in todos.txt
Roland Haeder [Fri, 31 Mar 2017 18:49:43 +0000 (20:49 +0200)]
added space, marked rest 86 occurrences in todos.txt

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoadded spaces, marked in todos.txt as usual
Roland Haeder [Fri, 31 Mar 2017 18:47:23 +0000 (20:47 +0200)]
added spaces, marked in todos.txt as usual

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years ago$tagged is being initialized but not written to until the foreach() loop is
Roland Haeder [Fri, 31 Mar 2017 18:44:38 +0000 (20:44 +0200)]
$tagged is being initialized but not written to until the foreach() loop is
being executed. Maybe here is old-lost code anyway?

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoContinued a bit:
Roland Haeder [Fri, 31 Mar 2017 18:41:32 +0000 (20:41 +0200)]
Continued a bit:
- added 'array' type-hint which is valid for many versions back
- added spaces as requested by CR
- removed $a = get_app(); call, $a was no longer needed here

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoContinued a bit:
Roland Haeder [Fri, 31 Mar 2017 18:36:01 +0000 (20:36 +0200)]
Continued a bit:
- recommended way is to use foreach() instead of own looping through arrays
- even when you need the index:
<?php
foreach ($someArray as $key => $value) {
// Handle $key/$value somehow
}
?>

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoadded spaces (space-time!) and TODO that x() is maybe proper way?
Roland Haeder [Fri, 31 Mar 2017 18:32:52 +0000 (20:32 +0200)]
added spaces (space-time!) and TODO that x() is maybe proper way?

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoContinued a bit:
Roland Haeder [Fri, 31 Mar 2017 18:30:21 +0000 (20:30 +0200)]
Continued a bit:
- removed parentheses from include/require as they are no functions
- added type-hint for $a which is unused btw.

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agofixed parser error
Roland Haeder [Fri, 31 Mar 2017 18:05:15 +0000 (20:05 +0200)]
fixed parser error

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoMerge pull request #3277 from annando/issue-3142
Hypolite Petovan [Fri, 31 Mar 2017 15:02:30 +0000 (11:02 -0400)]
Merge pull request #3277 from annando/issue-3142

Replaces mcrypt with phpsec.

7 years agoWe don't need this include anymore
Michael [Fri, 31 Mar 2017 06:25:48 +0000 (06:25 +0000)]
We don't need this include anymore

7 years agoNow it's openssl - and no copy&paste failure anymore
Michael [Fri, 31 Mar 2017 06:22:43 +0000 (06:22 +0000)]
Now it's openssl - and no copy&paste failure anymore

7 years agoTest with OpenSSL
Michael [Thu, 30 Mar 2017 23:21:52 +0000 (23:21 +0000)]
Test with OpenSSL

7 years agowhoops, parser error fixed
Roland Haeder [Thu, 30 Mar 2017 19:51:31 +0000 (21:51 +0200)]
whoops, parser error fixed

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoit is space-time! ;-)
Roland Haeder [Thu, 30 Mar 2017 19:50:19 +0000 (21:50 +0200)]
it is space-time! ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agomerged 2 if() into one three times
Roland Haeder [Thu, 30 Mar 2017 19:48:46 +0000 (21:48 +0200)]
merged 2 if() into one three times

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agomerged 2 if() into one as requested by CR
Roland Haeder [Thu, 30 Mar 2017 19:45:35 +0000 (21:45 +0200)]
merged 2 if() into one as requested by CR

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoadded spaces + removed parentheses (include/require are no functions)
Roland Haeder [Thu, 30 Mar 2017 19:44:32 +0000 (21:44 +0200)]
added spaces + removed parentheses (include/require are no functions)

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoadded spaces
Roland Haeder [Thu, 30 Mar 2017 19:42:00 +0000 (21:42 +0200)]
added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoremoved old-lost code by CR request
Roland Haeder [Thu, 30 Mar 2017 19:38:22 +0000 (21:38 +0200)]
removed old-lost code by CR request

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoPlease use x() correctly:
Roland Haeder [Thu, 30 Mar 2017 19:36:34 +0000 (21:36 +0200)]
Please use x() correctly:

<?php
if (x($someArray, 'element')) {
// Do something
}
?>

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoContinued a bit:
Roland Haeder [Thu, 30 Mar 2017 19:32:12 +0000 (21:32 +0200)]
Continued a bit:
- added spaces / curly braces
- converted multiple single-line comments into one multi-line comment
- used more dbm::is_result()
- include/require are no functions, let's not abuse them ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agospace to the rescue ... ;-) CR request
Roland Haeder [Thu, 30 Mar 2017 18:33:38 +0000 (20:33 +0200)]
space to the rescue ... ;-) CR request

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoit is ... SPACE TIME! ;-)
Roland Haeder [Thu, 30 Mar 2017 18:30:23 +0000 (20:30 +0200)]
it is ... SPACE TIME! ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoReplaces mcrypt with phpsec.
Michael [Thu, 30 Mar 2017 18:29:12 +0000 (18:29 +0000)]
Replaces mcrypt with phpsec.

7 years agoremoved old-lost code by CR request + spaces added ...
Roland Haeder [Thu, 30 Mar 2017 18:26:36 +0000 (20:26 +0200)]
removed old-lost code by CR request + spaces added ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoremoved commented-out by CR request + it is ... SPACE TIME! ;-)
Roland Haeder [Thu, 30 Mar 2017 18:24:55 +0000 (20:24 +0200)]
removed commented-out by CR request + it is ... SPACE TIME! ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agospaces added according code convention and CR + fixed tzpo in function name (opps)
Roland Haeder [Thu, 30 Mar 2017 18:22:03 +0000 (20:22 +0200)]
spaces added according code convention and CR + fixed tzpo in function name (opps)

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoMerge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio...
Hypolite Petovan [Tue, 28 Mar 2017 07:14:03 +0000 (03:14 -0400)]
Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Tue, 28 Mar 2017 07:12:53 +0000 (03:12 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoMerge pull request #3275 from tobiasd/20170327-es
Michael Vogel [Tue, 28 Mar 2017 04:18:58 +0000 (06:18 +0200)]
Merge pull request #3275 from tobiasd/20170327-es

ES translation THX Albert

7 years agoMerge pull request #3276 from annando/issue-2959
Hypolite Petovan [Tue, 28 Mar 2017 03:44:09 +0000 (23:44 -0400)]
Merge pull request #3276 from annando/issue-2959

Reestablish the communication with Mastodon

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Tue, 28 Mar 2017 01:24:24 +0000 (21:24 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoDoing some Hypolyzation
Michael [Mon, 27 Mar 2017 21:02:56 +0000 (21:02 +0000)]
Doing some Hypolyzation

7 years agoReestablish the communication with Mastodon
Michael [Mon, 27 Mar 2017 20:58:15 +0000 (20:58 +0000)]
Reestablish the communication with Mastodon

7 years agoES translation THX Albert
Tobias Diekershoff [Mon, 27 Mar 2017 20:06:56 +0000 (22:06 +0200)]
ES translation THX Albert

7 years agoMerge pull request #3271 from Hypolite/issue/#3189
Tobias Diekershoff [Mon, 27 Mar 2017 07:26:39 +0000 (09:26 +0200)]
Merge pull request #3271 from Hypolite/issue/#3189

Fix Diaspora code blocks being mangled

7 years agoMerge pull request #3272 from annando/issue-2364
Tobias Diekershoff [Mon, 27 Mar 2017 07:24:41 +0000 (09:24 +0200)]
Merge pull request #3272 from annando/issue-2364

Only import new OStatus posts if they are from our followers

7 years agoPrevent Hypolite from doing comments about standards ;-)
Michael [Mon, 27 Mar 2017 06:11:45 +0000 (06:11 +0000)]
Prevent Hypolite from doing comments about standards ;-)

7 years agoOnly import new OStatus posts if they are from our followers
Michael [Mon, 27 Mar 2017 05:33:43 +0000 (05:33 +0000)]
Only import new OStatus posts if they are from our followers

7 years agoFix contacts "View" link color
Hypolite Petovan [Sun, 26 Mar 2017 23:22:19 +0000 (19:22 -0400)]
Fix contacts "View" link color

- Fixed whitespaces in `event.tpl`

7 years agoImprove babel page display for diaspora2bb mode
Hypolite Petovan [Sun, 26 Mar 2017 23:06:22 +0000 (19:06 -0400)]
Improve babel page display for diaspora2bb mode

- Fix formatting

7 years agoFix Diaspora code blocks being mangled
Hypolite Petovan [Sun, 26 Mar 2017 23:00:04 +0000 (19:00 -0400)]
Fix Diaspora code blocks being mangled

- Remove whitespace removal code from `diaspora2bb()`
- Add code block skipping the HTML transforms removing whitespace in
`htm2bbcode()`

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Sun, 26 Mar 2017 22:59:32 +0000 (18:59 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoMerge pull request #3270 from annando/1703-no-spam
Hypolite Petovan [Sun, 26 Mar 2017 14:35:42 +0000 (10:35 -0400)]
Merge pull request #3270 from annando/1703-no-spam

The "spam" libary is not in use, so we remove it completely

7 years agolibrary/oauth.php is not in use as well.
Michael [Sun, 26 Mar 2017 14:19:34 +0000 (14:19 +0000)]
library/oauth.php is not in use as well.

7 years agoThe "spam" libary is not in use, so we remove it completely
Michael [Sun, 26 Mar 2017 14:06:26 +0000 (14:06 +0000)]
The "spam" libary is not in use, so we remove it completely

7 years agoMerge pull request #3269 from annando/1703-nodeinfo
Hypolite Petovan [Sun, 26 Mar 2017 13:24:42 +0000 (09:24 -0400)]
Merge pull request #3269 from annando/1703-nodeinfo

We now return basic system data via nodeinfo at every time.

7 years agoRemove parendingsdas
Michael [Sun, 26 Mar 2017 13:12:02 +0000 (13:12 +0000)]
Remove parendingsdas

7 years agoWe now return basic system data via nodeinfo at every time.
Michael [Sun, 26 Mar 2017 12:51:25 +0000 (12:51 +0000)]
We now return basic system data via nodeinfo at every time.

7 years agoMerge pull request #3267 from annando/issue-3248
Tobias Diekershoff [Sun, 26 Mar 2017 06:03:46 +0000 (08:03 +0200)]
Merge pull request #3267 from annando/issue-3248

Issue 3248: Make communityhome work again.

7 years agoIssue 3248: Make communityhome work again.
Michael [Sun, 26 Mar 2017 05:29:24 +0000 (05:29 +0000)]
Issue 3248: Make communityhome work again.

7 years agoRestore separator margins
Hypolite Petovan [Sun, 26 Mar 2017 02:58:17 +0000 (22:58 -0400)]
Restore separator margins

7 years agoRestores bold text for text dropdown button
Hypolite Petovan [Sun, 26 Mar 2017 01:33:34 +0000 (21:33 -0400)]
Restores bold text for text dropdown button

7 years agoFix superfluous comment box top margin
Hypolite Petovan [Sun, 26 Mar 2017 01:29:13 +0000 (21:29 -0400)]
Fix superfluous comment box top margin

7 years agoFix .btn-link hover/focus color
Hypolite Petovan [Sun, 26 Mar 2017 01:28:53 +0000 (21:28 -0400)]
Fix .btn-link hover/focus color

7 years agoFix indent in search_item.tpl
Hypolite Petovan [Sun, 26 Mar 2017 00:45:03 +0000 (20:45 -0400)]
Fix indent in search_item.tpl

7 years agoVarious fixes
Hypolite Petovan [Sun, 26 Mar 2017 00:43:33 +0000 (20:43 -0400)]
Various fixes

- Removed superfluous CSS rule
- Fixed whitespace
- Restored separators in search_item.tpl

7 years agoMerge branch 'develop' into improvement/frio-action-links-to-buttons
Hypolite Petovan [Sun, 26 Mar 2017 00:27:26 +0000 (20:27 -0400)]
Merge branch 'develop' into improvement/frio-action-links-to-buttons

# Conflicts:
# view/theme/frio/js/filebrowser.js
# view/theme/frio/templates/filebrowser.tpl

7 years agoMerge branch 'develop' of https://github.com/friendica/friendica into develop
Hypolite Petovan [Sun, 26 Mar 2017 00:16:27 +0000 (20:16 -0400)]
Merge branch 'develop' of https://github.com/friendica/friendica into develop