MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
19489 commits 3 branches 0 tags 96 MiB
Commit graph

4593 commits

Author SHA1 Message Date
Hypolite Petovan b28fd98acd Replaced < comparison with IN for contact.rel in mod/network 2018-04-08 09:59:43 -04:00
Hypolite Petovan c8b0520144 Use CONTACT_IS_SHARING constant instead of rel value 2018-04-07 08:09:13 -04:00
Hypolite Petovan b798ad126a Hide posts from recently ignored or unfollowed contact in mod/network 2018-04-07 02:42:42 -04:00
Hypolite Petovan 9220025b12 Exchange Sender: and From: headers in mod/invite 2018-04-07 02:26:33 -04:00
Hypolite Petovan 0f02d1a449 Use App->getSenderEmailAddress in mod/invite 
- Use "Sender: " header
- Rename confusing variables
 2018-04-06 21:48:37 -04:00
Hypolite Petovan 9403e614aa Update system.disable_cw help text 2018-04-04 23:08:48 -04:00
Hypolite Petovan 34fd442821 Rename social.disable_cw pconfig to system.disable_cw 2018-04-04 23:08:48 -04:00
Hypolite Petovan 180f7d8218 Add disabled_cw user setting 2018-04-04 23:08:47 -04:00
Tobias Diekershoff 421517c611 consistent use of terms in heading in the admin panel 2018-04-04 07:22:05 +02: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 4b7014d367 move the tos module to src/Module 2018-04-03 16:33:10 +02:00
Tobias Diekershoff 297ade6981 removed leftover from the used template 2018-04-03 15:49:54 +02:00
Hypolite Petovan b2a9fbc249
Merge pull request #4731 from tobiasd/20180403-lostpwd 
pass uid to notification system so securemail addon can pick it up
 2018-04-03 07:14:01 -04:00
Tobias Diekershoff 03ed5e5649 forgot the 2nd mail 2018-04-03 12:47:38 +02:00
Tobias Diekershoff d10cdfe942 pass uid to notofication system so securemail addon can pick it up 2018-04-03 12:45:27 +02:00
Tobias Diekershoff 3ec4e28af6 updated the privacy statement text and added some headers to the functions 2018-04-03 06:55:25 +02:00
Tobias Diekershoff 6c20b4507d Added /tos module 2018-04-02 18:40:30 +02:00
Michael 0594f13c35 Receiving was tested, sending is implemented and tested as well, currently unused 2018-04-02 12:53:48 +00:00
Tobias Diekershoff 348ee3625d BBCode support in register_text 2018-04-02 08:42:11 +02:00
Michael 7dd64dd465 Merge remote-tracking branch 'upstream/develop' into dfrn-2 2018-04-01 04:49:28 +00:00
Michael 3eb7ab2d9e Fix the version sorting in the federation statistics 2018-03-31 09:34:36 +00:00
Michael 80cca09a53 Fix: Avoid a WSOD when saving the profile 2018-03-31 03:33:19 +00:00
Michael 1613f2a1c4 Ensure that public contacts can't create toplevel posts 2018-03-30 06:20:00 +00:00
Michael c9f02d534e Merge remote-tracking branch 'upstream/develop' into dfrn-2 2018-03-30 05:45:29 +00:00
Hypolite Petovan d13f36938c Suppress error message for non-existing contacts in mod/follow 2018-03-29 23:29:41 -04:00
Hypolite Petovan 3a58fe48bd Fix formatting in mod/follow 2018-03-29 23:28:48 -04:00
Tobias Diekershoff 07954f7bcf typo 2018-03-29 06:57:02 +02:00
rabuzarus 6dc6581aca
Merge pull request #4702 from annando/sql-fix 
Fixed SQL query
 2018-03-28 13:43:17 +02:00
Michael 9bfc7bf584 A relocation hadn't changed the hostname 2018-03-28 08:09:45 +00:00
Michael 2465bbaac8 Fixed SQL query 2018-03-28 08:04:20 +00:00
Michael 17a6cb18b8 Relais settings are added to admin backend 2018-03-28 06:16:46 +00:00
Michael a0451e1c62 Merge remote-tracking branch 'upstream/develop' into update-self 2018-03-24 22:50:14 +00:00
Alexandre Alapetite e64196c7b3 Fix PHP cannot take a shell script 
Fix part of https://github.com/friendica/friendica/issues/4665
`php [shell file]` does not work, so use `php [php file]` instead.
`php bin/console.php` is more robust than e.g. `bin/console` which does
not work on Windows, or *nix systems without Bash
 2018-03-24 12:47:40 +01:00
