bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
19065 commits 4 branches 62 tags 178 MiB
Commit graph

1094 commits

Author SHA1 Message Date
Michael Vogel
5af9fa0be1
Merge pull request #4764 from MrPetovan/bug/4755-use-sender-header-invite 
Use Sender: header for invite emails
 2018-04-07 08:31:14 +02:00
Michael Vogel
29d18a7ed7
Merge pull request #4765 from MrPetovan/bug/4730-fix-profile-list 
Fix contact profile visibility list
 2018-04-07 08:23:32 +02:00
Hypolite Petovan
37505f8f28 Fix variable name typo in ContactSelector::profileAssign 2018-04-06 21:54:53 -04:00
Hypolite Petovan
7413dc62f0 Remove trailing whitespaces in Content\ContactSelector 2018-04-06 21:54:22 -04:00
Hypolite Petovan
a86d1806ae Add App->getSenderEmailAddress method 2018-04-06 21:47:16 -04:00
Hypolite Petovan
8b5341b84c Fix event id typo in Model\Event 2018-04-06 20:58:09 -04:00
Michael
8d68e865c1 Fixes warning "missing terminating ] for character class" 2018-04-06 09:11:10 +00:00
Michael Vogel
05cff59f70
Merge pull request #4722 from MrPetovan/task/add-content_filter-hook 
Add content_filter hook
 2018-04-06 06:42:52 +02:00
Michael
4a909fcfcf Bugfix: The rendering with images with width and height was broken 2018-04-05 06:01:36 +00:00
Hypolite Petovan
34fd442821 Rename social.disable_cw pconfig to system.disable_cw 2018-04-04 23:08:48 -04:00
Hypolite Petovan
41db5f0912 Display content warning as title if collapsing is deactivated 2018-04-04 23:08:48 -04:00
Michael
08c85c425b Added support of alt texts in images 2018-04-04 22:23:17 +00:00
Michael
1e8dd96938 Fix: The register mail contained variables in a wrong order 2018-04-04 19:56:34 +00:00
Hypolite Petovan
31cae67614
Merge pull request #4744 from annando/queue-improvements 
Queue: Better handling of return values of transmissions
 2018-04-04 15:13:57 -04:00
Michael
3e6507441e Queue: Better handling of return values of transmissions 2018-04-04 19:03:05 +00:00
Michael
211ba75b22 Avoid "Failed to parse time string (-001-11-30T00:00:00+00:00 + 32 days)" 2018-04-04 18:58:25 +00:00
Tobias Diekershoff
64ea49788e
Merge pull request #4737 from annando/fix-public-comment 
Commenting on public posts from Friendica users is now possible again
 2018-04-04 09:29:06 +02:00
Michael
c16ae0bacb Fix: Commenting on public posts from Friendica users is now possible again 2018-04-04 06:06:38 +00:00
Hypolite Petovan
2cf35cd8f9
Merge pull request #4727 from tobiasd/20180402-register 
added TOS module
 2018-04-03 10:39:53 -04:00
Tobias Diekershoff
0af5e54ef1 added hint about naming the class and filename 2018-04-03 16:33:39 +02:00
Tobias Diekershoff
4b7014d367 move the tos module to src/Module 2018-04-03 16:33:10 +02:00
Michael
e7fb8c04dd Don't always queue messages 2018-04-03 12:27:22 +00:00
Michael
1a2c771f24 DFRN: Improvements to delivery. Logging and marking as not reachable 2018-04-03 12:18:05 +00:00
Michael
d668b967c9 Misspelling 2018-04-02 22:06:31 +00:00
Michael
becc86a960 Changed logging text 2018-04-02 22:02:43 +00:00
Michael
8ff6a31512 Sending does now work 2018-04-02 21:59:30 +00:00
Michael
eeadd2f9d6 The Diaspora transport layer is now the default for DFRN 2018-04-02 21:46:10 +00:00
Tobias Diekershoff
6cef0fbaeb added link to delete the account to the registration mail text 2018-04-02 18:40:52 +02:00
Michael
f89904ed77 Treatment, Treating, whatever :-) 2018-04-02 13:44:45 +00:00
Michael
0594f13c35 Receiving was tested, sending is implemented and tested as well, currently unused 2018-04-02 12:53:48 +00:00
Michael
f51a254ed0 Public contacts are not permitted for suggestions or mails 2018-04-01 05:07:35 +00:00
Michael
7dd64dd465 Merge remote-tracking branch 'upstream/develop' into dfrn-2 2018-04-01 04:49:28 +00:00
Michael
3d487c263e Fixes missing command line argument 2018-03-31 08:19:19 +00:00
Hypolite Petovan
bcf974a995
Merge pull request #4716 from annando/password-console 
New functionality to set a password for a given user
 2018-03-30 16:00:07 -04:00
