strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
21407 commits 2 branches 55 tags 148 MiB
Commit graph

21407 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael c25d60e107 Removed finished work from the comments 2018-10-24 04:51:37 +00:00
Michael a6f6db8d4e Improve query speed 2018-10-24 04:50:27 +00:00
Michael c0a24d80dd Remove items more memory friendly 2018-10-24 04:46:45 +00:00
Hypolite Petovan 7538dd2084
Merge pull request #6014 from annando/deferred-tasks 
Show deferred worker tasks in the admin interface and workerqueue logs
 2018-10-23 17:39:31 -04:00
Michael 95dc030926 Show deferred worker tasks in the admin interface and workerqueue logs 2018-10-23 20:38:28 +00:00
Jonny Tischbein ee006bdc18 Code Standards 2018-10-23 20:12:53 +02:00
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
Hypolite Petovan 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
Hypolite Petovan 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
vinzv 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
vinzv 95f9337e0e adapted 300px image size for default avatar 2018-10-23 15:16:58 +02:00
vinzv 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
Philipp Holzer 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
Philipp Holzer 3e6ea9383b
Making redirect message more informative 2018-10-23 12:17:41 +02:00
Philipp Holzer 9e322d2565
Fixing absolute/relative path 2018-10-23 12:14:17 +02:00
Tobias Diekershoff dbe49a0c1a
Merge pull request #5998 from annando/ap-queue 
Unsuccessful ActivitiyPub transmission are now deferred
 2018-10-23 06:54:11 +02:00
Michael e3e714a45f Unsuccessful ActivitiyPub transmission are now deferred 2018-10-23 03:54:18 +00:00
Hypolite Petovan fdbf244945
Adding missing parentheses in mod/dfrn_poll 2018-10-22 22:44:17 -04:00
Hypolite Petovan dc35d2f2f3
Merge pull request #5997 from annando/notice-relocation 
Fix a notice when sending relocation messages
 2018-10-22 22:40:47 -04:00
Michael 3dc0bb5c4b Fix a notice when sending relocation messages 2018-10-23 02:24:24 +00:00
Hypolite Petovan 045bd1f0e4
Merge pull request #5995 from FiXato/patch-1 
Updated Friendiqa's links
 2018-10-22 21:13:22 -04:00
Hypolite Petovan 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
Hypolite Petovan 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
Hypolite Petovan 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
Hypolite Petovan a22196edae Add/Fix Doxygen headers for classes 2018-10-22 16:50:55 -04:00
Hypolite Petovan 9eaedc576c Remove unused dbstructure hook call in App->loadDatabase 2018-10-22 16:50:55 -04:00
Hypolite Petovan 2debdbd0c9 Fix dbstructure console outputting addon structure as well 2018-10-22 16:50:55 -04:00
Hypolite Petovan 015e2a84b1 Remove obsolete require_once include/dba from Core\Addon and Core\Hook 2018-10-22 16:50:55 -04:00
Hypolite Petovan 19ffc0510b Move DB_UPDATE_VERSION from boot.php to config/dbstructure.php 2018-10-22 16:50:55 -04:00
Hypolite Petovan fad99b8619 Switch from dbstructure.json to dbstructure.php 2018-10-22 16:50:55 -04:00
Hypolite Petovan e511790d62 Move NULL_DATE from boot.php to DBA::NULL_DATETIME 
- Add DBA::NULL_DATE constant
 2018-10-22 16:50:55 -04:00
Hypolite Petovan ca9cad3491 Move hook-related methods from Core\Addon to Core\Hook 2018-10-22 16:50:54 -04:00
Hypolite Petovan 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
Hypolite Petovan 2a881cc2e7
Merge pull request #5907 from nupplaphil/goaway_to_redirectto 
Replaced goaway() with System::redirect()
 2018-10-22 16:22:41 -04:00
Philipp Holzer 3072c56057
goaway fix in App 2018-10-22 22:15:50 +02:00
Philipp Holzer 32af52842b
adding defaults in mod/redir.php 2018-10-22 22:13:41 +02:00
Philipp Holzer 363d00cc45
Adding $a->getBaseURL for Worker in profile_photo 
Adding a TODO for Contact::magicLink
 2018-10-22 22:13:39 +02:00
Philipp Holzer 34989480e1
removed unnecessary System use 2018-10-22 22:13:39 +02:00