Michael bac60164e7 New function to keep the self contact updated 2018-03-24 06:15:18 +00:00
Hypolite Petovan a7c48f40b7 Enable CalendarExport widget on /events 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 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 27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Michael 9d83369d88 DFRN payload is receivable via the Diaspora transport layer 2018-03-23 05:08:47 +00:00
Hypolite Petovan cd7993f869 Use Config wrapper instead of direct config retrieval 2018-03-21 08:54:58 -04:00
Hypolite Petovan fd9171a40e Fix egregious whitespace issue in mod/settings 2018-03-21 02:38:04 -04:00
Hypolite Petovan 5b4fb945a2 Add htconfig setting to disable password_exposed() 2018-03-21 02:35:28 -04: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
Tobias Diekershoff dca6627682
Merge pull request #4633 from friendica/fabrixxm-36rc-patch-2 
Small fixes and spelling
 2018-03-19 15:22:10 +01:00
fabrixxm 9bf58a0612
Fix spelling for "detailed_notif" help text in settings 2018-03-19 13:56:17 +01:00
fabrixxm d9aca508cd
Fix another closing bracket in translatable string 2018-03-19 11:19:09 +01:00
Hypolite Petovan 132456697c Remove scripts/dbstructure 
- Updated documentation
 2018-03-18 23:53:53 -04:00
Tobias Diekershoff 5fad0cd123 count from zero... 2018-03-18 14:30:51 +01:00
Tobias Diekershoff a6845c0180 added check for POSIX kill to the installation wizard 2018-03-18 10:36:28 +01: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 782d692b5a Possible fix issue 4611: Don't write to database before it is created 2018-03-17 09:04:38 +00:00
Michael c7dc3f94c9 Simplified query 2018-03-17 07:12:28 +00:00
Michael 69918f4ae9 Ignore obvious garbage results 2018-03-17 06:54:47 +00: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
Michael a62ccf0ec1 Added to-do 2018-03-16 07:27:18 +00: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 858fd127a1 Fix: subscribing to the old followers hadn't worked 2018-03-14 00:27:15 +00:00
Michael f17f61df38 Fix indentation 2018-03-13 23:32:38 +00:00
Michael aff99b32fd Improved logging 2018-03-13 21:33:45 +00:00
Michael bc84852682 Added logging 2018-03-13 21:10:19 +00:00
Michael c20a42c889 Completely reformatted and restructured code, using dba functions now. 2018-03-13 21:03:56 +00:00
Michael 4d3b1ae918 We don't need the contact-id anymore 2018-03-13 07:16:31 +00:00
Michael 32ee4ca4b1 OStatus: Fixed communication issues with deleted contacts 2018-03-13 06:21:44 +00:00
Hypolite Petovan 83c4c86251 Fix: The acl lookup now works in multi threaded posts as well 2018-03-12 08:15:59 -04:00
Michael ab3f28f4c8 Fix: We have to be able to remove delegations as well 2018-03-12 04:50:07 +00:00
Michael eaf4fdefac Security: You have to enter the password of the parent to delegate to this account 2018-03-11 13:12:15 +00:00
Michael 26a6846467 Bugfix: Old dba function was used 2018-03-11 12:19:41 +00:00
Hypolite Petovan fa620022d5 Make feedtest module for logged users only 2018-03-10 18:53:20 -05:00
Hypolite Petovan 17e0d6b6c1 Add feedtest module 2018-03-10 12:43:34 -05:00
Hypolite Petovan 99b4ec147c Fix standards 2018-03-09 07:58:46 -05:00
Hypolite Petovan 71c1be8207 Add external template to mod/babel 
- Add HTML methods diagnostic
 2018-03-08 23:48:32 -05:00
Hypolite Petovan 789561c7a2 Remove/Update references to include/html2*.php 2018-03-07 16:34:17 -05:00
Hypolite Petovan 5e806ff598 Replace html2plain calls by HTML::toPlaintext 2018-03-07 16:29:44 -05:00
Hypolite Petovan b5666bd27f Replace html2bbcode calls by HTML::toBBCode 2018-03-07 16:24:13 -05:00
Michael 23c2db2ebc Fix: In combination with "showmore" long posts aren't shrinked anymore every few seconds 2018-03-06 07:12:58 +00:00
Hypolite Petovan bb7f459b47 Remove references to include/bb2diaspora.php 2018-03-04 17:43:41 -05:00
Hypolite Petovan 26ea6f69d7 Update references to bb2diaspora and diaspora2bb 2018-03-04 17:39:41 -05:00
Andy H 8500bed8cc Corrected typo 2018-03-04 15:07:34 +07:00
Hypolite Petovan 716747cc77
Merge pull request #4541 from rabuzarus/20180303_-_fix_directory_search 
fix page counter in directory module
 2018-03-03 14:13:51 -05:00