Michael
491db963db Changed comments 2018-03-30 19:57:14 +00:00
Michael
2eb4912dbf New functionality to set a password for a given user 2018-03-30 19:17:12 +00:00
Michael
1613f2a1c4 Ensure that public contacts can't create toplevel posts 2018-03-30 06:20:00 +00:00
Hypolite Petovan
80b6dc5787 Add fallback to regular code if language doesn't exist 2018-03-29 19:29:36 -04:00
Hypolite Petovan
586b0b6e57 Add bash to text_highlight language list 2018-03-29 19:29:09 -04:00
Hypolite Petovan
a5bb8f4e7d Strip strtolower from Module\Hashtag 2018-03-29 00:47:14 -04:00
Michael
bfd057f148 Direct transfer without a relay is now possible 2018-03-28 04:24:38 +00:00
Michael
7868de529e Forgotten doxygen header 2018-03-27 15:12:19 +00:00
Hypolite Petovan
27155fead7
Merge pull request #4691 from annando/relais-discovery 
Added server discovery for their relais configuration
 2018-03-27 08:50:27 -04:00
Hypolite Petovan
35e18e9e1e
Merge pull request #4686 from annando/no-warn-app 
Avoid the warning of an unitialized variable in .htconfig.php
 2018-03-26 20:44:53 -04:00
Michael
bc03c8846c Fix sending messages to relay servers 2018-03-26 23:39:59 +00:00
Michael
b48df6a828 Avoid the warning of an unitialized variable in .htconfig.php 2018-03-26 20:58:34 +00:00
Michael
00c444a699 Only update when changed 2018-03-26 06:17:50 +00:00
Michael
6b84cb9715 Only add tags in the "tags" scope 2018-03-26 06:11:55 +00:00
Michael
e65bd0325e Added server discovery for their relais configuration 2018-03-26 05:44:53 +00:00
Michael Vogel
bfc2bda9b6
Merge pull request #4682 from MrPetovan/task/4681-nsfw-add-hashtag-only-hiding 
Move suppress_tags config usage to template
 2018-03-25 22:26:17 +02:00
Michael
dece06c571 Bugfix: Prevent "Uncaught TypeError: Argument 1 passed to Friendica\Model\Event::formatListForExport() must be of the type array, object given" 2018-03-25 18:56:35 +00:00
Michael
402c0fc770 Using the default avatar when no avatar was found for the self contact 2018-03-25 17:26:40 +00:00
Hypolite Petovan
30113dd6ef
Merge pull request #4683 from annando/update-self 
The "self" contact is now updated at a central place
 2018-03-25 09:25:10 -04:00
Michael Vogel
2c00e3ad36
Merge pull request #4680 from MrPetovan/bug/4669-check-getInfoFromURL-parameter 
Check Image::getInfoFromURL parameter
 2018-03-25 10:39:17 +02:00
Michael
ad3e4b894e Update the public contact 2018-03-25 08:20:13 +00:00
Michael
abb49150db Update the avatar 2018-03-25 08:15:22 +00:00
Hypolite Petovan
daffc27061 Move suppress_tags config to template 
- Add new item.suppress_tags template variable
- Fix template formatting
 2018-03-25 00:38:23 -04:00
