]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoMerge remote-tracking branch 'upstream/develop' into item-permissions
Michael [Sat, 20 Jan 2018 19:51:23 +0000 (19:51 +0000)]
Merge remote-tracking branch 'upstream/develop' into item-permissions

6 years agoSome safety precautions
Michael [Sat, 20 Jan 2018 19:48:51 +0000 (19:48 +0000)]
Some safety precautions

6 years agoMerge pull request #4288 from zeroadam/Addon
Hypolite Petovan [Sat, 20 Jan 2018 19:36:23 +0000 (14:36 -0500)]
Merge pull request #4288 from zeroadam/Addon

Move plugins to Addon

6 years agoOnly enable "pubmail" when it is enabled
Michael [Sat, 20 Jan 2018 19:31:47 +0000 (19:31 +0000)]
Only enable "pubmail" when it is enabled

6 years agoRemoved test comment
Michael [Sat, 20 Jan 2018 17:34:53 +0000 (17:34 +0000)]
Removed test comment

6 years agoRename template and doc
Adam Magness [Sat, 20 Jan 2018 14:45:22 +0000 (09:45 -0500)]
Rename template and doc

Rename admin/plugins.tpl to admin/addons.tpl and update references. Rename doc/de/Plugins.md to Addons.md

6 years agoMerge pull request #4289 from zeroadam/bugfix-nogroup
Hypolite Petovan [Sat, 20 Jan 2018 14:31:48 +0000 (09:31 -0500)]
Merge pull request #4289 from zeroadam/bugfix-nogroup

Bug fix

6 years agoBug fix
Adam Magness [Sat, 20 Jan 2018 14:23:45 +0000 (09:23 -0500)]
Bug fix

remove require for deleted file

6 years agoAdded documentation
Michael [Sat, 20 Jan 2018 14:10:37 +0000 (14:10 +0000)]
Added documentation

6 years agoReworked mod/item - fixing wrong thread parent and mail stuff
Michael [Sat, 20 Jan 2018 13:54:14 +0000 (13:54 +0000)]
Reworked mod/item - fixing wrong thread parent and mail stuff

6 years agoUpdate hook names
Adam Magness [Sat, 20 Jan 2018 13:22:18 +0000 (08:22 -0500)]
Update hook names

update hook names and other plugin references.

6 years agoReview updates
Adam Magness [Thu, 18 Jan 2018 00:38:14 +0000 (19:38 -0500)]
Review updates

6 years agoCSS files
Adam Magness [Thu, 18 Jan 2018 00:18:00 +0000 (19:18 -0500)]
CSS files

update plugin references in css files.

6 years agoUpdate docs
Adam Magness [Thu, 18 Jan 2018 00:07:07 +0000 (19:07 -0500)]
Update docs

changelog, install and doc folder

6 years agoChange plugin to addon
Adam Magness [Wed, 17 Jan 2018 19:22:38 +0000 (14:22 -0500)]
Change plugin to addon

change the use of plugin to addon where appropriate.

6 years agoRemove old file
Adam Magness [Wed, 17 Jan 2018 18:56:12 +0000 (13:56 -0500)]
Remove old file

remove include/plugin.php

6 years agoRemove require
Adam Magness [Wed, 17 Jan 2018 18:55:29 +0000 (13:55 -0500)]
Remove require

remove require_once for plugins.php

6 years agoUpdate Theme functions and calls
Adam Magness [Wed, 17 Jan 2018 18:52:25 +0000 (13:52 -0500)]
Update Theme functions and calls

Update function names and calls for Theme class.

6 years agoUpdate Addon functions and calls
Adam Magness [Wed, 17 Jan 2018 18:42:40 +0000 (13:42 -0500)]
Update Addon functions and calls

Update function names and calls for Addon class.

6 years agoCreate Addon and Theme classes
Adam Magness [Wed, 17 Jan 2018 17:03:10 +0000 (12:03 -0500)]
Create Addon and Theme classes

Create Addon and Theme classes and functions from plugin.php to appropriate class.

6 years agoMerge remote-tracking branch 'upstream/develop' into item-permissions
Michael [Sat, 20 Jan 2018 10:17:04 +0000 (10:17 +0000)]
Merge remote-tracking branch 'upstream/develop' into item-permissions

6 years agoMerge pull request #4282 from MrPetovan/bug/3337-video-max-width
Michael Vogel [Sat, 20 Jan 2018 08:25:17 +0000 (09:25 +0100)]
Merge pull request #4282 from MrPetovan/bug/3337-video-max-width

[frio] Add max-width: 100% for video tags

