tobias/friendica
1
0
Fork 0
Code Pull requests Activity
21604 commits 2 branches 61 tags 203 MiB
Commit graph

5086 commits

Author SHA1 Message Date
Michael Vogel a19f8d642d
Merge pull request #5942 from MrPetovan/feature/3218-add-convert-share-callback 
Add BBCode::convertShare callback parameter
 2018-10-17 22:01:02 +02:00
Jonny Tischbein 0c0e17b7a7 Remove unneeded Util/Security includings + Resolve including merge conflict with develop 2018-10-17 21:52:08 +02:00
Jonny Tischbein f3fc1f36ca Renaming functions + moving functions from security to Model/Item and BaseModule + fix multiline comments 2018-10-17 21:30:41 +02:00
Jonny Tischbein 3065d1c40a Add Link promt in comment + only add URL instead of attachement via parse_url 2018-10-17 21:05:45 +02:00
Michael Vogel 389685e099
Merge pull request #5920 from MrPetovan/bug/remove-password-from-register 
Avoid storing plaintext password in register table
 2018-10-17 21:04:11 +02:00
Jonny Tischbein ce2b1f5715 Rename function Authentication::authenticate_success to Authentication::success 2018-10-17 18:45:32 +02:00
Jonny Tischbein 45e5a7f59f remove unsed require_onces of security.php 2018-10-17 18:39:27 +02:00
Jonny Tischbein 05be2db725 Move include/security tp /src/Core/Authentication and /src/Util/Security 2018-10-17 14:19:58 +02:00
Hypolite Petovan 45748da8a1 Remove network exception in handle_tag 2018-10-17 01:11:50 -04:00
Hypolite Petovan c4318fe05e Fix notices in Parse URL feature 2018-10-16 18:27:13 -04:00
Hypolite Petovan ff643c4b6a
Merge pull request #5940 from JonnyTischbein/issue_update_display_network 
Fix redirect after edit post to /update_*
 2018-10-16 13:37:19 -04:00
Jonny Tischbein be2e6c3929 Fix Issue #5896 by setting static return for edit_post to display item page (kind of revert parts of #5774) 2018-10-16 19:14:55 +02:00
Hypolite Petovan d71327e311 Fix namespace usage in mod/group 2018-10-15 18:35:36 -04:00
Benjamin Lorteau 9e1065ff87 Improve transition from previous behavior 
- Simplify Model\User methods parameter list
- Use DBA methods in mod/regmod
- Replace killme with exit in mod/regmod
- Simplify goaway() calls
 2018-10-15 11:58:52 -04:00
Michael Vogel 0080d117ee
Merge pull request #5923 from MrPetovan/task/improve-contact-module 
Improve Contact module
 2018-10-15 06:02:55 +02:00
Hypolite Petovan ea8b159df4 Fix wrong use statement in mod/update_contacts 2018-10-14 23:09:11 -04:00
Jonny Tischbein 3a95644848 Add Support for relativeDateTime in future + update Admin user waiting for deleting table header 2018-10-14 22:57:44 +02:00
Hypolite Petovan 74c5f1f684
Merge pull request #5891 from JonnyTischbein/move_module_contacts 
Move module contacts
 2018-10-14 16:42:50 -04:00
Jonny Tischbein d54e56c659 Fix batch action query + Fix Namespace import 2018-10-14 21:14:32 +02:00
Jonny Tischbein 5fd4402074 code standards + fixing navigation links to /contact/... 2018-10-14 20:03:22 +02:00
Hypolite Petovan 540adaf829 Use Model\Register methods in modules 
- Update registration emails to avoid storing the plaintext password in
the register table
- Remove redundant sprintf() when used with L10n::t()
- Remove redundant Systen::baseUrl() with goaway()
 2018-10-14 12:26:18 -04:00
Hypolite Petovan 7f143c3159 Fix various spelling mistakes 2018-10-14 11:32:54 -04:00
Hypolite Petovan 0563a28438 Replace System::baseUrl() by App->getBaseURL() in mod/register 
- Remove redundant System::baseUrl() in goaway() calls
- Add more generic Friendica\Model use statement
- Allow empty path in goaway()
 2018-10-14 11:19:59 -04:00