rabuzarus d572738e95 directory - use dba::select_first() 2018-03-03 20:08:41 +01:00
rabuzarus e18f3844da fix page counter in directory module 2018-03-03 19:31:15 +01:00
Tobias Diekershoff 8004a1bd93
Merge pull request #4538 from MrPetovan/bug/4535-user-not-found 
Fix missing logical not in admin/users
 2018-03-03 15:36:54 +01:00
Hypolite Petovan 9a13e67943 Fix missing logical not in admin/users 2018-03-03 09:34:48 -05:00
rabuzarus c78572bf47 directory.php - code beautification (PSR) 2018-03-03 14:40:16 +01:00
rabuzarus 2efd4ba780 fix local directory search 2018-03-03 14:06:42 +01:00
Hypolite Petovan a7db21c8fd Rename Core\Acl to Core\ACL 2018-03-02 18:41:24 -05:00
Hypolite Petovan dca0fa3f1d Fix wrong variable type in mod/message 2018-03-02 18:40:09 -05:00
Hypolite Petovan a6c785f693 Prettify mod/acl 
- Replace obsolete x() and killme() calls
- Simplify ternary operators with defaults()
- Restore list alignment
- Extract variable initialization from else conditions
 2018-03-02 18:40:09 -05:00
Hypolite Petovan 09c717d751 Remove references to include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan 207eac4a16 Move navbar_complete to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan 824262b824 Move populate_acl to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan 2b35938e34 Move get_acl_permissions to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan 113ea38d50 Move contact_select to Acl 
- Simplify Acl::getMessageContactSelectHTML parameters
 2018-03-02 18:40:08 -05:00
Hypolite Petovan eef25a3259 Move contact_selector() 2018-03-02 18:40:08 -05:00
Hypolite Petovan eeafb59c31 Add new class/functions 
- Create class Core\Acl
- Add Contact::pruneUnavailable
- Add mod_content
 2018-03-02 18:40:08 -05:00
Hypolite Petovan 9f21e7f34f Use default value for uid parameter in Contact::getIdForURL 2018-03-01 19:54:12 -05:00
Hypolite Petovan e54a7e7834
Merge pull request #4523 from annando/invitation-code 
"Invitation ID" is now "invitation code" to unify the description
 2018-03-01 15:53:10 -05:00
Michael 12f3a5ffad "Invitation ID" is now "invitation code" to unify the description 2018-03-01 19:29:01 +00:00
Michael ccfaf6eef3 Items on the network page should now be ordered always like expected 2018-02-28 20:21:31 +00:00
Michael Vogel 617ace38e4
Merge pull request #4515 from MrPetovan/task/4513-hide-attendno-events 
Add attendance check to event reminder
 2018-02-28 15:29:16 +01:00
Michael 60d00087f0 Don't do the restriction on thread starters when loading a single thread 2018-02-28 06:36:41 +00:00
Hypolite Petovan f58d8f4108 Add attendance check to event reminder 2018-02-27 20:47:18 -05:00
Michael 02e969a73b Only update toplevel posts when ordered after posts 2018-02-27 23:25:29 +00:00
Michael 9cf342f02a Improved JS, updating single items now work 2018-02-27 22:37:11 +00:00
Michael 4070ad1815 After a post only the single post is now updated 2018-02-27 21:10:05 +00:00
Michael 99c6711cfd Following tags on the network page should now work for comments as well 2018-02-27 13:23:25 +00:00
Hypolite Petovan 9297f0305f
Merge pull request #4506 from annando/fix-update 
Fix for network update (number of maximum comments set to 0)
 2018-02-27 04:18:13 -05:00
Michael 15cd4792b8 Bugfix: The network update after a post now works again 2018-02-27 06:28:53 +00:00
Michael 20368cbbf4 Fix for network update (number of maximum comments set to 0) 2018-02-26 22:15:57 +00:00
Hypolite Petovan ba560ff76c
Merge pull request #4491 from tobiasd/20180224-settinghelp 
added some help texts to the Security and Privacy profile settings
 2018-02-26 11:30:23 -05:00