6 years agoMerge pull request #4283 from MrPetovan/bug/2487-fix-autolink-regex
Michael Vogel [Sat, 20 Jan 2018 08:24:16 +0000 (09:24 +0100)]
Merge pull request #4283 from MrPetovan/bug/2487-fix-autolink-regex

Fix autolink regular expression to include accents

6 years agoMerge pull request #4284 from MrPetovan/bug/3020-change-siteinfo-to-servers
Michael Vogel [Sat, 20 Jan 2018 08:19:51 +0000 (09:19 +0100)]
Merge pull request #4284 from MrPetovan/bug/3020-change-siteinfo-to-servers

Change /siteinfo to /servers for directory URL on follow page

6 years agoMerge pull request #4286 from MrPetovan/task/fix-scrutinizer-issues
Michael Vogel [Sat, 20 Jan 2018 07:58:02 +0000 (08:58 +0100)]
Merge pull request #4286 from MrPetovan/task/fix-scrutinizer-issues

Fix undefined variables PHP Notice

6 years agoFix undefined variables PHP Notice
Hypolite Petovan [Fri, 19 Jan 2018 05:32:37 +0000 (00:32 -0500)]
Fix undefined variables PHP Notice

- $order_string in include/dba
- $limit_string in include/dba
- $search in mod/search
- $lang_list in include/pgettext.php

6 years agoChange /siteinfo to /servers for directory URL on follow page
Hypolite Petovan [Sat, 20 Jan 2018 02:51:42 +0000 (21:51 -0500)]
Change /siteinfo to /servers for directory URL on follow page

6 years agoFix autolink regular expression to include accents
Hypolite Petovan [Sat, 20 Jan 2018 02:39:57 +0000 (21:39 -0500)]
Fix autolink regular expression to include accents

6 years ago[frio] Add max-width: 100% for video tags
Hypolite Petovan [Sat, 20 Jan 2018 01:14:26 +0000 (20:14 -0500)]
[frio] Add max-width: 100% for video tags

6 years agoImproved user id handling
Michael [Fri, 19 Jan 2018 22:46:24 +0000 (22:46 +0000)]
Improved user id handling

6 years agoMerge pull request #4276 from MrPetovan/bug/4272-upgrade-php-encryption
Michael Vogel [Fri, 19 Jan 2018 22:45:37 +0000 (23:45 +0100)]
Merge pull request #4276 from MrPetovan/bug/4272-upgrade-php-encryption

Remove RINO2

6 years agoRemove reference to RINO version 2
Hypolite Petovan [Fri, 19 Jan 2018 17:06:09 +0000 (12:06 -0500)]
Remove reference to RINO version 2

6 years agoRevert bumping the site RSA key strength to 2048
Hypolite Petovan [Fri, 19 Jan 2018 16:58:26 +0000 (11:58 -0500)]
Revert bumping the site RSA key strength to 2048

6 years agoCode cleanup in Protocol\DFRN
Hypolite Petovan [Fri, 19 Jan 2018 16:50:43 +0000 (11:50 -0500)]
Code cleanup in Protocol\DFRN

- Remove commented out code
- Fix mixed quote style

6 years agoRINO code cleanup
Hypolite Petovan [Fri, 19 Jan 2018 16:34:56 +0000 (11:34 -0500)]
RINO code cleanup

- Restore original use Friendica\Util\Crypto
- Remove RINO1 deprecation comments
- Fix undefined variable $rino_remote_version

6 years ago[Composer] Remove defuse/php-encryption dependency
Hypolite Petovan [Fri, 19 Jan 2018 16:26:06 +0000 (11:26 -0500)]
[Composer] Remove defuse/php-encryption dependency

6 years agoRemove RINO2 and RINO3
Hypolite Petovan [Fri, 19 Jan 2018 16:25:48 +0000 (11:25 -0500)]
Remove RINO2 and RINO3

6 years agoRe-added missing RINO admin setting values
Hypolite Petovan [Fri, 19 Jan 2018 13:13:32 +0000 (08:13 -0500)]
Re-added missing RINO admin setting values

6 years agoFix RINO admin setting values
Hypolite Petovan [Fri, 19 Jan 2018 13:10:59 +0000 (08:10 -0500)]
Fix RINO admin setting values

6 years agoBump new users RSA key strength
Hypolite Petovan [Fri, 19 Jan 2018 04:47:54 +0000 (23:47 -0500)]
Bump new users RSA key strength

6 years agoUpdate RINO settings
Hypolite Petovan [Fri, 19 Jan 2018 01:15:56 +0000 (20:15 -0500)]
Update RINO settings