Hypolite Petovan f7c020af04 Add HTML result boxes to mod/babel 2018-10-14 07:44:07 -04:00
Hypolite Petovan 6c80601a4a
Merge pull request #5902 from nupplaphil/Install_Class_to_methods 
Install class bugfixing & tests & changed method signature
 2018-10-14 06:23:33 -04:00
Hypolite Petovan db0b848ae3
Merge pull request #5904 from annando/ap-announce 
AP: Announce will now work
 2018-10-13 20:17:14 -04:00
Hypolite Petovan 07da170bcf
Merge pull request #5905 from nupplaphil/move_global_functions 
Move global functions
 2018-10-13 19:46:57 -04:00
Michael aab4fa0c31 The instrument is now added, updating AP contacts is now enabled 2018-10-13 20:36:44 +00:00
Philipp Holzer 059bd1307f
rename argv to getArgumentValue 2018-10-13 19:05:54 +02:00
Philipp Holzer 2c541afd47
Moved functions out of boot.php into class 
- z_root() => $a->getBaseURL()
- absurl() => removed because no usage
- is_ajax() => $a->isAjax()
- current_load() => System::currentLoad()
- argc() => $a->argc
- argv($x) => $a->getArgumentValue($x)
 2018-10-13 19:03:08 +02:00
Philipp Holzer 508032cf9a
Move Module AcctLink 2018-10-13 18:32:14 +02:00
Philipp Holzer c32ac7f194
Install Class to methods 
- Bugfixing Install checks (worked not as expected)
- Changed static methods from Install to class functions
- Added tests
 2018-10-13 18:09:53 +02:00
Jonny Tischbein bfa05156ca change links from /contacts to /contact 2018-10-13 13:29:56 +02:00
Jonny Tischbein 738cb4ace6 finish refactoring to Module\Contact 2018-10-13 11:35:51 +02:00
Jonny Tischbein cdbddd0103 Renaming functions and class 2018-10-13 11:23:52 +02:00
Tobias Diekershoff 14e7686df4
Merge pull request #5899 from annando/avoid-flooding 
Avoid beeing flooded by invalid requests
 2018-10-13 08:41:32 +02:00
Michael b6f2144237 Avoid beeing flooded by invalid requests 2018-10-13 04:31:37 +00:00
Jonny Tischbein 93ab82b7f0 Rename Contacts:content function 2018-10-11 23:45:01 +02:00
Jonny Tischbein 80ea86113d Move mod Contacts to /src/Module 2018-10-11 23:14:12 +02:00
Hypolite Petovan a419eff23a Replace missing App->getURLPath in mod/install 2018-10-11 08:49:52 -04:00
Philipp Holzer ffbc688797
Curl Response Refactoring 
- refactored Network::getCurl()
- replaced every Network::getCur() execution with a Curl Response
 2018-10-10 21:50:13 +02:00
Philipp Holzer 7c73e8634c
Curl Response Refactoring 
- refactored Network::post()
- replaced every Network::post() execution with the new Curl container
 2018-10-10 21:15:26 +02:00
Philipp Holzer 2dec8895a9
Curl Response Refactoring 
- extended Curl to parse Curl Response
- refactored Network::curl()
- replaced every Network::curl() execution with the new Curl container
 2018-10-10 21:08:43 +02:00
Philipp Holzer 307286fc47
parameters and getURLpath to getURLPath 2018-10-10 01:18:47 +02:00
Philipp Holzer 5a02e39a65
Rename App Methods 
- renamed a lot of App methods to CamelCase
- replaced direct public variables with get-/set-Methods
 2018-10-10 00:16:06 +02:00
Jonny Tischbein 29033bdf05 goaway to network if deleted item + remove goaway for filerm 2018-10-09 20:44:30 +02:00
Jonny Tischbein d8780b1640 Replace goaway location SESSION var return_url with page as string value 2018-10-09 20:10:34 +02:00
Jonny Tischbein 28456de249 Save return_url before login. Add login mask to many sites if not logged in. 2018-10-07 16:34:08 +02:00
Michael f8b74033a4 Avoid a notice 2018-10-06 18:44:42 +00:00
Hypolite Petovan 58c6ef2bc0
Merge pull request #5841 from JonnyTischbein/issue_profile_edit_sexual_marital 
Fix (short) profile editing showing 'e' for martial and sexual preferences
 2018-10-06 07:13:04 -04:00
