Commit graph

22886 commits

Author SHA1 Message Date
Michael
5ded967129 Fix database error 2019-01-27 19:54:08 +00:00
Hypolite Petovan
c9a6063a2a
Merge pull request #6531 from Ixiter/develop-theme-frio
frio - fix PHP Notices reported in #6338
2019-01-27 08:01:08 -05:00
Peter Liebetrau
eee0e22856 frio - fix PHP Notices reported in #6338 2019-01-27 13:21:18 +01:00
Tobias Diekershoff
c11145d311
Merge pull request #6528 from MrPetovan/bug/html-bull-bullet
Switch to supported HTML entity for bullet in delivery indicator
2019-01-27 07:28:24 +01:00
Hypolite Petovan
6319d9671c
Merge pull request #6530 from Ixiter/develop-theme-frio
frio - fixed bug in admin users with table sorting #6529
2019-01-26 22:55:21 -05:00
Peter Liebetrau
cd19cce92e frio - fix bug in admin users with table sorting #6529 2019-01-27 04:06:51 +01:00
Peter Liebetrau
431306b026
Merge pull request #1 from friendica/develop
sync with friendica
2019-01-27 02:18:50 +01:00
Hypolite Petovan
043521fb47 Switch to supported HTML entity for bullet in delivery indicator 2019-01-26 19:42:13 -05:00
Hypolite Petovan
0a284edde7
Merge pull request #6527 from Ixiter/develop-theme-frio
frio - fixed bug in user menu for visitors
2019-01-26 19:40:49 -05:00
Peter Liebetrau
189e179088 frio - fixed bug in user menu for visitors - see after-merge discussion in #6526 2019-01-26 23:02:23 +01:00
Hypolite Petovan
16b8d29d3e
Merge pull request #6526 from Ixiter/develop-theme-frio
frio - fixed bug in user menu for remote user - see issue #6495
2019-01-26 15:03:20 -05:00
Hypolite Petovan
2d49b71a4c
Merge pull request #6516 from Ixiter/develop
BBCode - added preg_replaces for local [url] links without target="_blank"
2019-01-26 14:22:34 -05:00
Peter Liebetrau
7918e41097 frio - fixed bug in user menu for remote user - see issue #6495 2019-01-26 20:15:56 +01:00
Hypolite Petovan
fe7f9d386d
Merge pull request #6523 from annando/ap-forum
Preparation for forum posts over AP
2019-01-26 09:00:19 -05:00
Hypolite Petovan
21f9d8fcc9
Merge pull request #6520 from Aditoo17/develop
Replace help/guide with help/Quick-Start-guide in newmember
2019-01-26 08:54:34 -05:00
Michael
9f2e9dfc1b Fetchting the original post at first, then the other way is dafer. 2019-01-26 12:09:38 +00:00
Michael
ad782b55ef Preparation for forum posts over AP 2019-01-26 12:03:09 +00:00
Aditoo17
0564e710f0
Replace help/guide with help/Quick-Start-guide 2019-01-26 10:51:20 +01:00
Hypolite Petovan
d63edd14d9
Merge pull request #6518 from tobiasd/20190125-themes
added nofilter to banner in smoothy and quaddro
2019-01-25 14:04:20 -05:00
Tobias Diekershoff
8b8187ee9c added nofilter to banner in smoothy and quaddro 2019-01-25 19:37:37 +01:00
Peter Liebetrau
41663c7592 BBCode - fixed syntax error 2019-01-25 17:33:25 +01:00
Peter Liebetrau
54bec2bc8e BBCode - optimized preg searchstring 2019-01-25 17:25:42 +01:00
Peter Liebetrau
71e58a0f42 BBCode - optimized preg escaping of searchstring 2019-01-25 16:56:28 +01:00
peter
6ba08e510d BBCode - removed convert for relative URLs 2019-01-25 15:32:31 +01:00
peter
a505dbbe5c BBCode - fixed code styling 2019-01-25 01:25:06 +01:00
peter
ae806a593d BBCode - added preg_replacers for local [url] without target="_blank" 2019-01-25 01:15:43 +01:00
Hypolite Petovan
2b0610eaf5
Merge pull request #6515 from annando/connector-posts
Fix: Connector posts now do work again (postopts hadn't been stored)
2019-01-24 16:23:34 -05:00
Michael
7cba8942c7 Fix: Connector posts now do work again (postopts hadn't been stored) 2019-01-24 21:06:53 +00:00
Hypolite Petovan
abf9056449
Merge pull request #6513 from annando/dfrn-reply
DFRN comments are now stored as comments again
2019-01-24 15:55:44 -05:00
Michael
ebb84f5e43 DFRN comments are now stored as comments again 2019-01-24 18:54:45 +00:00
Hypolite Petovan
77179612df
Merge pull request #6512 from JeroenED/task/fix-6511
Added nofilter to geotag
2019-01-24 11:34:31 -05:00
Jeroen De Meerleer
6fb2383116 Added nofilter to geotag
Fixes issue GH-6511
2019-01-24 17:23:25 +01:00
Tobias Diekershoff
99199ee93b
Merge pull request #6510 from annando/logger2
Logger: Display the correct file, function and line number
2019-01-24 16:11:10 +01:00
Michael
b90c8c6346 Logger: Display the correct file, function and line number 2019-01-24 14:23:42 +00:00
Hypolite Petovan
45f0f23f08
Merge pull request #6507 from annando/composer
Updated composer.lock
2019-01-24 07:51:30 -05:00
Michael Vogel
6e7ca479d6
Merge pull request #6508 from nupplaphil/logger_enh
Adding an explicit FriendicaProcessor
2019-01-24 11:15:57 +01:00
Philipp Holzer
7634663970
Adding an explicit FriendicaProcessor 2019-01-24 08:13:44 +01:00
Michael
4664d42a46 Updated composer.lock 2019-01-24 06:36:05 +00:00
Hypolite Petovan
a286bc98c6
Update requirements with PHP 7.1+, MySQL 5.6+ and MariaDB 10.0.5+ 2019-01-24 01:25:01 -05:00
Michael Vogel
be1b398caf
Merge pull request #6506 from MrPetovan/bug/6386-fix-fatal-errors
Fix fatal errors
2019-01-24 07:12:13 +01:00
Hypolite Petovan
46315f6946 Fix missing use statement in Module\Inbox 2019-01-23 21:22:39 -05:00
Hypolite Petovan
8a554fef2d Fix missing library include in Database\DBstructure 2019-01-23 21:22:26 -05:00
Hypolite Petovan
bce8ab7227
Merge pull request #6504 from annando/fix-fatal
Fix for several fatal errors
2019-01-23 20:59:55 -05:00
Michael
3392c7a8be Fixed "created" origin 2019-01-24 00:34:14 +00:00
Michael
7e31cebb67 Parameters redone 2019-01-23 22:04:14 +00:00
Michael
0fdab4ed10 Fix for several fatal errors 2019-01-23 21:54:20 +00:00
Michael Vogel
08da1ed038
Merge pull request #6485 from MrPetovan/bug/fixes-after-2019-03-develop-rebase
More fixes after develop rebase
2019-01-23 15:38:27 +01:00
Hypolite Petovan
41136e53cc [Travis] Update target PHP versions 2019-01-23 09:07:02 -05:00
Hypolite Petovan
004818ca1b Fix indentation in Module\Inbox 2019-01-23 09:07:02 -05:00
Hypolite Petovan
0d9209a74b Add AP Inbox logging back with config 2019-01-23 09:07:01 -05:00