Hypolite Petovan
09f04c1985 Add Image::getInfoFromURL return check 2018-03-24 20:03:55 -04:00
Hypolite Petovan
13f58abe05 Add parameter check in Image::getInfoFromURL 2018-03-24 20:03:28 -04:00
Michael
a0451e1c62 Merge remote-tracking branch 'upstream/develop' into update-self 2018-03-24 22:50:14 +00:00
Michael
e8e6436f08 Issue 4673: Avoid "Incorrect date value: '0000-00-00' for column 'bd'" 2018-03-24 22:27:04 +00:00
Hypolite Petovan
bcf9fa147e
Merge pull request #4678 from annando/issue-4666 
Fix: No "not null" when text is replaced by varchar
 2018-03-24 18:09:21 -04:00
Michael
5bca333bf0 Fix: No "not null" when text is replaced by varchar 2018-03-24 21:57:50 +00:00
Hypolite Petovan
11e68b70bb Fix number constant used in Console\PoToPhp 2018-03-24 16:09:19 -04:00
Hypolite Petovan
91eb644743 Fix formatting in Console\PoToPhp 2018-03-24 16:08:56 -04:00
Hypolite Petovan
641bd5eaa6
Merge pull request #4674 from annando/acl-fix 
Fix the ACL problem issue 4616
 2018-03-24 15:48:02 -04:00
Michael
341499e8ca standards 2018-03-24 19:40:35 +00:00
Hypolite Petovan
7acb4b0434
Merge pull request #4676 from annando/clean-url 
Handle URL with unicode characters
 2018-03-24 15:31:07 -04:00
Hypolite Petovan
9665f4ed41
Merge pull request #4675 from annando/group-delete 
Fix: Groups can now be deleted again
 2018-03-24 15:25:26 -04:00
Michael
324baa6b8b Removed test code 2018-03-24 18:48:40 +00:00
Michael
850d9b4c0b Line feeds fixed, not change in functionality 2018-03-24 18:39:13 +00:00
Michael
885d794958 Fix ACL data 2018-03-24 18:38:05 +00:00
Michael
07a1796e8f Fix: Groups can now be deleted again 2018-03-24 07:26:57 +00:00
Michael
bac60164e7 New function to keep the self contact updated 2018-03-24 06:15:18 +00:00
Michael
055855bf9b Handle URL with unicode characters 2018-03-23 18:41:59 +00:00
Hypolite Petovan
c5cd569447 Restore previous permission comment in Widget\CalendarExport 2018-03-23 06:34:21 -04:00
Hypolite Petovan
d36bc29ce9 Finally fix the permissions for Widget\CalendarExport 2018-03-23 06:34:21 -04:00
Hypolite Petovan
95792f6b79 Fix typo in mod/events 
- Add todo in Model\Event
 2018-03-23 06:34:21 -04:00
Hypolite Petovan
72b552895e Restore missing permission check in Widget\CalendarExport 2018-03-23 06:34:21 -04:00
Hypolite Petovan
254974826f Fix wrong contact retrieval condition in Event::store 2018-03-23 06:34:21 -04:00
Hypolite Petovan
bc12ba68cd Fix wrong parameter check in Event::store 2018-03-23 06:34:21 -04:00
Hypolite Petovan
089f556327 Initialize $event in Event::store 2018-03-23 06:34:21 -04:00
Hypolite Petovan
89e9cbb0b5 Remove private key from event array in Event::store 2018-03-23 06:34:21 -04:00
Hypolite Petovan
6e7c6ab0fa Remove references to include/event 2018-03-23 06:32:34 -04:00
Hypolite Petovan
f7e2071117 Replace include/event function with method calls 
- Updated scope of Model\Event methods
- Updated use list
 2018-03-23 06:32:34 -04:00
Hypolite Petovan
8c956ac0c8 Add new classes 
- Add Model\Event class
- Add Content\Widget\CalendarExport class
 2018-03-23 06:32:08 -04:00