Tobias Diekershoff 56bd9ec148 not only the others 2018-02-26 17:27:00 +01:00
Tobias Diekershoff 1b7a307423 annon it is 2018-02-26 17:21:47 +01:00
Hypolite Petovan 3dac937f22
Merge pull request #4501 from annando/fix-tag-search 
Fix: Tag searches hadn't been stored as tags
 2018-02-26 11:13:51 -05:00
Tobias Diekershoff 3950b2f8c6 added ganggo project to the federation statistics page 2018-02-26 17:10:47 +01:00
Michael 84ea6cab32 Fix: Tag searches hadn't been stored as tags 2018-02-26 11:45:53 +00:00
Michael a700b3a729 Fix for fetching too old dates 2018-02-26 10:44:54 +00:00
Michael 9ac9481105 Flexible update timeout value 2018-02-26 07:41:58 +00:00
Michael fe68e99c7c The tag query should be much faster now 2018-02-26 06:59:32 +00:00
Michael 9308b7f2df inner join is better 2018-02-25 21:58:21 +00:00
Michael a1eb5a584f Improve the queries on the network page 2018-02-25 21:33:15 +00:00
Tobias Diekershoff 28fa27ea0e some wording changes 2018-02-25 08:50:50 +01:00
Tobias Diekershoff 8a844b1440 added some help texts to the Security and Privacy profile settings 2018-02-24 08:00:11 +01:00
Michael 24a20fc294 Improved logging for salmon posts to check for missing contacts in item post 2018-02-22 09:57:06 +00:00
Michael 82bd26edb9 The item class had been improved (e.g. database calls) 2018-02-21 21:08:37 +00:00
Michael a59796d1d4 No gcontact-id anymore (It wasn't really used) 2018-02-21 05:15:55 +00:00
Michael a3af6807ac Improved resource id creation 2018-02-20 10:02:07 +00:00
Hypolite Petovan 281734d5dc
Merge pull request #4471 from annando/parent-uid 
Frontend to set the parent-uid field
 2018-02-18 11:48:39 -05:00
Michael fd53b541e5 Frontend to set the parent-uid field 2018-02-18 13:19:47 +00:00
Tobias Diekershoff 59aed9533e missing L10n::t for date string formatting 2018-02-18 09:56:27 +01:00
Hypolite Petovan 956ed54800 Remove IDE quirk in mod/register 2018-02-15 15:10:00 -05:00
Hypolite Petovan 9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan 05a2ea4220 Refactor comments including "bbcode()" 2018-02-14 22:00:43 -05:00
Hypolite Petovan 0c52866693 Refactor bbcode() into BBCode::convert() 2018-02-14 21:33:55 -05:00
Hypolite Petovan 7a38fbf84b [Scrutinizer] Fix undeclared variables part 7: mod/ and view/ 
- Remove unused function `salmon_return()`
 2018-02-14 00:07:26 -05:00
rabuzarus fb81d266bd declare $bang variable in editpost_content() 2018-02-13 01:20:16 +01:00
rabuzarus 2f8d78fd9f the lockstate should be now correct in editpost_content() 2018-02-12 22:26:25 +01:00
rabuzarus abe0d8355a remove code with undeclared variable in function poke_init( 2018-02-12 20:27:10 +01:00
rabuzarus ea770ed778 remove code in function follow_post() that was never executed. 2018-02-12 20:24:33 +01:00
rabuzarus 1a87fcb5b3 tagger_content(): handle case where $owner_nick is empty 2018-02-12 19:28:14 +01:00
rabuzarus 02654c28f7 tagger_content(): use the $owner_nickname for constructing the link 2018-02-12 17:46:34 +01:00
rabuzarus 049a4f5f86 some polishing 2018-02-12 04:10:11 +01:00
rabuzarus 2e03a3a47f fix undeclared variables or wrong variable names (/mod) 2018-02-12 03:25:09 +01:00
Michael ee7c587693 Suppress content from hidden or blocked contacts 2018-02-10 12:34:10 +00:00
Michael d42f86e218 We can now delegate again like before 2018-02-08 22:18:34 +00:00
Tobias Diekershoff 85c8bf0228
Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src 
Move include/bbcode to src/ part 1 : Everything but bbcode()
 2018-02-07 07:18:39 +01:00
Michael e609de2957 Many item calls are now isolated in a single function 2018-02-06 12:40:22 +00:00