6 years agoAdd RINO version 3 encrypt/decrypt
Hypolite Petovan [Fri, 19 Jan 2018 01:15:26 +0000 (20:15 -0500)]
Add RINO version 3 encrypt/decrypt

- Add legacy decrypt of RINO2
- Add fallback to RINO1 to encrypt

6 years ago[Composer] Upgrade defuse/php-encryption to version ^2.0
Hypolite Petovan [Fri, 19 Jan 2018 01:13:50 +0000 (20:13 -0500)]
[Composer] Upgrade defuse/php-encryption to version ^2.0

6 years agoMerge pull request #4266 from MrPetovan/task/4116-move-chartjs-to-composer
Tobias Diekershoff [Fri, 19 Jan 2018 14:52:25 +0000 (15:52 +0100)]
Merge pull request #4266 from MrPetovan/task/4116-move-chartjs-to-composer

Move Chart.js to Composer

6 years agoMerge pull request #4277 from annando/item-permissions
Hypolite Petovan [Fri, 19 Jan 2018 13:18:37 +0000 (08:18 -0500)]
Merge pull request #4277 from annando/item-permissions

Ensure that the user id in a thread always stays the same

6 years agoJust some precaution
Michael [Fri, 19 Jan 2018 07:50:11 +0000 (07:50 +0000)]
Just some precaution

6 years agoEnsure that the user id in a thread always stays the same
Michael [Fri, 19 Jan 2018 07:02:43 +0000 (07:02 +0000)]
Ensure that the user id in a thread always stays the same

6 years agoFix formatting in federation.tpl
Hypolite Petovan [Thu, 18 Jan 2018 16:24:56 +0000 (11:24 -0500)]
Fix formatting in federation.tpl

6 years agoRevert tabs into space in federation.tpl
Hypolite Petovan [Thu, 18 Jan 2018 16:16:16 +0000 (11:16 -0500)]
Revert tabs into space in federation.tpl

6 years agoDelete library/Chart.js
Hypolite Petovan [Wed, 17 Jan 2018 03:51:31 +0000 (22:51 -0500)]
Delete library/Chart.js

6 years agoMigrate federation page to latest version of Chart.js
Hypolite Petovan [Wed, 17 Jan 2018 03:50:48 +0000 (22:50 -0500)]
Migrate federation page to latest version of Chart.js

6 years agoAdd Chart.js to Composer
Hypolite Petovan [Wed, 17 Jan 2018 03:50:33 +0000 (22:50 -0500)]
Add Chart.js to Composer

6 years agoMerge pull request #4267 from MrPetovan/task/4116-move-colorbox-to-composer
Michael Vogel [Thu, 18 Jan 2018 21:34:20 +0000 (22:34 +0100)]
Merge pull request #4267 from MrPetovan/task/4116-move-colorbox-to-composer

Move JQuery/colorbox to Composer

6 years agoMerge pull request #4275 from annando/like-dislike
Hypolite Petovan [Thu, 18 Jan 2018 21:30:18 +0000 (16:30 -0500)]
Merge pull request #4275 from annando/like-dislike

Liking of your own stuff wasn't possible/enable dislike for Diaspora

6 years ago"save to folder" and "mark" can't work on global items
Michael [Thu, 18 Jan 2018 20:54:40 +0000 (20:54 +0000)]
"save to folder" and "mark" can't work on global items

6 years agoLiking of your own stuff wasn't possible/enable dislike for Diaspora
Michael [Thu, 18 Jan 2018 20:16:14 +0000 (20:16 +0000)]
Liking of your own stuff wasn't possible/enable dislike for Diaspora

6 years agoMerge pull request #4274 from annando/signature-atuff
Hypolite Petovan [Thu, 18 Jan 2018 19:50:23 +0000 (14:50 -0500)]
Merge pull request #4274 from annando/signature-atuff

Bugfix: The Diaspora signature wasn't stored by nested comments

6 years agoBugfix: The Diaspora signature wasn't stored by nested comments
Michael [Thu, 18 Jan 2018 19:38:51 +0000 (19:38 +0000)]
Bugfix: The Diaspora signature wasn't stored by nested comments

6 years agoUpdated composer.lock
Hypolite Petovan [Thu, 18 Jan 2018 16:29:00 +0000 (11:29 -0500)]
Updated composer.lock

6 years agoRemove js/jquery.js
Hypolite Petovan [Thu, 18 Jan 2018 00:45:45 +0000 (19:45 -0500)]
Remove js/jquery.js