Hypolite Petovan
27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Michael
dccfc83a2d No display improvements for regular posts 2018-03-22 20:47:31 +00:00
Michael
318de2f590 Merge remote-tracking branch 'upstream/3.6-rc' into url-shorten-ostatus 2018-03-22 20:42:29 +00:00
Michael
b171fb1f24 Fix: Items with "uid=0" always had the "parent-uri" as "thr-parent" 2018-03-22 16:18:49 +00:00
Hypolite Petovan
701fd41463 Rename checkPasswordExposed to isPasswordExposed 2018-03-21 02:14:43 -04:00
Hypolite Petovan
ca13570251 Add exposed password check to manual password change 2018-03-21 01:33:35 -04:00
Michael
73efdb99e3 Fix for incorrect datetime values 2018-03-21 05:20:55 +00:00
Michael
f4ba5d9799 Fix: Events on Diaspora now should look fine 2018-03-20 06:32:17 +00:00
Tobias Diekershoff
4d8d5ca6a5
Merge pull request #4630 from MrPetovan/task/4629-move-executable-to-bin 
Move executable scripts to bin/ (part 1)
 2018-03-19 15:05:53 +01:00
Hypolite Petovan
d83491ae59 Remove util/global_community_silence 
- Update wrong comment block for Console\Maintenance
 2018-03-18 23:40:06 -04:00
Hypolite Petovan
3b75ea0028 Remove util/config* 
- Update Console\Config help text
 2018-03-18 23:36:24 -04:00
Hypolite Petovan
1c2deac7e5 Move scripts/worker.php to bin/ 2018-03-18 23:25:21 -04:00
Hypolite Petovan
542ff9b082 Move scripts/auth_ejabberd.php to bin/ 2018-03-18 23:17:31 -04:00
Hypolite Petovan
2f1a1debf4 Add DBStructure Console 
- Refactor subConsole instantiation
 2018-03-18 23:10:56 -04:00
Hypolite Petovan
02c9fd6c24 Add typo to main console help 2018-03-18 19:52:00 -04:00
Hypolite Petovan
620e9842e1 Add Typo Console 2018-03-18 19:45:35 -04:00
Hypolite Petovan
9a012ad303 Add po2php console 2018-03-18 19:28:21 -04:00
Hypolite Petovan
608b477b77 Add new commands to base console help text 2018-03-18 19:07:40 -04:00
Hypolite Petovan
c9945ad15b Improve Console\PhpToPo 
- Add base option
- Use DIRECTORY_SEPARATOR
- Add error handling
- Remove superfluous display
 2018-03-18 19:07:24 -04:00
Hypolite Petovan
da6635898c Add more sub consoles 2018-03-18 13:26:36 -04:00
Hypolite Petovan
52e07a9e6d Remove wrong by reference variable init in Console\DocBloxErrorChecker 2018-03-18 13:26:14 -04:00
Hypolite Petovan
bba12da167 Improve Console\GlobalCommunityBlock 
- Add description comment block
- Fix usage description
- Actually use argument
 2018-03-18 13:25:47 -04:00
Michael
d8824cc3bc Improved similarity to ostatus group feeds 2018-03-18 11:18:25 +00:00
Michael
3ff6520ed5 OStatus: Forum feeds now look like OStatus group feeds 2018-03-18 10:31:12 +00:00
Hypolite Petovan
9b8fb1d550 Add Console classes 2018-03-18 05:11:48 -04:00
Hypolite Petovan
e970bbdca8
Merge pull request #4621 from annando/not-null 
Avoid storing "null" values
 2018-03-17 18:40:31 -04:00
Michael
9930c61263 Same same but different 2018-03-17 20:56:56 +00:00
Michael
c42c121e51 Fewer Defaults 2018-03-17 20:54:56 +00:00
Michael
8700d2a8ad Avoid storing "null" values 2018-03-17 13:09:21 +00:00
Hypolite Petovan
d1c93e7a60
Merge pull request #4614 from annando/dir-own-contact 
Fix: In the contact search you had been able to delete your own contact
 2018-03-17 08:42:51 -04:00