Jonny Tischbein 17019772a4 Fix (short) profile editing showing 'e' for martial and sexual preference 2018-10-06 11:37:15 +02:00
Michael 09302367d5 Include AP in the contact search 2018-10-06 03:17:44 +00:00
Jonny Tischbein faa86aa2c0 fix indent with tabs 2018-10-04 21:38:44 +02:00
Jonny Tischbein 07489a3a9c Install: After detecting DB already in use, go back to db_stettings with error 2018-10-04 18:53:52 +02:00
Michael 78a7e130ae Another renamed function 2018-10-03 15:50:21 +00:00
Michael 8841519c0d Renamed functions 2018-10-03 15:41:51 +00:00
Michael 3ab837f3c7 Functionality is now split 2018-10-03 09:15:38 +00:00
Hypolite Petovan 1f7cb530c7
Merge pull request #5812 from annando/develop 
Issue 5811: "objects" instead of "object"
 2018-10-02 22:11:28 -04:00
Michael 518d461a8f Issue 5811: "objects" instead of "object" 2018-10-02 20:12:38 +00:00
Hypolite Petovan 406b46b635
Merge pull request #5800 from JonnyTischbein/issue_return_path 
Update return path former via $_SESSION['return_url']
 2018-10-02 12:30:38 -04:00
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
Hypolite Petovan 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
Michael 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
Michael 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
Michael 761bdafa34 Correct content type 2018-09-30 14:13:07 +00:00
Michael 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
Michael cb9be8a7ab UUID is now createUUID 2018-09-27 11:52:15 +00:00
Michael 60b0759b50 UUID instead of GUID 2018-09-26 20:03:46 +00:00
Michael 834422d52f Merge remote-tracking branch 'upstream/develop' into ap1 2018-09-24 21:48:40 +00:00
Hypolite Petovan a6996601d5
Merge pull request #5789 from friendica/master 
Update develop from master-2019.09
 2018-09-23 18:55:20 -04:00
Michael 8c7e5bb776 all endpoints are now working 2018-09-23 17:29:31 +00:00
Michael 6df6d82427 We can now like and dislike 2018-09-23 08:52:07 +00:00
Michael a56565fa99 AP is enabled for all users 2018-09-22 23:49:27 +00:00
Michael 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
Michael 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
Michael 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
Michael 699a4140f9 Now sending does finally work - and some AP standards are improved as well 2018-09-16 20:12:48 +00:00
Michael 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
Michael 6f3b2b6586 Handling of unlisted posts, better uid detection 2018-09-16 09:06:09 +00:00
Michael 2eabe45a8e Contact reject does work now as well 2018-09-15 22:25:58 +00:00
Michael e45206ae5d Merge remote-tracking branch 'upstream/2018.08-rc' into ap1 2018-09-15 20:49:46 +00:00
Michael 86bd283705 The whole contact handling does work now, yeah ... 2018-09-15 20:31:05 +00:00
Michael 6a8ebc8639 Contact follow and unfollow workd partially 2018-09-15 18:54:45 +00:00
Michael 61e2c7d20d Added AP to many network conditions / enabling inbox processing 2018-09-14 16:51:32 +00:00
Michael 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
Michael c4825a8b53 Fixing parentheses 2018-09-12 18:49:36 +00:00
Michael 7daa46503d Don't risk incompatibilities 2018-09-12 06:13:04 +00:00
Michael 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
Michael 1afa6523bc Adding (temporary) calls to AP in existing stuff 2018-09-11 07:07:56 +00:00
Michael 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
Michael 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
Tobias Diekershoff 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
Michael 6113fdc940 Issue 5733: Changing relationship values does work now again with DFRN 2018-09-06 09:20:45 +00:00
Michael 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
Tobias Diekershoff 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
Michael 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
Michael 635c8d7450 Beautified the code 2018-09-04 21:24:30 +00:00
Michael 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
Michael 58148905f1 Changed documention 2018-09-02 17:48:07 +00:00
Tobias Diekershoff 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
Michael 703c668a37 More notices ... 2018-09-02 08:01:13 +00:00
Michael 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
Michael 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 47ca5bbf71 Use item class instead of direct call 2018-08-28 20:44:39 +00: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
Michael 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