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 |
|
Michael
|
d22adc98b2
|
Just some precaution
|
2018-01-19 07:50:11 +00:00 |
|
Michael
|
a07670ac30
|
Ensure that the user id in a thread always stays the same
|
2018-01-19 07:02:43 +00:00 |
|
Hypolite Petovan
|
910fda2383
|
Fix formatting in federation.tpl
|
2018-01-18 16:38:23 -05:00 |
|
Hypolite Petovan
|
b963e7cc38
|
Revert tabs into space in federation.tpl
|
2018-01-18 16:38:23 -05:00 |
|
Hypolite Petovan
|
269b3ee2a4
|
Delete library/Chart.js
|
2018-01-18 16:38:23 -05:00 |
|
Hypolite Petovan
|
383641f58f
|
Migrate federation page to latest version of Chart.js
|
2018-01-18 16:38:23 -05:00 |
|
Hypolite Petovan
|
ffa240dfde
|
Add Chart.js to Composer
|
2018-01-18 16:38:23 -05:00 |
|
Michael Vogel
|
4f43d9e501
|
Merge pull request #4267 from MrPetovan/task/4116-move-colorbox-to-composer
Move JQuery/colorbox to Composer
|
2018-01-18 22:34:20 +01:00 |
|
Hypolite Petovan
|
380ae224a0
|
Merge pull request #4275 from annando/like-dislike
Liking of your own stuff wasn't possible/enable dislike for Diaspora
|
2018-01-18 16:30:18 -05:00 |
|
Michael
|
7b3e334f06
|
"save to folder" and "mark" can't work on global items
|
2018-01-18 20:54:40 +00:00 |
|
Michael
|
2df44eb084
|
Liking of your own stuff wasn't possible/enable dislike for Diaspora
|
2018-01-18 20:16:14 +00:00 |
|
Hypolite Petovan
|
271f0629f0
|
Merge pull request #4274 from annando/signature-atuff
Bugfix: The Diaspora signature wasn't stored by nested comments
|
2018-01-18 14:50:23 -05:00 |
|
Michael
|
b6f15ec5ce
|
Bugfix: The Diaspora signature wasn't stored by nested comments
|
2018-01-18 19:38:51 +00:00 |
|
Hypolite Petovan
|
e210fdc625
|
Updated composer.lock
|
2018-01-18 11:29:00 -05:00 |
|
Hypolite Petovan
|
c76fc26206
|
Remove js/jquery.js
|
2018-01-18 11:27:51 -05:00 |
|
Hypolite Petovan
|
e531219e7a
|
Downgrade jquery to 1.12.4
|
2018-01-18 11:27:51 -05:00 |
|
Hypolite Petovan
|
b432a17538
|
Update references to jquery
|
2018-01-18 11:27:14 -05:00 |
|
Hypolite Petovan
|
a948e06391
|
Remove colorbox from library
|
2018-01-18 11:27:14 -05:00 |
|
Hypolite Petovan
|
9ee1b14b2b
|
Update references to colorbox css and js files
- Remove commented out references to other css/js files
|
2018-01-18 11:27:14 -05:00 |
|
Hypolite Petovan
|
61238d5e23
|
Add jquery and jquery-colorbox to Composer
- Fix selector syntax issue with newer version of JQuery
|
2018-01-18 11:27:14 -05:00 |
|
Hypolite Petovan
|
7eb637c6ea
|
Merge pull request #4271 from annando/last-child
"last-child" is not used anymore
|
2018-01-18 08:09:46 -05:00 |
|
Hypolite Petovan
|
c69d60644f
|
Merge pull request #4264 from annando/item-delete
There is now a new delete function in the item class
|
2018-01-18 08:02:50 -05:00 |
|
Michael
|
034d46196f
|
"last-child" is not used anymore
|
2018-01-18 06:54:44 +00:00 |
|
Michael Vogel
|
13059f5396
|
Merge pull request #4269 from MrPetovan/task/4265-move-base64-to-composer
Move base64 to Composer
|
2018-01-18 07:04:18 +01:00 |
|
Michael Vogel
|
9196b098c2
|
Merge pull request #4270 from tobiasd/20180118-fixDEdocs
added link to update documentation to DE index. Followup on #4259
|
2018-01-18 06:44:59 +01:00 |
|