Michael
cd2c9722b0 Added missing doxygen header 2018-03-17 09:42:29 +00:00
Michael
782d692b5a Possible fix issue 4611: Don't write to database before it is created 2018-03-17 09:04:38 +00:00
Michael
8053172398 Issue 4610: The query is simplified and shouldn't fail again 2018-03-17 07:50:49 +00:00
Michael Vogel
b54b0f0728
Merge pull request #4613 from MrPetovan/task/4518-add-cache-delete 
Add missing Cache::delete method
 2018-03-17 07:30:31 +01:00
Michael
d616bb7564 Fix: In the contact search you had been able to delete your own contact 2018-03-17 06:17:32 +00:00
Hypolite Petovan
30d8c73660 Add missing Cache::delete method 2018-03-16 21:57:58 -04:00
Michael
e1a72b8f5a Visible URL are shortened when transmitting to OStatus 2018-03-16 20:50:53 +00:00
Michael
ec9b7af25b Fix: Private transmission via Diaspora to Friendica servers 2018-03-16 20:34:28 +00:00
rabuzarus
c209853e1d add dependencies (require_once) to hashtag module 2018-03-16 14:44:51 +01:00
rabuzarus
86d84e5f31 fix code standards 2018-03-16 14:27:04 +01:00
rabuzarus
96c086ea13 hashtag autocomplete 2018-03-16 13:55:26 +01:00
Michael
67fa6aa809 We now change relationships not only for OStatus contacts 2018-03-16 06:58:54 +00:00
Michael
59dd353464 DFRN: The relationship between contacts can now be changed afterwards 2018-03-16 06:43:10 +00:00
Michael
972c2c86ef OStatus: Likes from Pleroma will now work 2018-03-15 21:33:28 +00:00
Hypolite Petovan
d376ed6f61
Merge pull request #4596 from annando/attachment-encode 
Attachment encode
 2018-03-14 18:59:25 -04:00
Michael
4ba3ba391a The attachment text had already been in HTML and mustn't be converted again 2018-03-14 22:51:14 +00:00
Hypolite Petovan
65b0159282
Merge pull request #4593 from annando/fix-ostatus 
OStatus: Fixed communication issues with deleted contacts
 2018-03-14 18:46:21 -04:00
Michael
2bedead6f4 Remove commented code 2018-03-14 22:31:52 +00:00
Michael
5bd519efff There is now a "content-warning" field 2018-03-14 22:28:35 +00:00
Michael
8c42e2e62e Avoid double encoding of the attachment content 2018-03-14 21:47:24 +00:00
Michael
d98c6819e7 $contact isn't called by reference anymore 2018-03-14 20:53:03 +00:00
Michael
7db0b850cb Avoid an error in OnePoll when the contact was "null". 2018-03-14 19:47:14 +00:00
Michael
6352aa112b Add the nsfw removal behind a config switch 2018-03-14 07:13:17 +00:00
Michael
858fd127a1 Fix: subscribing to the old followers hadn't worked 2018-03-14 00:27:15 +00:00
Michael
f49391a21c "nsfw" at "content warning" content doesn't fit together 2018-03-13 22:39:08 +00:00
Michael
3f6fefaa9a Pleroma with the Mastodon UI handles content warning different 2018-03-13 21:58:05 +00:00
Michael
32ee4ca4b1 OStatus: Fixed communication issues with deleted contacts 2018-03-13 06:21:44 +00:00
Michael
23718aeae3 OStatus: Only posts from followers will be imported (Issue 4369) 2018-03-12 10:45:40 +00:00
Michael
052ad155a2 Issue 4115: Events are now formatted better for Diaspora 2018-03-11 21:10:36 +00:00
Michael
b7a5e076fc Fix: The ownership of forum items had been wrong 2018-03-11 18:12:38 +00:00
Michael
cc4347d72f Issue 4497: Forum feeds had been empty 2018-03-11 14:01:40 +00:00
Michael
fbb38837b0 Shortener deactivated, due to Diaspora problems 2018-03-11 12:16:17 +00:00
Michael
229fb0439e Links to Diaspora had sometimes been cut 2018-03-11 10:54:02 +00:00
Michael Vogel
28615ae24b
Merge pull request #4576 from MrPetovan/bug/fix-attach-display 
Formatting changes to Protocol/Feed
 2018-03-11 00:43:16 +01:00