Commit graph

21955 commits

Author SHA1 Message Date
Jonny Tischbein
d0c43c5597 Add prompt for link and media in comment + remove video symbol 2018-10-23 19:50:19 +02:00
Ralf Thees
580b7530ca Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-23 18:19:21 +02:00
e6fd05d8e8
Merge pull request #6011 from fabrixxm/issues/6010
Fix move from Core\Addon to Core\Hook
2018-10-23 11:43:41 -04:00
fabrixxm
035603a516 Replace Frienica\Core\Addon::isApp() withi Friendica\Core\Hook::isAddonApp()
fix #6010
2018-10-23 17:27:53 +02:00
Ralf Thees
53c7e50f12 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-23 17:18:23 +02:00
1a1300f1bf
Merge pull request #6009 from vinzv/develop
raising profile photo size to comply with frio sidebar profile photo scaling
2018-10-23 10:48:03 -04:00
cb75c40f4e adapted profile pic resize to 300px for whole system 2018-10-23 16:36:57 +02:00
Ralf Thees
5583c070e0 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-23 15:52:29 +02:00
95f9337e0e adapted 300px image size for default avatar 2018-10-23 15:16:58 +02:00
cbc898d902 raising profile photo size to comply with frio sidebar profile photo
skaling
2018-10-23 14:30:21 +02:00
Michael Vogel
d61a98a995
Merge pull request #6008 from nupplaphil/fixing_tests_2
Fixing tests - part 2
2018-10-23 14:23:59 +02:00
a79daf3946
Fixing tests - part 2 2018-10-23 13:53:48 +02:00
rabuzarus
db8968c912
Merge pull request #6005 from nupplaphil/friendica-5996
Fixing absolute/relative path
2018-10-23 12:26:28 +02:00
3e6ea9383b
Making redirect message more informative 2018-10-23 12:17:41 +02:00
9e322d2565
Fixing absolute/relative path 2018-10-23 12:14:17 +02:00
dbe49a0c1a
Merge pull request #5998 from annando/ap-queue
Unsuccessful ActivitiyPub transmission are now deferred
2018-10-23 06:54:11 +02:00
e3e714a45f Unsuccessful ActivitiyPub transmission are now deferred 2018-10-23 03:54:18 +00:00
fdbf244945
Adding missing parentheses in mod/dfrn_poll 2018-10-22 22:44:17 -04:00
dc35d2f2f3
Merge pull request #5997 from annando/notice-relocation
Fix a notice when sending relocation messages
2018-10-22 22:40:47 -04:00
3dc0bb5c4b Fix a notice when sending relocation messages 2018-10-23 02:24:24 +00:00
045bd1f0e4
Merge pull request #5995 from FiXato/patch-1
Updated Friendiqa's links
2018-10-22 21:13:22 -04:00
b6a0b686c4
Fix missing instance of Addon::isEnabled in App 2018-10-22 21:09:53 -04:00
Filip H.F. "FiXato" Slagter
d7a7c51e3e
Updated link to Friendiqa's links
Friendiqa no longer seems to be hosted on Github, so I've updated the src link to the repository on git.friendi.ca.
I've also added a link to the app on the Google Play store.
2018-10-23 03:07:11 +02:00
Ralf Thees
f1ad1a07df Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-23 00:12:22 +02:00
373df31817
Fix wrong namespace for Core\System in App 2018-10-22 18:07:00 -04:00
Ralf Thees
fff0dafbdd Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-23 00:05:03 +02:00
f6e064195a
Fix Fatal Error in App 2018-10-22 18:01:17 -04:00
Ralf Thees
ff203c277d Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-22 23:20:00 +02:00
Michael Vogel
ebc97ba8fe
Merge pull request #5981 from MrPetovan/task/move-dbstructure-to-php
Move dbstructure to PHP array
2018-10-22 23:19:38 +02:00
a22196edae Add/Fix Doxygen headers for classes 2018-10-22 16:50:55 -04:00
9eaedc576c Remove unused dbstructure hook call in App->loadDatabase 2018-10-22 16:50:55 -04:00
2debdbd0c9 Fix dbstructure console outputting addon structure as well 2018-10-22 16:50:55 -04:00
015e2a84b1 Remove obsolete require_once include/dba from Core\Addon and Core\Hook 2018-10-22 16:50:55 -04:00
19ffc0510b Move DB_UPDATE_VERSION from boot.php to config/dbstructure.php 2018-10-22 16:50:55 -04:00
fad99b8619 Switch from dbstructure.json to dbstructure.php 2018-10-22 16:50:55 -04:00
e511790d62 Move NULL_DATE from boot.php to DBA::NULL_DATETIME
- Add DBA::NULL_DATE constant
2018-10-22 16:50:55 -04:00
ca9cad3491 Move hook-related methods from Core\Addon to Core\Hook 2018-10-22 16:50:54 -04:00
0aa7671119 Add new Core\Hook class 2018-10-22 16:49:53 -04:00
Michael Vogel
c0abff0bda
Merge pull request #5990 from MrPetovan/task/move-apps-out-of-app
Road to Router Part 4: Move $apps out of App
2018-10-22 22:47:22 +02:00
2a881cc2e7
Merge pull request #5907 from nupplaphil/goaway_to_redirectto
Replaced goaway() with System::redirect()
2018-10-22 16:22:41 -04:00
3072c56057
goaway fix in App 2018-10-22 22:15:50 +02:00
32af52842b
adding defaults in mod/redir.php 2018-10-22 22:13:41 +02:00
363d00cc45
Adding $a->getBaseURL for Worker in profile_photo
Adding a TODO for Contact::magicLink
2018-10-22 22:13:39 +02:00
34989480e1
removed unnecessary System use 2018-10-22 22:13:39 +02:00
95f3c3eca0
replaced a relative url with path 2018-10-22 22:13:38 +02:00
722a86a7ca
replaced onerror_url with onerror_path 2018-10-22 22:13:38 +02:00
d51e931db7
replaced forwardurl with forward_path 2018-10-22 22:13:37 +02:00
3edad1591e
replaced $return_url to $return_path to make it more clear that it is a relative path to the Friendica baseurl 2018-10-22 22:13:37 +02:00
a9510ffcdf
description fix 2018-10-22 22:13:37 +02:00
d00ddc01af
Split goaway to System::externalRedirectTo() and App->internalRedirect() 2018-10-22 22:13:35 +02:00