Commit graph

17619 commits

Author SHA1 Message Date
Hypolite Petovan
209c43ebbc Centralize password hashing in Model\User 2018-01-20 17:32:24 -05:00
Hypolite Petovan
b1e3d09533 Fix formatting mod/lostpass 2018-01-20 17:31:13 -05:00
Hypolite Petovan
3ac1992237
Merge pull request #4291 from annando/dont-delete
Don't delete - but only mark as deleted
2018-01-20 17:21:26 -05:00
Michael
7be49d9411 Don't delete - but only mark as deleted 2018-01-20 22:16:43 +00:00
Hypolite Petovan
352dd020a8
Merge pull request #4287 from annando/item-permissions
Overhauled mod/item - fixing wrong thread parent and mail stuff
2018-01-20 16:57:19 -05:00
Michael
745bc7cf3f Merge remote-tracking branch 'upstream/develop' into item-permissions 2018-01-20 19:51:23 +00:00
Michael
670e2ad271 Some safety precautions 2018-01-20 19:48:51 +00:00
Hypolite Petovan
610f017b28
Merge pull request #4288 from zeroadam/Addon
Move plugins to Addon
2018-01-20 14:36:23 -05:00
Michael
b8c4332a20 Only enable "pubmail" when it is enabled 2018-01-20 19:31:47 +00:00
Michael
b57f455dc8 Removed test comment 2018-01-20 17:34:53 +00:00
Adam Magness
fb372877f6 Rename template and doc
Rename admin/plugins.tpl to admin/addons.tpl and update references. Rename doc/de/Plugins.md to Addons.md
2018-01-20 09:45:22 -05:00
Hypolite Petovan
670578f799
Merge pull request #4289 from zeroadam/bugfix-nogroup
Bug fix
2018-01-20 09:31:48 -05:00
Adam Magness
d1b003c694 Bug fix
remove require for deleted file
2018-01-20 09:23:45 -05:00
Michael
1649a12b84 Added documentation 2018-01-20 14:10:37 +00:00
Michael
1b74650807 Reworked mod/item - fixing wrong thread parent and mail stuff 2018-01-20 13:54:14 +00:00
Adam Magness
5d03735238 Update hook names
update hook names and other plugin references.
2018-01-20 08:22:18 -05:00
Adam Magness
ac374f7773 Review updates 2018-01-20 07:48:22 -05:00
Adam Magness
a7d887a68e CSS files
update plugin references in css files.
2018-01-20 07:48:22 -05:00
Adam Magness
20a16b0b35 Update docs
changelog, install and doc folder
2018-01-20 07:48:22 -05:00
Adam Magness
b86b04a81a Change plugin to addon
change the use of plugin to addon where appropriate.
2018-01-20 07:48:22 -05:00
Adam Magness
3bad83f24e Remove old file
remove include/plugin.php
2018-01-20 07:48:22 -05:00
Adam Magness
6c4c567319 Remove require
remove require_once for plugins.php
2018-01-20 07:48:22 -05:00
Adam Magness
d07536e032 Update Theme functions and calls
Update function names and calls for Theme class.
2018-01-20 07:48:22 -05:00
Adam Magness
11cf36105c Update Addon functions and calls
Update function names and calls for Addon class.
2018-01-20 07:48:22 -05:00
Adam Magness
213f6ae1a1 Create Addon and Theme classes
Create Addon and Theme classes and functions from plugin.php to appropriate class.
2018-01-20 07:48:22 -05:00
Michael
b5b298c8d6 Merge remote-tracking branch 'upstream/develop' into item-permissions 2018-01-20 10:17:04 +00:00
Michael Vogel
5d20bbaace
Merge pull request #4282 from MrPetovan/bug/3337-video-max-width
[frio] Add max-width: 100% for video tags
2018-01-20 09:25:17 +01:00
Michael Vogel
104a03e82a
Merge pull request #4283 from MrPetovan/bug/2487-fix-autolink-regex
Fix autolink regular expression to include accents
2018-01-20 09:24:16 +01:00
Michael Vogel
f0a23aa71c
Merge pull request #4284 from MrPetovan/bug/3020-change-siteinfo-to-servers
Change /siteinfo to /servers for directory URL on follow page
2018-01-20 09:19:51 +01:00
Michael Vogel
64dc640565
Merge pull request #4286 from MrPetovan/task/fix-scrutinizer-issues
Fix undefined variables PHP Notice
2018-01-20 08:58:02 +01:00
Hypolite Petovan
4cca8280b4 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
2018-01-19 22:52:49 -05:00
Hypolite Petovan
fee80a57bc Change /siteinfo to /servers for directory URL on follow page 2018-01-19 21:51:42 -05:00
Hypolite Petovan
491a1373e0 Fix autolink regular expression to include accents 2018-01-19 21:39:57 -05:00
Hypolite Petovan
4ed86adfab [frio] Add max-width: 100% for video tags 2018-01-19 20:14:26 -05:00
Michael
f7e3b29819 Improved user id handling 2018-01-19 22:46:24 +00:00
Michael Vogel
ce411da958
Merge pull request #4276 from MrPetovan/bug/4272-upgrade-php-encryption
Remove RINO2
2018-01-19 23:45:37 +01:00
Hypolite Petovan
98344a9d08 Remove reference to RINO version 2 2018-01-19 12:06:09 -05:00
Hypolite Petovan
2c284f30c2 Revert bumping the site RSA key strength to 2048 2018-01-19 11:58:26 -05:00
Hypolite Petovan
dd07c47ab2 Code cleanup in Protocol\DFRN
- Remove commented out code
- Fix mixed quote style
2018-01-19 11:50:43 -05:00
Hypolite Petovan
035394cbf2 RINO code cleanup
- Restore original use Friendica\Util\Crypto
- Remove RINO1 deprecation comments
- Fix undefined variable $rino_remote_version
2018-01-19 11:34:56 -05:00
Hypolite Petovan
633b133db6 [Composer] Remove defuse/php-encryption dependency 2018-01-19 11:28:24 -05:00
Hypolite Petovan
5bc7f4a442 Remove RINO2 and RINO3 2018-01-19 11:27:53 -05:00
Hypolite Petovan
5db1717f46 Re-added missing RINO admin setting values 2018-01-19 11:27:53 -05:00
Hypolite Petovan
2e58120bbb Fix RINO admin setting values 2018-01-19 11:27:53 -05:00
Hypolite Petovan
cadf8c5e5d Bump new users RSA key strength 2018-01-19 11:27:53 -05:00
Hypolite Petovan
de70007a46 Update RINO settings 2018-01-19 11:27:53 -05:00
Hypolite Petovan
7af6cc8454 Add RINO version 3 encrypt/decrypt
- Add legacy decrypt of RINO2
- Add fallback to RINO1 to encrypt
2018-01-19 11:27:53 -05:00
Hypolite Petovan
6857392067 [Composer] Upgrade defuse/php-encryption to version ^2.0 2018-01-19 11:27:53 -05:00
Tobias Diekershoff
5e42577944
Merge pull request #4266 from MrPetovan/task/4116-move-chartjs-to-composer
Move Chart.js to Composer
2018-01-19 15:52:25 +01:00
Hypolite Petovan
8c47df474d
Merge pull request #4277 from annando/item-permissions
Ensure that the user id in a thread always stays the same
2018-01-19 08:18:37 -05:00