Commit graph

4975 commits

Author SHA1 Message Date
Jonny Tischbein
6d1b98dc0e wrong var name - conversation not found 2018-10-02 18:24:16 +02:00
Jonny Tischbein
ecb67cfcb4 syntax typo 2018-10-02 18:22:23 +02:00
Jonny Tischbein
fa3bbc5f45 Code Standards + return path for \!local_user() and cancel 2018-10-02 18:13:58 +02:00
505350c9fb
Merge pull request #5794 from annando/ap1
ActivityPub support
2018-10-02 11:24:04 -04:00
Jonny Tischbein
9915523490 mod/message return to conversation if message deleted 2018-10-02 13:16:43 +02:00
7e9499ac13 AP contacts are now tagged upon commenting 2018-10-01 21:09:08 +00:00
Michael Vogel
103535d620
Merge pull request #5773 from MrPetovan/task/rewrite-js-hooks
Rewrite JS hooks
2018-10-01 17:10:30 +00:00
93ccca5807 AP hast to be enabled here as well 2018-09-30 21:23:40 +00:00
Jonny Tischbein
57fe36e9a3 replace session return url by static pages 2018-09-30 19:26:29 +02:00
Jonny Tischbein
0a699be3c0 replace session return url by static pages 2018-09-30 19:03:05 +02:00
761bdafa34 Correct content type 2018-09-30 14:13:07 +00:00
cb44aa83c7 Object instead of Display 2018-09-30 12:21:57 +00:00
Jonny Tischbein
1803862fc5 associative array + adding mysql value + removing table header 2018-09-27 19:46:28 +02:00
Jonny Tischbein
24117c24ce Get PHP Configuration for upload limit and display in /admin summary site 2018-09-27 18:53:16 +02:00
cb9be8a7ab UUID is now createUUID 2018-09-27 11:52:15 +00:00
60b0759b50 UUID instead of GUID 2018-09-26 20:03:46 +00:00
834422d52f Merge remote-tracking branch 'upstream/develop' into ap1 2018-09-24 21:48:40 +00:00
a6996601d5
Merge pull request #5789 from friendica/master
Update develop from master-2019.09
2018-09-23 18:55:20 -04:00
8c7e5bb776 all endpoints are now working 2018-09-23 17:29:31 +00:00
6df6d82427 We can now like and dislike 2018-09-23 08:52:07 +00:00
a56565fa99 AP is enabled for all users 2018-09-22 23:49:27 +00:00
c083ae047c Merge remote-tracking branch 'upstream/2018.08-rc' into ap1 2018-09-22 15:18:53 +00:00
Hypolite Petovan
1eaa523e61 Remove unused App->page['end']
- Remove unused empty templates
2018-09-20 21:02:28 -04:00
Hypolite Petovan
8dc5b04be7
Merge pull request #5776 from annando/fix-contact
Fix: Update routine for conversations in contacts was missing
2018-09-20 10:10:45 -04:00
Jonny Tischbein
0f63a62761 fix return fallback to SESSION Variable 2018-09-20 15:55:24 +02:00
58d43ad576 Fix: Update routine for conversations in contacts was missing 2018-09-20 12:44:40 +00:00
Jonny Tischbein
58f26d195f adjust argc check in mod/editpost + relative path in mod/message 2018-09-20 14:41:52 +02:00
Jonny Tischbein
807ad14521 calculate form return_url for post and message instead of using SESSION var 2018-09-19 23:55:29 +02:00
Michael Vogel
bd0515714c
Merge pull request #5765 from MrPetovan/bug/php7-remove-pear-text_highlighter
[php7] Remove PHP code highlighting
2018-09-18 18:34:46 +00:00
Hypolite Petovan
d6985baaed Improve mod/babel
- Handle multiple line endings
- Conserve HTML special chars in input box on submit
- Add new result panel with HTML::toMarkdown result
2018-09-17 23:18:34 -04:00
f772ece86f New delivery module for ap 2018-09-17 21:13:08 +00:00
Hypolite Petovan
c4ea3bfb3e
Merge pull request #5728 from rabuzarus/20180905_-_fix_lockview
lockview - prevent notices
2018-09-16 23:02:23 -04:00
699a4140f9 Now sending does finally work - and some AP standards are improved as well 2018-09-16 20:12:48 +00:00
e4d28629e4 First posting tests 2018-09-16 17:47:00 +00:00
Hypolite Petovan
87c425e388 Improve whitespace display in mod/babel
- Add a couple more result panels for Markdown input
- Remove \x28/\x29 parentheses encoding
- Convert remaining double quotes
2018-09-16 09:07:17 -04:00
6f3b2b6586 Handling of unlisted posts, better uid detection 2018-09-16 09:06:09 +00:00
2eabe45a8e Contact reject does work now as well 2018-09-15 22:25:58 +00:00
e45206ae5d Merge remote-tracking branch 'upstream/2018.08-rc' into ap1 2018-09-15 20:49:46 +00:00
86bd283705 The whole contact handling does work now, yeah ... 2018-09-15 20:31:05 +00:00
6a8ebc8639 Contact follow and unfollow workd partially 2018-09-15 18:54:45 +00:00
61e2c7d20d Added AP to many network conditions / enabling inbox processing 2018-09-14 16:51:32 +00:00
8c00e88f79 The endless saga of the fight against notices continues 2018-09-13 21:11:52 +00:00
Hypolite Petovan
70c94abd8e
Merge pull request #5759 from annando/issue-5733
Issue 5733: Removing contacts does work now on the same machine as well
2018-09-12 19:40:03 -04:00
c4825a8b53 Fixing parentheses 2018-09-12 18:49:36 +00:00
7daa46503d Don't risk incompatibilities 2018-09-12 06:13:04 +00:00
96d10c25e3 Issue 5733: Removing contacts does work now on the same machine as well 2018-09-12 06:05:14 +00:00
Hypolite Petovan
7529fc61dd Fix introductions notifications links 2018-09-11 19:54:45 -04:00
1afa6523bc Adding (temporary) calls to AP in existing stuff 2018-09-11 07:07:56 +00:00
8b96a53fba Burn notices, burn 2018-09-11 04:10:11 +00:00
Hypolite Petovan
e461474290 Fix count being called on the wrong variable in mod/notes 2018-09-09 18:34:05 -04:00
Hypolite Petovan
071aff223a Format source of mod/events 2018-09-09 09:51:59 -04:00
d581318c7c Notices come, notices go ... 2018-09-09 06:32:01 +00:00
Benjamin Lorteau
71215115eb Restore template choice by notification label 2018-09-07 11:15:23 -04:00
55f72b5767
Merge pull request #5743 from MrPetovan/bug/fix-empty-notifications
Fix empty notifications
2018-09-07 07:33:47 +02:00
Hypolite Petovan
480d792356
Merge pull request #5732 from annando/fix-picture-posts
Fix: Posts with pictures will now look good again on connector networks
2018-09-06 19:00:44 -04:00
Hypolite Petovan
f85af78097 Source format mod/notifications
- Add array alignment
- Convert remaining double quotes to quotes
- Replace x() with defaults()
- Add missing spaces
2018-09-06 18:55:06 -04:00
Hypolite Petovan
2f7ba13702 Restore display when there aren't unread notifications 2018-09-06 18:42:57 -04:00
6113fdc940 Issue 5733: Changing relationship values does work now again with DFRN 2018-09-06 09:20:45 +00:00
04fb885857 Fix: Posts with pictures will now look good again on connector networks 2018-09-06 04:24:34 +00:00
rabuzarus
1fe1628237 lockview - prevent notices 2018-09-05 18:44:47 +02:00
rabuzarus
bd9d102da2 apply coding standards to lockview module 2018-09-05 14:24:51 +02:00
rabuzarus
88d25f977a fix lockview for photos
- use the private field only for items because other tables than the item table don't have the private field
2018-09-05 14:12:56 +02:00
31cbc80981
Merge pull request #5722 from annando/dissolve
Restore the behaviour to remove the remote contact upon termination
2018-09-05 08:23:41 +02:00
Michael Vogel
d7bb671b77
Merge pull request #5720 from MrPetovan/bug/fix-unfollow
Remove extraneous SQL condition part in mod/unfollow
2018-09-05 05:42:00 +00:00
9ef1d827f3 Restore the behaviour to remove the remote contact upon termination 2018-09-05 05:02:06 +00:00
Hypolite Petovan
9de0d35450 Remove extraneous SQL condition part in mod/unfollow 2018-09-04 19:29:36 -04:00
Hypolite Petovan
59d06b6c78
Merge pull request #5719 from annando/notices-yeah
Good news, everyone - again somce notices removed
2018-09-04 19:09:11 -04:00
635c8d7450 Beautified the code 2018-09-04 21:24:30 +00:00
821429fdf1 Good news, everyone - again somce notices removed 2018-09-04 17:48:09 +00:00
Hypolite Petovan
475d3f8f3a Fix formatting in mod/parse_url 2018-09-02 17:24:56 -04:00
58148905f1 Changed documention 2018-09-02 17:48:07 +00:00
d5a3b0bd5e
Merge pull request #5710 from annando/fix-api
Fix for timeout issues when posting to the API
2018-09-02 14:52:09 +02:00
703c668a37 More notices ... 2018-09-02 08:01:13 +00:00
4bb45f611f Fix for timeout issues when posting to the API 2018-09-02 07:20:04 +00:00
Michael Vogel
196ef0111c
Merge pull request #5704 from MrPetovan/bug/fix-unfollow
Fix unfollow sharing-only contacts (except connector protocols)
2018-08-31 15:40:51 +00:00
Benjamin Lorteau
76b40cf05e Use User::getOwnerDataById in mod/unfollow 2018-08-31 11:22:51 -04:00
380eeaab88 Still there had been notices - must have a good camouflage 2018-08-31 05:08:22 +00:00
Hypolite Petovan
e25c579c76 Add Protocol::NATIVE_SUPPORT constant usage to mod/contacts 2018-08-30 21:03:57 -04:00
Hypolite Petovan
92c4ca0911 Prevent unfollowing contacts from networks not supported natively 2018-08-30 17:53:23 -04:00
Hypolite Petovan
55c676d8b0 Source cleaning mod/unfollow.php
- Normalize quotes
- Remove unneeded EOL
- Use DBA method where tasteful
2018-08-30 08:54:12 -04:00
Hypolite Petovan
b81eaec885 Enable unfollowing contacts from all networks (but Statusnet) 2018-08-30 08:52:15 -04:00
Hypolite Petovan
e480da788e Fix unfollow for sharing-only contacts
- Add removal when unfollowing sharing-only contacts
2018-08-30 08:28:10 -04:00
Michael Vogel
c7f8f190b9 Oh no, even more notices ... (#5697) 2018-08-29 14:28:13 -04:00
Michael Vogel
99b8f85624 Poke is fixed (#5689)
* Fix: Poke hasn't worked. It does work now partially

* Poke are now displayed good again

* removed code
2018-08-28 15:38:28 -04:00
Michael Vogel
91a3bf5610 Fix: The profile page is now ordered after the creation date again (#5690) 2018-08-28 14:15:25 -04:00
Michael Vogel
f7953a2b02 Issue 1490: User import is now only possible on open sites or via an administrator. (#5680) 2018-08-27 07:55:08 -04:00
Philipp
2838e4ebaf Automatic Install Tests & Doku (#5674)
* Automatic Installation Testing
- New dev-library "mikey179/vfsStream"
- created "reload" method for App-Reloads
- ConsoleTest now using virtual directory
- Adding Automatic Installation Tests
- Fixing some probable install-failures

* Updating README for Automatic Installation

* Updating README for Automatic Installation

* Bugfix normal installation

* Fixing copying of config files
2018-08-27 00:15:55 -04:00
4406677576 Issue 5670: Jump to the unassigned contacts as a starting point for group edit 2018-08-26 08:24:45 +00:00
Michael Vogel
3d5ac950e3 Issue 5660: Check if .well-known is reachable (#5661)
* Issue 5660: Check if .well-known is reachable

* Fixes ".."

* Some text correction

* Some more correction

* Anf again some changed text :-)
2018-08-25 18:31:22 -04:00
Michael Vogel
3b50e94a1a Issue 5320: Deleting of events returned a wrong message (#5663)
* Issue 5320: Deleting of events returned a wrong message

* Remove unneeded variable
2018-08-25 17:38:54 -04:00
Michael Vogel
edcd0a3744 Issue 4960: Ignoring and blocking of contacts should work again (#5657)
* Issue 4960: Ignoring and blocking of contacts should work again

* Renamed functions

* This function should be renamed as well.

* We now have a frontend to block and ignore public contacts

* Hide some parts for public contacts

* Removed notices, public contact is now accessible from dirfind as well

* We now show contact conversations and contact posts

* We now use a new conversation mode

* The update functionality is disabled until it will work completely

* Fixing tabs chaos

* Update after posts on the contacts page will now work

* Show connect link
2018-08-25 09:48:00 -04:00
6a549d4cfb
Merge pull request #5659 from annando/notices-oh-no
Oh no ... there are still some notices that want to be removed ...
2018-08-24 14:46:21 +02:00
82d097879b Oh no ... there are still some notices that want to be removed ... 2018-08-24 11:09:58 +00:00
Roland Häder
61693419e8 Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?

* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
  BadMethodCallException in SPL)

* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.

* Ops, one more left ...

* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'

* Added empty lines for better readability

* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)

* Re-fixed DBM -> DBA switch

* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability

* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class

* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)

* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"

* Ops, one still there (return is no function)

* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
  functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
  will do this for us
- renamed those proxy_*() functions to better names:
  + proxy_init()           -> Proxy::init()         (public)
  + proxy_url()            -> Proxy::proxifyUrl()   (public)
  + proxy_parse_html()     -> Proxy::proxifyHtml()  (public)
  + proxy_is_local_image() -> Proxy::isLocalImage() (private)
  + proxy_parse_query()    -> Proxy::parseQuery()   (private)
  + proxy_img_cb()         -> Proxy::replaceUrl()   (private)

* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes

* Ops, need to set $a here ...

* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule

* Ops, no need for own instance of $a when self::getApp() is around.

* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
  methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module

* No instances from utility classes

* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`

* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.

* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.

* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.

* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...

* Ops, was added accidentally ...

* Ops, why these wrong moves?

* Ops, one to much (thanks to MrPetovan)

* Ops, wrong moving ...

* moved back to original place ...

* spaces added

* empty lines add for better readability.

* convertered spaces -> tab for code indenting.

* CR request: Add space between if and brace.

* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 01:05:49 -04:00
rabuzarus
1eb147cb48 fix redirection - don't dfrn auth when contact is still pending (#5648) 2018-08-21 23:58:09 -04:00
Michael Vogel
e20ea092d2 You can now filter the community page by account types (#5649)
* You can now filter the community page by account types

* Better use "null"
2018-08-21 17:39:49 +02:00
578549df13
Merge pull request #5646 from annando/notes
The notes are now fetching their content from a central function
2018-08-21 17:36:15 +02:00
Michael Vogel
54aee2aaa7 Removed notices that revealed themselfes over night ... (#5645)
* Removed notices that revealed themselfes over night ...

* And more notices removed that occured over night

* One more ..

* Some more notices of the day ...
2018-08-21 17:35:09 +02:00
1fb5925073 The notes are now fetching their content from a central function 2018-08-21 07:35:22 +00:00
Michael Vogel
d9b44153da The content generation for the display page is now using a centralized function (#5642)
* The content generation for the display page is now using a centralized function

* Small correction to avoid notices
2018-08-20 16:32:55 -04:00