6 years agoDowngrade jquery to 1.12.4
Hypolite Petovan [Thu, 18 Jan 2018 00:40:59 +0000 (19:40 -0500)]
Downgrade jquery to 1.12.4

6 years agoUpdate references to jquery
Hypolite Petovan [Wed, 17 Jan 2018 05:06:25 +0000 (00:06 -0500)]
Update references to jquery

6 years agoRemove colorbox from library
Hypolite Petovan [Wed, 17 Jan 2018 05:01:55 +0000 (00:01 -0500)]
Remove colorbox from library

6 years agoUpdate references to colorbox css and js files
Hypolite Petovan [Wed, 17 Jan 2018 05:01:34 +0000 (00:01 -0500)]
Update references to colorbox css and js files

- Remove commented out references to other css/js files

6 years agoAdd jquery and jquery-colorbox to Composer
Hypolite Petovan [Wed, 17 Jan 2018 04:58:14 +0000 (23:58 -0500)]
Add jquery and jquery-colorbox to Composer

- Fix selector syntax issue with newer version of JQuery

6 years agoMerge pull request #4271 from annando/last-child
Hypolite Petovan [Thu, 18 Jan 2018 13:09:46 +0000 (08:09 -0500)]
Merge pull request #4271 from annando/last-child

 "last-child" is not used anymore

6 years agoMerge pull request #4264 from annando/item-delete
Hypolite Petovan [Thu, 18 Jan 2018 13:02:50 +0000 (08:02 -0500)]
Merge pull request #4264 from annando/item-delete

There is now a new delete function in the item class

6 years ago"last-child" is not used anymore
Michael [Thu, 18 Jan 2018 06:54:44 +0000 (06:54 +0000)]
"last-child" is not used anymore

6 years agoMerge pull request #4269 from MrPetovan/task/4265-move-base64-to-composer
Michael Vogel [Thu, 18 Jan 2018 06:04:18 +0000 (07:04 +0100)]
Merge pull request #4269 from MrPetovan/task/4265-move-base64-to-composer

Move base64 to Composer

6 years agoMerge pull request #4270 from tobiasd/20180118-fixDEdocs
Michael Vogel [Thu, 18 Jan 2018 05:44:59 +0000 (06:44 +0100)]
Merge pull request #4270 from tobiasd/20180118-fixDEdocs

added link to update documentation to DE index. Followup on #4259

6 years agoadded link to update documentation to DE index. Followup on #4259
Tobias Diekershoff [Thu, 18 Jan 2018 04:59:44 +0000 (05:59 +0100)]
added link to update documentation to DE index. Followup on #4259

6 years agoRemove js/webtoolkit.base64
Hypolite Petovan [Thu, 18 Jan 2018 02:24:04 +0000 (21:24 -0500)]
Remove js/webtoolkit.base64

6 years agoUpdate all references to webtoolkit.base64
Hypolite Petovan [Thu, 18 Jan 2018 02:23:51 +0000 (21:23 -0500)]
Update all references to webtoolkit.base64

6 years agoAdd bower/base64 to Composer
Hypolite Petovan [Thu, 18 Jan 2018 02:23:03 +0000 (21:23 -0500)]
Add bower/base64 to Composer

6 years agoRemove unused jquery.htmlstream Javascript library
Hypolite Petovan [Thu, 18 Jan 2018 02:22:42 +0000 (21:22 -0500)]
Remove unused jquery.htmlstream Javascript library

6 years agoMerge pull request #4259 from MrPetovan/task/4116-remove-vendor-from-git
Michael Vogel [Thu, 18 Jan 2018 00:02:55 +0000 (01:02 +0100)]
Merge pull request #4259 from MrPetovan/task/4116-remove-vendor-from-git

Remove vendor from git

6 years agoThe delete function is now changed to the new function
Michael [Wed, 17 Jan 2018 23:22:01 +0000 (23:22 +0000)]
The delete function is now changed to the new function

6 years agoMerge remote-tracking branch 'upstream/develop' into item-delete
Michael [Wed, 17 Jan 2018 21:54:17 +0000 (21:54 +0000)]
Merge remote-tracking branch 'upstream/develop' into item-delete

6 years agoRemove orphan documentation pages
Hypolite Petovan [Wed, 17 Jan 2018 20:31:25 +0000 (15:31 -0500)]
Remove orphan documentation pages

6 years agoUpdate GitHub documentation page
Hypolite Petovan [Wed, 17 Jan 2018 20:31:11 +0000 (15:31 -0500)]
Update GitHub documentation page

- Add composer install part
- Fix GitHub name capitalization

6 years agoAdd documentation about new array syntax
Hypolite Petovan [Wed, 17 Jan 2018 20:30:47 +0000 (15:30 -0500)]
Add documentation about new array syntax

6 years agoAdd Update documentation page
Hypolite Petovan [Wed, 17 Jan 2018 20:30:34 +0000 (15:30 -0500)]
Add Update documentation page

6 years agoMerge pull request #4262 from fabrixxm/frio-login
Hypolite Petovan [Wed, 17 Jan 2018 16:28:53 +0000 (11:28 -0500)]
Merge pull request #4262 from fabrixxm/frio-login

Frio: restyle login page episode II • Attack of the Clones

6 years agofix for coding standars
fabrixxm [Wed, 17 Jan 2018 16:27:27 +0000 (17:27 +0100)]
fix for coding standars

6 years agoMerge pull request #4261 from annando/bugfix-process
Hypolite Petovan [Wed, 17 Jan 2018 15:45:16 +0000 (10:45 -0500)]
Merge pull request #4261 from annando/bugfix-process

Avoid sql error in process handling

6 years agoUpdated installer dependency to PHP 5.6 and ext-xml
Hypolite Petovan [Wed, 17 Jan 2018 15:35:54 +0000 (10:35 -0500)]
Updated installer dependency to PHP 5.6 and ext-xml

- Updated doc

6 years agoFrio: add login background color admin option
fabrixxm [Wed, 17 Jan 2018 15:33:27 +0000 (16:33 +0100)]
Frio: add login background color admin option

6 years agofrio: tweak login template, fix style
fabrixxm [Wed, 17 Jan 2018 15:01:34 +0000 (16:01 +0100)]
frio: tweak login template, fix style

move lost pwd link and register to submit wrapper,
use flexbox for submit row in login form,
show register link as button
fix form label colors in mobile

6 years agoAvoid sql error in process handling
Michael [Wed, 17 Jan 2018 14:10:30 +0000 (14:10 +0000)]
Avoid sql error in process handling

6 years agoWall postings need to be treated especially as well.
Michael [Wed, 17 Jan 2018 14:09:24 +0000 (14:09 +0000)]
Wall postings need to be treated especially as well.

6 years agoFrio: fix home page
fabrixxm [Wed, 17 Jan 2018 12:29:04 +0000 (13:29 +0100)]
Frio: fix home page

Add home.tpl, fix style with custom home.html, fix style with custom page content from addon

6 years agoUse template home.tpl for mod/home
fabrixxm [Wed, 17 Jan 2018 12:27:41 +0000 (13:27 +0100)]
Use template home.tpl for mod/home

6 years agoDelete could work now, needs testing
Michael [Wed, 17 Jan 2018 07:08:49 +0000 (07:08 +0000)]
Delete could work now, needs testing

6 years agoMerge remote-tracking branch 'upstream/develop' into item-delete
Michael [Wed, 17 Jan 2018 06:12:11 +0000 (06:12 +0000)]
Merge remote-tracking branch 'upstream/develop' into item-delete

6 years agoMerge pull request #4253 from MrPetovan/task/fix-scrutinizer-issues
Michael Vogel [Wed, 17 Jan 2018 06:08:51 +0000 (07:08 +0100)]
Merge pull request #4253 from MrPetovan/task/fix-scrutinizer-issues

[Scrutinizer] App.php / Create Model\Process

6 years agoAdd missing include in Model\Process
Hypolite Petovan [Tue, 16 Jan 2018 01:54:06 +0000 (20:54 -0500)]
Add missing include in Model\Process

6 years agoFix issues in changed files
Hypolite Petovan [Tue, 16 Jan 2018 00:27:48 +0000 (19:27 -0500)]
Fix issues in changed files

- Initializes $return in Process::insert
- Update the type hint of dba::fetch
- Remove unused $a parameter in worker_init()
- Fix uses

6 years agoFix issues in App.php
Hypolite Petovan [Tue, 16 Jan 2018 00:13:21 +0000 (19:13 -0500)]
Fix issues in App.php

- Fix formatting
- Add method visibility
- Remove unused properties
- Remove unused methods
- Remove unused parameters
- Fix implode parameter order (?!)

6 years agoMove process functions to Model\Process
Hypolite Petovan [Tue, 16 Jan 2018 00:08:28 +0000 (19:08 -0500)]
Move process functions to Model\Process

- Add start|endProcess functions to Core\Worker

6 years agoFix references to text_highlighter css
Hypolite Petovan [Wed, 17 Jan 2018 04:48:07 +0000 (23:48 -0500)]
Fix references to text_highlighter css