1
0
Fork 0
Commit graph

1789 commits

Author SHA1 Message Date
047c02371a Small corrections to the database descriptions 2018-06-01 22:12:35 +00:00
28f8beebfc Workers can now be started exclusively from the daemon and other workers 2018-06-01 22:09:27 +00:00
b5b172500d Merge remote-tracking branch 'upstream/develop' into public-redir 2018-06-01 12:32:51 +00:00
Hypolite Petovan
93daf7883e Merge branch 'master' into develop
- Updated new develop version label
- Incremented database build number
2018-06-01 07:30:04 -04:00
ae8d7267a0 "redir" is now centralized and works with the public contact 2018-06-01 06:46:34 +00:00
9ea6d4b26d the detected language was not stored during user creation 2018-05-31 08:27:27 +02:00
c86111d193 Coding standards 2018-05-29 19:00:26 +00:00
Pascal Deklerck
1853c5623b 4419 Update the comments in src/Database/DBStructure.php from doc/database/* 2018-05-29 10:24:36 +02:00
8329705eba New function to delete items for users 2018-05-29 05:22:57 +00:00
deb015be12 Changed documentation 2018-05-27 10:42:47 +00:00
c5a22f86c7 Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item 2018-05-27 10:38:49 +00:00
rabuzarus
32c3762989
Merge pull request #5138 from annando/optimize-workerqueue
Possibly fixes 5137: Only execute "optimize table" when allowed
2018-05-27 10:10:11 +02:00
04fd6eff01 Possibly fixes 5137: Only execute "optimize table" when allowed 2018-05-27 06:23:18 +00:00
708ddf2b02 Preparation for new deletion functionality 2018-05-26 20:23:49 +00:00
a6396dde55 Removed useless line 2018-05-26 20:08:42 +00:00
a50805c371 Grammar fix 2018-05-26 20:07:30 +00:00
bdbc51229a Fix for not being able to delete items 2018-05-26 18:07:27 +00:00
rabuzarus
c66d1f01a3 add missing database use statements 2018-05-25 09:05:16 +02:00
rabuzarus
f013625382 fix typo in comment 2018-05-25 08:52:03 +02:00
rabuzarus
8174bfeb2b Bugfix: compute the current theme each time we want to know which theme is beeing used 2018-05-25 08:44:01 +02:00
4a67919be7 Issue 5010: Don't show removed users 2018-05-24 04:44:02 +00:00
89a20ddbd7 Nodeinfo: The number of comments is now calculated more reliable 2018-05-22 20:10:18 +00:00
df531cd400 Don't proxy pictures when they are sent to other networks 2018-05-21 10:15:50 +00:00
Hypolite Petovan
c41332364f
Merge pull request #5089 from tobiasd/20180519-tos
privacy statement
2018-05-20 08:20:16 -04:00
d78b1f5191
Merge pull request #5091 from annando/issue-4956
Don't fail during installation because of a missing theme configuration
2018-05-20 08:50:28 +02:00
f7c24a20ae cite: just some small styling thing 2018-05-20 08:43:43 +02:00
9d0ed1a2af Issue 4956: Don't fail during installation because of a missing theme configuration 2018-05-20 05:44:20 +00:00
c70ebadd7d Issue-3412 related: Don't send connection posts anymore 2018-05-19 19:34:51 +00:00
2798d4ea4d missing sign 2018-05-19 19:08:50 +02:00
4f8530070b removed one line too much 2018-05-19 19:07:13 +02:00
e02093c7ea text of the priv. statement can now be shown outside of the module 2018-05-19 18:55:29 +02:00
3fe07cca57 Issue 2880: Editing post doesn't destroy mentions or hashtags anymore 2018-05-19 14:55:27 +00:00
5ae9193aa7
Merge pull request #5084 from annando/dead-subscriber
End subscription for unreachable subscribers
2018-05-19 07:07:00 +02:00
e9848d7b8f End subscription for unreachable subscribers 2018-05-19 03:56:29 +00:00
5d708fd9a9 Avaoid warning when no valid data could be read 2018-05-18 16:07:55 +00:00
Hypolite Petovan
83ff57777f
Merge pull request #5079 from annando/fix-self
Fix: Sometimes the contact endpoints seem to be wrong
2018-05-18 08:54:00 -04:00
8983c61023 Fix: Sometimes the contact endpoints seem to be wrong 2018-05-18 12:26:10 +00:00
feb3d76a5b Fix: Subscriptions from GNU Social partially don't work 2018-05-18 12:18:12 +00:00
Hypolite Petovan
1d2b0c0a81
Merge pull request #5077 from annando/fix-blocking-ostatus
Fix to OStatus delivery to be not so blocking to other tasks
2018-05-17 19:59:08 -04:00
4355014492 Now it should work ... 2018-05-17 23:47:15 +00:00
f4a71b76dd Dynamic priority handling 2018-05-17 23:43:44 +00:00
61824119e4 Moved functionality in new model class 2018-05-17 23:30:49 +00:00
5a1e1c1ec9 Fix to OStatus delivery to be not so blocking to other tasks 2018-05-17 22:17:03 +00:00
41b7d75cca
Merge pull request #5072 from Alkarex/ru-plural-intval-bug
i18n ru intval bug
2018-05-17 09:43:25 +02:00
Alexandre Alapetite
f980516545 Fix PoToPhp
https://github.com/friendica/friendica/pull/5072#issuecomment-389754406
2018-05-17 08:12:55 +02:00
ac67f3c154
Merge pull request #5071 from annando/fix-duplicated-posts
Bugfix: Only send a notifier when the item was really edited
2018-05-17 07:59:56 +02:00
b333c7ae2e Bugfix: Only send a notifier when the item was really edited 2018-05-17 05:49:55 +00:00
6129eb1623
OpenId possibly fixed:
- The LightOpenId class' constructor now requires the hostname from where the
  requested started, added it now
- sometimes need to invoke get_app() as $a was not around

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-17 00:24:25 +02:00
Michael Vogel
e8e93768db
Merge pull request #5065 from tobiasd/2018.05-rc
added link to the TOS page if it is activated
2018-05-16 14:21:24 +02:00
eec0826750 added link to the TOS page if it is activated 2018-05-16 11:57:06 +02:00
3b2752c2fe Follow up to PR 5060: Missing index update 2018-05-16 08:59:15 +00:00
84248ac4c1 Grammar stuff 2018-05-16 03:54:08 +00:00
c9f55f6b3d Show "Remove from your screen" or "delete" depending of the impact of the deletion 2018-05-15 21:06:34 +00:00
e77cd17495 We do the notify stuff now directly in the item class 2018-05-15 19:50:29 +00:00
fe8a4d50c8 Merge branch 'item-delete' of github.com:annando/friendica into item-delete 2018-05-15 19:31:05 +00:00
4a1bbd114c Lower priority for "remote self" 2018-05-15 19:29:14 +00:00
82937189ba Only delete undeleted items 2018-05-15 19:25:35 +00:00
fc60e23314 Added comments / hourly workerqueue deletion 2018-05-15 17:50:29 +00:00
3e475f3b82 Delete the shadow post when it is the last one 2018-05-15 16:40:13 +00:00
4a7bf95926 Fix: Delete all item copies if it is an original item 2018-05-15 15:51:58 +00:00
0848cef605
Merge pull request #5055 from annando/worker-spawning
Fix for the slow spawning of workers
2018-05-15 08:22:33 +02:00
ba4f9b6136
Merge pull request #5054 from annando/diaspora-comments
Fix: public comments weren't distributed to the followers.
2018-05-15 07:30:34 +02:00
8564eeec4e Fix: public comments weren't distributed to the followers. 2018-05-15 04:33:28 +00:00
e409001dfb
Fixed "constant" result, maybe there is a $ missing?
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-15 03:26:20 +02:00
538760d9da
No direct $a->config['foo'] needed when Config::get() is around ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
751394fc1d
Redis:
- added support for redis server:

// Required to actually have this cache driver active:
$a->config['system']['cache_driver'] = 'redis';

// ---- OPTIONAL/DEFAULT: ----
$a->config['system']['redis_host'] = '127.0.0.1';
$a->config['system']['redis_port'] = 6379;

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
69ac6feff7
Continued:
- you can directly use constant($var) instead of this switch()

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
fe1e7b92f2
Continued:
- system,worker_dont_fork may not be set, always set default to "false" to
  have it properly set as Config::get() may one day behave differently

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
57e668d9e0
Continued:
- avoided else() block which reduces code complexibility
- used more x()
- added curly braces
- added known type-hints

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
17a39340b5
"pending" shouldn't be set as well by default ... 2018-05-14 22:50:04 +02:00
f28301e18f
Urgent bugfix: Public contacts had been blocked automatically when created 2018-05-14 22:50:04 +02:00
72f5b863d8
Reshares had been detected falsely so that were rejected by Diaspora 2018-05-14 22:50:04 +02:00
f19066c6cf
Ensure that the link will be displayed correctly on Diaspora 2018-05-14 22:50:04 +02:00
dcfd81e2ee
Some corrections 2018-05-14 22:50:04 +02:00
d54c79a772
Replace old database queries with the new ones 2018-05-14 22:50:04 +02:00
11dcb31960
was a bit confusing for me or I was not sleeping to much ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
ce07c20130
PHP5 does not support native type-hints, except array + used dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
6579396627
removed TODO, one day this all needs refacturizing ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
7526afcf13
Continued:
- converted multiple single-line comments into one multi-line comment (please
  stop abusing programming languages!)
- added more TODO tags for type-hints (upcoming rewrite)
- opps, one space was only fixed in develop branch, not in this PR branch

Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
f5f1650b62
fixed comment and explained one
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
1fcd4f52e7
old behaviour restored
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
87bb934f8f
added curely branches + reverted back to old behaviour (may come back one day)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
116d0ee1e0
better comment added by @Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
e5c4b0203a
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:00 +02:00
7e54499856
"pending" shouldn't be set as well by default ... 2018-05-14 22:50:00 +02:00
cd7c337134
Urgent bugfix: Public contacts had been blocked automatically when created 2018-05-14 22:50:00 +02:00
002a1d1f54
Reshares had been detected falsely so that were rejected by Diaspora 2018-05-14 22:50:00 +02:00
d217d74081
Ensure that the link will be displayed correctly on Diaspora 2018-05-14 22:50:00 +02:00
3bb5a416f8
Some corrections 2018-05-14 22:50:00 +02:00
8b775d48f9
Replace old database queries with the new ones 2018-05-14 22:50:00 +02:00
dd6fd32883
rewrote based on CR by @Annando, thank you. It is now clear to me.
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:59 +02:00
25fd270959
Continued:
- added spaces and curly braces
- added more TODOs as there really more to be done

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:58 +02:00
fc4d1296e3
was a bit confusing for me or I was not sleeping to much ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:57 +02:00
4d5c61395e
PHP5 does not support native type-hints, except array + used dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:57 +02:00
03f283ca36
fixed comment and explained one
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
d2d6200669
old behaviour restored
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
be3d0a90a5
added curely branches + reverted back to old behaviour (may come back one day)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
b823708c50
better comment added by @Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
f1b5e828db Fix for the slow spawning of workers 2018-05-14 05:02:18 +00:00
Hypolite Petovan
f937dabc9e
Merge pull request #5044 from annando/no-feed-reshare
We mustn't reshare a feed item (only DFRN and Diaspora)
2018-05-13 18:31:58 -04:00
Michael Vogel
24ef818d0d
Merge pull request #5038 from tobiasd/20180519-3834
dont delete but remove from your stream
2018-05-13 22:24:59 +02:00
57bd073ffd We mustn't reshare a feed item (only DFRN and Diaspora) 2018-05-13 18:31:01 +00:00
Hypolite Petovan
288b508e2a
Merge pull request #5041 from M-arcus/patch-1
[TASK] Automatic installation: Install theme
2018-05-13 10:03:11 -04:00
99440f3c56
Beatification:
- added space after curly braces (MrPetovan)
- added TODO for possible rewrite candidate

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-13 14:21:53 +02:00
Marcus Müller
64a799198a
[TASK] Automatic installation: Install theme 2018-05-13 12:50:53 +02:00
17dda0fc43 dont delete but remove from your stream 2018-05-13 11:10:34 +02:00
Hypolite Petovan
ec626fb76c
Merge pull request #5036 from Alkarex/fix-constants
Fix wrong use of class constants
2018-05-13 04:38:32 -04:00
Alexandre Alapetite
736c76d068 Simplify constant names
https://github.com/friendica/friendica/pull/5036#discussion_r187792865
2018-05-13 10:34:33 +02:00
Alexandre Alapetite
41a8c62bee Fix wrong use of class constants
http://php.net/manual/language.oop5.constants.php
2018-05-13 10:07:15 +02:00
445cc1cb99
Fixes:
- brought back comment (ops)
- DBM is the class name (not dbm)

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-13 10:06:43 +02:00
3191fee763
Ops, one to much ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-13 10:02:47 +02:00
926c9719e0 Avoid SQL error with empty "bd" field 2018-05-11 15:27:19 +00:00
79a343a69a Only set the "updated" value when it contains a value 2018-05-11 10:44:28 +00:00
f9c695e78d Fix SQL error during postupdate 2018-05-11 09:20:59 +00:00
8d8f2a1845 Change the community value as well 2018-05-11 08:04:01 +00:00
78271e88f5 Insert a gcontact on probing, but not insert a contact 2018-05-11 05:44:31 +00:00
3d2bc7700e Fix SQL error 2018-05-10 20:14:51 +00:00
6d4f3e8ee2 Issue 4997: Avoid database duplicates 2018-05-10 12:49:28 +00:00
cf9fa51f2f
Continued:
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-10 13:07:21 +02:00
f66cb9b0a3
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-10 13:07:21 +02:00
40d3e7982c Adopt the relay definition according to the suggestions from @jaywink 2018-05-10 11:04:18 +00:00
ed664b1091 For feed items show the avatar of the local user 2018-05-09 21:09:16 +00:00
7f7ccc3f51 the widget is not needed here 2018-05-09 12:49:29 +02:00
21f9f74ad0 use Archives for the additional feature setting like it is used in the network sidebar 2018-05-09 12:32:47 +02:00
3eb0b795fc Bugfix: Avoid empty avatar photos when a public contact is created 2018-05-09 06:53:57 +00:00
74908c0125 Corrected placeholders 2018-05-08 20:22:21 +00:00
08bf19082c Ensure that there will always be an author-id and owner-id in the items 2018-05-08 20:20:15 +00:00
e7e0bee0a9 Added maintenance notice 2018-05-08 18:46:47 +00:00
6c35f8ebf3 Update script for setting author-id and owner-id in item and thread table 2018-05-08 17:50:06 +00:00
7d6b1264ec Fix for issue 4994: Feed items now appear again 2018-05-08 06:11:46 +00:00
eb4650ff23 dbclean settings are now available from the frontend 2018-05-07 05:37:20 +00:00
c33df7a05e Fix video display problems with videos with parameters 2018-05-06 16:57:46 +00:00
Hypolite Petovan
3a3a4807a8
Merge pull request #4978 from annando/dba-2
Diaspora: Fix person/contact retraction
2018-05-04 18:04:38 -04:00
Hypolite Petovan
4e1441bb3e
Merge pull request #4981 from annando/remote-self
"remote-self" is now working for Diaspora and Twitter as well
2018-05-04 17:50:17 -04:00
dfa0dbf33f Ups 2018-05-04 21:33:15 +00:00
1230ff146a "remote-self" is now working for Diaspora and Twitter as well 2018-05-04 21:12:13 +00:00
7e28e3e5f4 using \PDO instead PDO (bugfix) 2018-05-04 19:48:01 +02:00
6dbf0de9f2 Removed activities that aren't in the Diaspora protocol 2018-05-04 06:34:02 +00:00
d52b226a6e Reformat wrong expansion 2018-05-03 20:49:32 +00:00
321a36d4db Avoid SQL error with wrong formatted datetime value 2018-05-03 20:48:35 +00:00
08bfced11b "pending" shouldn't be set as well by default ... 2018-05-03 18:19:40 +00:00
bce3b6f896 Urgent bugfix: Public contacts had been blocked automatically when created 2018-05-03 17:43:10 +00:00
53b7028d35 Reshares had been detected falsely so that were rejected by Diaspora 2018-05-03 13:03:41 +00:00
aba93df94f Ensure that the link will be displayed correctly on Diaspora 2018-05-03 04:43:50 +00:00
eecd1e47e4 Some corrections 2018-05-02 21:12:48 +00:00
4ad655ab80 Replace old database queries with the new ones 2018-05-02 19:26:15 +00:00
Hypolite Petovan
538143f628
Merge pull request #4967 from nupplaphil/4899-autoinstall-with-file
AutomaticInstallation - use config file
2018-05-01 08:19:02 -04:00
559250b8b3 Updated help-text
accidentaly changed `htconfig.php` (reverted)
2018-05-01 13:21:42 +02:00
95ef07d67b Updated help-text 2018-05-01 13:14:41 +02:00
fa78f148c8 AutomaticInstallation - use config file
- added new parameter "-f config file" to `AutomaticInstallation.php`
2018-05-01 13:11:25 +02:00
1e0200884f Fixed private messaging/relaying is controlled by the parent 2018-05-01 06:37:12 +00:00
Hypolite Petovan
352e136132
Merge pull request #4961 from annando/direct-dfrn
Direct Relay is now working with DFRN as well
2018-04-30 14:06:35 -04:00
b72bc0735f Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn 2018-04-30 16:52:44 +00:00
a182dd3400 Improved logging, avoiding PHP warning 2018-04-30 16:46:49 +00:00
1a8d0a573e Bugfix: Contact wasn't added on probing 2018-04-30 16:45:00 +00:00
4909075321 Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn 2018-04-30 13:09:11 +00:00
5588f0d2ae Improved logging 2018-04-30 13:08:48 +00:00
b2b597288c Deliver with the new function when delivering to a "uid=0" contact 2018-04-30 13:07:40 +00:00
bbbebb2b9c Don't spool relay deliveries 2018-04-30 05:56:40 +00:00
d0dd5c44d9 Update or create relay contact from discovery / process new protocol values 2018-04-30 05:33:47 +00:00
b4f5311e7f Add Install Mode
- merge `friendica/develop` to `nupplaphil/install_mode`
2018-04-29 20:15:12 +02:00
Michael Vogel
bd0ba24518
Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app
Move current_theme() to App
2018-04-29 19:11:49 +02:00
da9ac7b879 Add Install Mode
- increased code quality
2018-04-29 18:13:24 +02:00
6cb277b0bb Add Install Mode
- added PHP docBlock to methods
- increased code quality
2018-04-29 18:11:24 +02:00
Hypolite Petovan
fde3d6f870 Replace current_theme() and current_theme_url() calls 2018-04-28 18:37:25 -04:00
Hypolite Petovan
964bf3f3cc Add new methods to src
- Add App::getCurrentTheme()
- Add App::getCurrentThemeStylesheetPath()
- Add Theme::getStylesheetPath()
2018-04-28 18:30:13 -04:00
Hypolite Petovan
acbc733dce Fix formatting in Core\Theme 2018-04-28 18:28:23 -04:00
Michael Vogel
833fe0e0dc
Merge pull request #4942 from MrPetovan/task/import-post-ignored-contact
Import posts from ignored contacts
2018-04-28 18:16:30 +02:00
41c6d63052 Add Install Mode
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
2018-04-28 15:15:54 +02:00
1ab965c944 Add Install Mode
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
2018-04-28 15:11:01 +02:00
a97ad9dc42 Add Install Mode (Part 2)
- Added constants to class `App`
- Added global App-Mode to `dba:connect()` instead parameter `$install`
2018-04-28 12:36:40 +02:00
Andreas Neustifter
91e0a9227e Fix #4943.
PR #4939 introduced a bug that only surfaces when using Network from extern.
Use proper self reference to fix that.
2018-04-28 06:46:46 +00:00
Hypolite Petovan
bd21fc3751 Import posts from ignored contacts 2018-04-27 21:08:19 -04:00
Andreas Neustifter
9bf58e46f6 Changes requested by @MrPetovan. 2018-04-27 20:22:17 +00:00
Andreas Neustifter
70a781fa5a Proper error when rewrite fails during install.
When Curl tries to fetch the rewrite test URL and something goes wrong the user
has no clue what was the problem. This problems can include:
- The rewriting not working at all.
- HTTPS redirects do not work.
- Curl does not accept the presented SSL cert.

This commit fixes this by providing the Curl error message to the user to further
debug the problem.

Fixes #3629.~
2018-04-27 21:27:55 +02:00
d5b68cd146 Add a App-Mode with defined constants
- Normal Mode = 0
- Install Mode = 1
- Maintenance Mode = 2

Moved Install-Mode check to class `App`

Replaced all maintenance and install checks with $a->mode checks
2018-04-27 21:07:04 +02:00
6879be5168 Possibly not so important change ;-) 2018-04-27 14:21:12 +00:00
98415e0e34 Diaspora reshares should now always reshare the correct content 2018-04-27 14:03:10 +00:00
84909d9711 Standard stuff 2018-04-27 12:40:52 +00:00
9f5a6c05fb Preparation for relay posts with DFRN 2018-04-27 05:11:52 +00:00
4904be0d6f Better fallback on values > 299 as well 2018-04-27 04:55:46 +00:00
1e2bc1e6cf Ensure local delivery of Diaspora comments 2018-04-27 04:11:33 +00:00
e3c9d31088 Added header 2018-04-27 03:08:13 +00:00
488c6c9b68 Constants moved 2018-04-27 02:52:12 +00:00
66e34b9357 Improvements 2018-04-26 22:30:43 +00:00
8c23fea1df Added some explanation, beautified code 2018-04-26 21:16:16 +00:00
a785d8c2f9 Merge remote-tracking branch 'upstream/develop' into reworked-delivery 2018-04-26 20:42:57 +00:00
4957ab8fbb Avoid PHP warning with a missing key 2018-04-26 20:41:06 +00:00
Hypolite Petovan
33a551235e
Merge pull request #4934 from annando/distribute-precaution
Item distribution: Better don't store these values
2018-04-26 16:26:23 -04:00
4a792761d1 Item distribution: Better don't store these values 2018-04-26 20:11:29 +00:00
Hypolite Petovan
9e700ba6ea
Merge pull request #4933 from annando/bugfix-distribute
Bugfix: The Distribition of public items failed with comments
2018-04-26 16:02:56 -04:00
da3658c80d Bugfix: The Distribition of public items failed with comments# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen, 2018-04-26 19:47:12 +00:00
Hypolite Petovan
f7f640175a Fix PHP 7.2 warning in Model\Profile 2018-04-26 04:56:42 -04:00
a0c5a84ce8 Better way to fetch items 2018-04-26 07:11:18 +00:00
b70b020490 Unneeded stuff removed, only fetch needed records 2018-04-26 06:23:01 +00:00
71d4c6e4a0 Cleaned up 2018-04-26 05:45:05 +00:00
c437dac3a0 Delivery to non followers 2018-04-25 21:55:24 +00:00
3abd0b54cc Reworked delivery 2018-04-25 21:18:21 +00:00
Hypolite Petovan
a9f1f47be2
Merge pull request #4931 from annando/no-ignored
Don't distribute for ignored contacts
2018-04-25 12:07:00 -04:00
66547e5107 Don't distribute for ignored contacts 2018-04-25 16:00:21 +00:00
ad45a73bf3 Improvements for the Diaspora protocol 2018-04-24 18:34:35 +00:00
5019d46071 We only need the uid 2018-04-24 14:58:39 +00:00
5cf745af44 Item distribution is now done via the public post 2018-04-24 13:21:25 +00:00
7230cc0bed Merge remote-tracking branch 'upstream/develop' into item-distribution 2018-04-24 04:23:38 +00:00
6973aaefc2 Add Install Mode
- Added $install_mode in Class App instead
- Extracted the install business logic to a new Class Install
- Replaced all $a->module == 'install' with $a->install_mode
2018-04-23 22:56:59 +02:00
e51a017d92
Merge pull request #4917 from annando/show-private-forums
Show private forums in the sidebar
2018-04-23 18:47:21 +02:00
c3ee596ff4 Show private forums in the sidebar 2018-04-23 16:41:00 +00:00
Hypolite Petovan
a66e9b81ba
Merge pull request #4873 from astifter/develop
Remove pagination when empty, move new Member Tips and use common widget to find people.
2018-04-23 10:23:21 -04:00
ba35b19af6 Public federated items now always are having an entry with "uid=0" 2018-04-23 11:14:25 +00:00
Hypolite Petovan
a25c07b162
Merge pull request #4912 from annando/archivecontacts
Added console command to manually archive contacts
2018-04-23 02:07:53 -04:00
b3d24f0ff2 DFRN: mark for archival at different places 2018-04-23 06:03:55 +00:00
866fbb4d80 Added console command to manually archive contacts 2018-04-23 05:33:47 +00:00
Hypolite Petovan
00985fe340 Fix self warning in Util\Temporal 2018-04-23 00:03:27 -04:00
Hypolite Petovan
9b052b5ea8 Fix count() warning in Object\Post 2018-04-23 00:02:18 -04:00
Hypolite Petovan
b0564ea40d Fix count() warning in Model\Profile
- Replace x() calls with empty() in Profile::load
- Remove extraneous $a->page['aside'] initialization
2018-04-23 00:01:46 -04:00
Michael Vogel
37e5272f92
Merge pull request #4881 from MrPetovan/task/4867-guess-language-from-plaintext
Guess language from plaintext
2018-04-23 00:26:05 +02:00
Friendica
390983a331 Haromonize Find People Widget.
In the right_aside on the /contacts page in the left aside there are
almost identical widgets to search for contacts. Drop one and use common
widget in both places.
2018-04-22 20:44:22 +00:00
Hypolite Petovan
d977ff78df Uncomment some code in ItemContent::getPlaintextPost
- I have no idea what I'm doing
2018-04-22 11:43:27 -04:00
Michael Vogel
6e9ed3f01b
Merge pull request #4894 from MrPetovan/task/4513-show-events-reminders-attendence
Only show event reminders of events attendyes or attendmaybe
2018-04-22 17:38:32 +02:00
Hypolite Petovan
82ed6fff9f Use public_contact() instead of wrong query in Profile::getEventsReminderHTML 2018-04-22 11:29:55 -04:00
8f2db61538 Receiving of public posts is now working 2018-04-22 10:58:03 +00:00
c59b28a8c4 create public endpoint 2018-04-22 10:04:30 +00:00
Hypolite Petovan
e0b33b36a2 Decrease scope of query in Profile::getEventsReminderHTML
- Use specific SELECT fields
- Use INNER JOIN
2018-04-22 04:41:53 -04:00
Michael Vogel
25662eb6f4
Merge pull request #4892 from MrPetovan/bug/infinite-loop-in-dba-delete
Prevent infinite loop when a dbstructure_definition hook is orphan
2018-04-22 07:55:39 +02:00
Michael Vogel
39edd086e0
Merge pull request #4893 from MrPetovan/bug/4879-remove-backslash-in-birthday-events
Fix quoting style in DFRN::birthdayEvent()
2018-04-22 07:54:07 +02:00
Hypolite Petovan
08afec3170 Only show event reminders of events attendyes or attendmaybe 2018-04-21 22:53:13 -04:00
Hypolite Petovan
851c5d841f Fix quoting style in DFRN::birthdayEvent() 2018-04-21 21:03:12 -04:00
Hypolite Petovan
6d88984ee5 Move Model\Item::getPlaintextPost to Model\ItemContent::getPlaintextPost 2018-04-21 20:50:13 -04:00
Hypolite Petovan
18078ce7a4 Prevent infinite loop when a dbstructure_definition hook is orphan
- Add cascade option to dba::delete
- use cascade = false for orphan hook deletion
2018-04-21 20:34:07 -04:00
Hypolite Petovan
daf94a8f63
Merge pull request #4891 from annando/private-forum-redux
Better working with private forums
2018-04-21 18:19:27 -04:00
16beab4652 Better working with private forums 2018-04-21 21:59:02 +00:00
f63be91bd5
Revert "Moved .htconfig.php file & extracted Install business logic" 2018-04-21 16:28:22 +02:00
334d392154 Merge remote-tracking branch 'origin/develop' into install_config 2018-04-21 14:23:49 +02:00
346697d771 Moved .htconfig file
Extracted install business functions to new Class `Install.php`
2018-04-21 14:10:53 +02:00
ebe203336f
Merge pull request #4882 from annando/private-forums
Contact requests from Diaspora for private forums aren't accepted automatically anymore
2018-04-21 13:54:10 +02:00
fd7658a70a Contact requests from Diaspora for private forums aren't accepted automatically anymore 2018-04-21 10:39:46 +00:00
Hypolite Petovan
1e67c32142 Fix BBCode::getAbstract scope 2018-04-21 04:38:27 -04:00
Hypolite Petovan
abc50eb3ae Improve Model\Item::addLanguageInPostopts()
- Use Content\BBCode::toPlaintext method
- Rename $arr parameter to $item
- Rename $lng variable to $languages
2018-04-21 04:11:32 -04:00
Hypolite Petovan
ec9baef968 Add new Content\BBCode::toPlaintext() 2018-04-21 04:10:25 -04:00
Hypolite Petovan
5476da53aa Move Content\BBCode::toPlaintext() to Model\Item::getPlaintextPost() 2018-04-21 04:09:45 -04:00
4d4ed6fb17
Merge pull request #4863 from MrPetovan/task/4860-add-hidden-input-in-console
Add hidden input in newpassword console
2018-04-20 09:29:17 +02:00
Hypolite Petovan
f043554ab7
Merge pull request #4849 from M-arcus/installation-script
[FEATURE] Install Script: Add first version
2018-04-19 07:57:02 -04:00
Hypolite Petovan
f65a7b3130 Add hidden password input to Console\NewPassword
- Add Exception when password is empty
2018-04-19 07:51:26 -04:00
Hypolite Petovan
0496822ca3 Add Exception when password is empty in User::hashPassword() 2018-04-19 07:51:26 -04:00
Marcus Müller
e2a58a791c
[DOCS] Auto Install: Add description 2018-04-19 10:21:41 +02:00
ab82c6df03
Merge pull request #4865 from annando/dfrn-reshare
Diaspora: Improved reshared coding
2018-04-19 08:43:18 +02:00
Michael Vogel
10465110c1
Merge pull request #4851 from MrPetovan/task/4709-add-query-based-content-filter
Add query based content filter
2018-04-19 08:21:53 +02:00
c507cdf946 Code simplified 2018-04-19 06:07:23 +00:00
da06416426 Merge remote-tracking branch 'upstream/develop' into dfrn-reshare 2018-04-19 05:44:06 +00:00
Hypolite Petovan
87f638bdc9 Improve CacheSessionhandler
- Replace !x() by empty()
- Add return values to read() and destroy()
2018-04-18 23:37:06 -04:00
Hypolite Petovan
ca4ca51c6a Add hostname prefix in MemcachedCacheDriver 2018-04-18 23:36:23 -04:00
Marcus Müller
457b86711d
[TASK] Auto install: Rework class 2018-04-18 14:30:42 +02:00
Marcus Müller
24626f5fd2
[TASK] Auto install: Rename script command 2018-04-18 14:21:40 +02:00
Marcus Müller
7b7ca71bf6
[TASK] Auto install: Rename script command 2018-04-18 14:20:21 +02:00
Marcus Müller
d53e64a583
[TASK] Install Script: Register installation class 2018-04-18 11:46:27 +02:00
Marcus Müller
1d552b5e66
[TASK] Install script: Add installation class 2018-04-18 11:43:23 +02:00
fda5ad647d
Merge pull request #4857 from annando/duplicated-tags
Avoid duplicated multibyte tags
2018-04-18 07:50:56 +02:00
8a730b2d85 Issue 4655: Avoid multiplicated contact requests from the same account 2018-04-18 05:02:59 +00:00
ed87e634ed Avoid duplicated multibyte tags 2018-04-18 05:00:28 +00:00
f99af007ae Replaced queries 2018-04-18 04:59:33 +00:00
88353ce56f Merge remote-tracking branch 'upstream/develop' into dfrn-reshare 2018-04-18 03:12:13 +00:00
Hypolite Petovan
6d2d15a80d
Merge pull request #4782 from Alkarex/fix-update-password
Fix update password rehash
2018-04-17 07:25:52 -04:00
Hypolite Petovan
17a0cc4f3d Add Model\Term::populateTagsFromItem method 2018-04-16 22:22:58 -04:00
Hypolite Petovan
cc40dcf83c Add dbstructure_definition hook call 2018-04-16 22:22:58 -04:00
72a2896d1f profile data is transmitted to other nodes 2018-04-16 09:27:16 +02:00
6eba2ccd9b Forum posts now show the author when posted to Diaspora 2018-04-15 19:01:19 +00:00
Alexandre Alapetite
360e2e6342 Revert removal of legacy_password column
https://github.com/friendica/friendica/pull/4782#issuecomment-380978218
2018-04-15 11:12:32 +02:00
Alexandre Alapetite
991a3d959e Revert "Remove SQL column legacy_password"
This reverts commit 82f1f2f00e.
2018-04-15 10:51:22 +02:00
a53f01bacc Update the "photo" and "thumb" field in the "profile" table 2018-04-14 08:03:15 +00:00
ce7f451196 Don't show multiple calls from the "dba" class to show the essential parts of the callstack 2018-04-13 20:09:12 +00:00
Marcus Müller
f9c34fee5a
[BUGFIX] Network: Remove URL/domain DNS_PTR checks 2018-04-12 19:28:52 +02:00
4fd4d277f0 Store in lowercase to avoid duplicates 2018-04-12 08:55:36 +00:00
e83e31a968 Merge remote-tracking branch 'upstream/develop' into issue-4816 2018-04-12 08:53:56 +00:00
Hypolite Petovan
9d928417a1
Merge pull request #4817 from annando/relais-duplicates
Avoid sending relay posts to servers that already received content
2018-04-11 19:00:34 -04:00
88eaef6704 Merge branch 'issue-4816' of github.com:annando/friendica into issue-4816 2018-04-11 19:21:23 +00:00
edcf1466a7 Relay: Avoid sending relay posts to servers that already received content 2018-04-11 19:01:25 +00:00
75f97db4ec Issue-4816: Avoid SQL errors / Unarchive living relais servers 2018-04-11 18:56:22 +00:00
0cab448ba1 make it unreadable... almost 2018-04-11 14:12:53 +02:00
ef8e984c62 noreply should not be translate-able in email addresses 2018-04-11 08:17:44 +02:00
9d5abaca1c
Merge pull request #4807 from annando/archival-days
We can now define the days after a contact is archived
2018-04-10 14:34:18 +02:00
869d8ab12d We can now define the days after a contact is archived 2018-04-10 11:10:02 +00:00
eaff717696
Merge pull request #4806 from MrPetovan/task/improve-strikethrough-support
[BBCode] Improve support for strikethrough
2018-04-10 12:44:40 +02:00
Hypolite Petovan
369518e7b6 [BBCode] Improve support for strikethrough 2018-04-10 06:23:40 -04:00
ea9b4cc523 Ignore function "call_user_func_array" in the callstack 2018-04-10 05:55:36 +00:00
Hypolite Petovan
c7ad76f9ab Prevent empty $uid from messing up the PreloadConfigAdapter 2018-04-09 21:24:22 -04:00
08abf65f7b Old database functions had been replaced in the workers 2018-04-09 21:34:23 +00:00
105f3ca747 Relay: Avoid empty tags / Always use the "relay account" 2018-04-09 05:53:23 +00:00
5c2b54009e The magic link is added at more places 2018-04-08 19:17:50 +00:00
Alexandre Alapetite
e860cdf6a8 Swap if / elseif
https://github.com/friendica/friendica/pull/4782#discussion_r179947984
2018-04-08 16:02:25 +02:00
Alexandre Alapetite
82f1f2f00e Remove SQL column legacy_password 2018-04-08 14:53:12 +02:00
Alexandre Alapetite
cb26cd6d5d Remove legacy_password test 2018-04-08 14:42:18 +02:00
Alexandre Alapetite
129f6806f6 Fix update password rehash
Fixes https://github.com/friendica/friendica/issues/4743
The logic for updating password was wrong:
b0a764b14c (diff-1466bb1a0a37fe9f7cf52eda8f3b431aR150)
2018-04-08 12:40:35 +02:00
a75858f02c Don't queue relay posts 2018-04-08 09:46:47 +00:00
Pierre Rudloff
b3235c2d02 Implement parts of the list API:
lists/statuses
lists/destroy
lists/update
lists/create
lists/ownerships
2018-04-07 19:16:47 +02:00
d0dfe2aa64 Fix: Empty answers in DFRN can be okay 2018-04-07 10:02:43 +00:00
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
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
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
08c85c425b Added support of alt texts in images 2018-04-04 22:23:17 +00:00
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
3e6507441e Queue: Better handling of return values of transmissions 2018-04-04 19:03:05 +00:00
211ba75b22 Avoid "Failed to parse time string (-001-11-30T00:00:00+00:00 + 32 days)" 2018-04-04 18:58:25 +00:00
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
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
0af5e54ef1 added hint about naming the class and filename 2018-04-03 16:33:39 +02:00
4b7014d367 move the tos module to src/Module 2018-04-03 16:33:10 +02:00
e7fb8c04dd Don't always queue messages 2018-04-03 12:27:22 +00:00
1a2c771f24 DFRN: Improvements to delivery. Logging and marking as not reachable 2018-04-03 12:18:05 +00:00
d668b967c9 Misspelling 2018-04-02 22:06:31 +00:00
becc86a960 Changed logging text 2018-04-02 22:02:43 +00:00
8ff6a31512 Sending does now work 2018-04-02 21:59:30 +00:00
eeadd2f9d6 The Diaspora transport layer is now the default for DFRN 2018-04-02 21:46:10 +00:00
6cef0fbaeb added link to delete the account to the registration mail text 2018-04-02 18:40:52 +02:00
f89904ed77 Treatment, Treating, whatever :-) 2018-04-02 13:44:45 +00:00
0594f13c35 Receiving was tested, sending is implemented and tested as well, currently unused 2018-04-02 12:53:48 +00:00
f51a254ed0 Public contacts are not permitted for suggestions or mails 2018-04-01 05:07:35 +00:00
7dd64dd465 Merge remote-tracking branch 'upstream/develop' into dfrn-2 2018-04-01 04:49:28 +00:00
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
491db963db Changed comments 2018-03-30 19:57:14 +00:00
2eb4912dbf New functionality to set a password for a given user 2018-03-30 19:17:12 +00:00
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
bfd057f148 Direct transfer without a relay is now possible 2018-03-28 04:24:38 +00:00
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
bc03c8846c Fix sending messages to relay servers 2018-03-26 23:39:59 +00:00
b48df6a828 Avoid the warning of an unitialized variable in .htconfig.php 2018-03-26 20:58:34 +00:00
00c444a699 Only update when changed 2018-03-26 06:17:50 +00:00
6b84cb9715 Only add tags in the "tags" scope 2018-03-26 06:11:55 +00:00
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
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
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
ad3e4b894e Update the public contact 2018-03-25 08:20:13 +00:00
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
a0451e1c62 Merge remote-tracking branch 'upstream/develop' into update-self 2018-03-24 22:50:14 +00:00
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
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
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
324baa6b8b Removed test code 2018-03-24 18:48:40 +00:00
850d9b4c0b Line feeds fixed, not change in functionality 2018-03-24 18:39:13 +00:00
885d794958 Fix ACL data 2018-03-24 18:38:05 +00:00
07a1796e8f Fix: Groups can now be deleted again 2018-03-24 07:26:57 +00:00
bac60164e7 New function to keep the self contact updated 2018-03-24 06:15:18 +00:00
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
dccfc83a2d No display improvements for regular posts 2018-03-22 20:47:31 +00:00
318de2f590 Merge remote-tracking branch 'upstream/3.6-rc' into url-shorten-ostatus 2018-03-22 20:42:29 +00:00
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
73efdb99e3 Fix for incorrect datetime values 2018-03-21 05:20:55 +00:00
f4ba5d9799 Fix: Events on Diaspora now should look fine 2018-03-20 06:32:17 +00:00
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
d8824cc3bc Improved similarity to ostatus group feeds 2018-03-18 11:18:25 +00:00
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
9930c61263 Same same but different 2018-03-17 20:56:56 +00:00
c42c121e51 Fewer Defaults 2018-03-17 20:54:56 +00:00
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
cd2c9722b0 Added missing doxygen header 2018-03-17 09:42:29 +00:00
782d692b5a Possible fix issue 4611: Don't write to database before it is created 2018-03-17 09:04:38 +00:00
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
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
e1a72b8f5a Visible URL are shortened when transmitting to OStatus 2018-03-16 20:50:53 +00:00
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
67fa6aa809 We now change relationships not only for OStatus contacts 2018-03-16 06:58:54 +00:00
59dd353464 DFRN: The relationship between contacts can now be changed afterwards 2018-03-16 06:43:10 +00:00
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
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
2bedead6f4 Remove commented code 2018-03-14 22:31:52 +00:00
5bd519efff There is now a "content-warning" field 2018-03-14 22:28:35 +00:00
8c42e2e62e Avoid double encoding of the attachment content 2018-03-14 21:47:24 +00:00
d98c6819e7 $contact isn't called by reference anymore 2018-03-14 20:53:03 +00:00
7db0b850cb Avoid an error in OnePoll when the contact was "null". 2018-03-14 19:47:14 +00:00
6352aa112b Add the nsfw removal behind a config switch 2018-03-14 07:13:17 +00:00
858fd127a1 Fix: subscribing to the old followers hadn't worked 2018-03-14 00:27:15 +00:00
f49391a21c "nsfw" at "content warning" content doesn't fit together 2018-03-13 22:39:08 +00:00
3f6fefaa9a Pleroma with the Mastodon UI handles content warning different 2018-03-13 21:58:05 +00:00
32ee4ca4b1 OStatus: Fixed communication issues with deleted contacts 2018-03-13 06:21:44 +00:00
23718aeae3 OStatus: Only posts from followers will be imported (Issue 4369) 2018-03-12 10:45:40 +00:00
052ad155a2 Issue 4115: Events are now formatted better for Diaspora 2018-03-11 21:10:36 +00:00
b7a5e076fc Fix: The ownership of forum items had been wrong 2018-03-11 18:12:38 +00:00
cc4347d72f Issue 4497: Forum feeds had been empty 2018-03-11 14:01:40 +00:00
fbb38837b0 Shortener deactivated, due to Diaspora problems 2018-03-11 12:16:17 +00:00
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
Hypolite Petovan
9b14165cc8 Formatting changes to Protocol/Feed
- Change attribute name condition
- Singularize $attributes variable name
2018-03-10 18:35:24 -05:00
Michael Vogel
2009c06195
Merge pull request #4573 from MrPetovan/bug/fix-attach-display
Add support for Atom enclosure
2018-03-11 00:34:26 +01:00
Hypolite Petovan
a80d77f328 Add support for Atom enclosure 2018-03-10 12:40:21 -05:00
fa496d3e5f Issue 4556: Adding index hints to improve the notifications speed (hopefully) 2018-03-09 22:53:19 +00:00
7706616640 Bugfix: Reshare with added content to Diaspora looked ugly 2018-03-09 20:04:31 +00:00
3e51fa73b1 Additional checks 2018-03-09 05:38:15 +00:00
c9095386c8 Diaspora: Avoid warning "supplied key param cannot be coerced into a public key" 2018-03-09 05:31:13 +00:00
f23596421d Avoid SQL errors due to duplicate entries in the "participation" table 2018-03-08 21:04:11 +00:00
480fde7ca8 Bugfix: missing "use" 2018-03-08 20:48:00 +00:00
c438e47827 Bugfix: Avoid "Class not found" error 2018-03-08 19:58:35 +00:00
713bdb4bd9 Improved reshare behaviour for DFRN posts 2018-03-08 19:47:18 +00:00
Michael Vogel
b6b67c9044
Merge pull request #4540 from MrPetovan/task/4520-load-whole-config
[develop] Performance: Add preloading config adapter
2018-03-08 20:35:14 +01:00
Michael Vogel
26b6cbcb3b
Merge pull request #4560 from MrPetovan/task/3878-move-html2_-to-src
[develop] Move include/html2* to src/
2018-03-08 20:24:09 +01:00
Hypolite Petovan
49bd2903c7 Fix wrong SQL query syntax in Core\ACL 2018-03-08 04:42:07 -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
Hypolite Petovan
1df4bb6db8 Create Content\Text\HTML class
- Move BBCode::cleanCss to HTML::sanitizeCSS
2018-03-07 16:20:04 -05:00
Michael Vogel
e2fd882134
Merge pull request #4557 from MrPetovan/task/4518-add-memcached-support
[develop] Hotfix: Fix wrong session expire set for custom duration
2018-03-07 08:10:28 +01:00
Hypolite Petovan
ef0701a97a Fix wrong session expire set for custom duration 2018-03-06 21:34:00 -05:00
Hypolite Petovan
87f2d18554 Move *ConfigValue functions to App 2018-03-06 20:04:04 -05:00
Hypolite Petovan
047f949967 Remove irrelevant else case 2018-03-06 19:52:36 -05:00
Hypolite Petovan
dcd1f18611 Add refresh feature to Preload (P)Config adapters
- Add private methods to manipulat the App config variable
2018-03-06 19:52:36 -05:00
Hypolite Petovan
7afcd6d49e Update PConfig class with adapter 2018-03-06 19:52:36 -05:00
Hypolite Petovan
6fec043375 Update Config class with adapter 2018-03-06 19:52:36 -05:00
Hypolite Petovan
d760d33989 Add Config adapter interfaces/classes 2018-03-06 19:52:36 -05:00
Michael Vogel
cc688e2b4f
Merge pull request #4549 from MrPetovan/task/4518-add-memcached-support
[develop] Performance: Add memcached support/Improve database cache (redux)
2018-03-06 16:34:28 +01:00
Hypolite Petovan
059b1f63f8 Add support for multiple Memcached servers
- Updated htconfig documentation
2018-03-04 23:28:49 -05:00
Hypolite Petovan
95752b79e8 Add cache performance to API and worker 2018-03-04 23:13:19 -05:00
Hypolite Petovan
22fd2409ca Add cache to performance arrays 2018-03-04 23:13:19 -05:00
Hypolite Petovan
4954c4b9aa Add cache timing points 2018-03-04 23:13:19 -05:00
Hypolite Petovan
3df34d33d5 Fix DatabaseCacheDriver::get SQL select
- Fix typo
- Fix wrong usage of NOW()
2018-03-04 23:13:19 -05:00
Hypolite Petovan
3628b62aeb Add support for Memcached/Improve database cache
- Create Cache Driver interface
- Update cache table fields
- Add CacheSessionHandler
2018-03-04 23:13:19 -05: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
Hypolite Petovan
fe5ce67ef8 Move bb2diaspora() content to Content\Text\BBCode::toMarkdown
- Use self where appropriate
- Add BaseObject extension
2018-03-04 17:34:59 -05:00
cd79ce3a57 Fix: Multiple accounts per mail address are allowed when not explicit forbidden 2018-03-04 22:23:52 +00:00
Hypolite Petovan
a233ce1658 Create Markdown::toBBCode() method
- Create private callback Markdown::diasporaMention2BBCodeCallback
2018-03-04 08:31:05 -05:00
13df527d62 Bugfix: Don't cache when looking for maintenance mode 2018-03-04 13:01:46 +00:00
Hypolite Petovan
ab544e1e9f Add missing dba::close() call in Contact::pruneUnavailable 2018-03-03 07:41:49 -05:00
Hypolite Petovan
1907a5dbe7
Rename Acl.php to ACL.php 2018-03-03 07:40:18 -05:00
Hypolite Petovan
cd3ff100ab Rename Acl.php to ACL.php 2018-03-03 07:38:15 -05:00
Hypolite Petovan
35d09fdad1 Fix query mistake in Acl::getSuggestContactSelectHTML 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
ce9e0f3649 Move prune_deadguys to Contact 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
eeafb59c31 Add new class/functions
- Create class Core\Acl
- Add Contact::pruneUnavailable
- Add mod_content
2018-03-02 18:40:08 -05:00
b5f8d73833
Merge pull request #4527 from annando/fix-no-constant-update
Bugfix: No constant update in "getIdForUrl"
2018-03-02 10:58:17 +01:00
361af7bc78 Bugfix: No constant update in "getIdForUrl" 2018-03-02 03:55:24 +00:00
Hypolite Petovan
41678ec3cd Add no_update flag to speed up Contact::getIdForURL instances 2018-03-01 19:54:45 -05:00
Hypolite Petovan
9f21e7f34f Use default value for uid parameter in Contact::getIdForURL 2018-03-01 19:54:12 -05:00
0cc121cf44 Bugfix: Deleting comments via DFRN had only partly worked 2018-03-01 21:52:36 +00:00
2f121aa828 When deleting, don't send the parent via DFRN 2018-03-01 20:44:44 +00:00
Hypolite Petovan
4d3ea08c97 Use NOT EXISTS to improve performance 2018-02-28 08:50:26 -05:00
Hypolite Petovan
f58d8f4108 Add attendance check to event reminder 2018-02-27 20:47:18 -05:00
d4c95e0032 Contact updates should now work more reliable 2018-02-26 21:53:42 +00:00
Hypolite Petovan
2b9561a774
Merge pull request #4502 from annando/guid-from-mail
guid creation: Take the hostname from mail addresses for mail posts
2018-02-26 09:36:56 -05:00
9e721c0908 guid creation: Take the hostname from mail addresses for mail posts 2018-02-26 11:48:05 +00:00
fe68e99c7c The tag query should be much faster now 2018-02-26 06:59:32 +00:00
Hypolite Petovan
8a3927e12c
Merge pull request #4489 from annando/missing-fid
When refreshing the fcontact, the returned array was incomplete
2018-02-22 05:03:30 -05:00
a74b5fdde8 When refreshing the fcontact, the returned array was incomplete 2018-02-22 09:59:21 +00:00
2f2e7b9d5a fetch_first is now used / additional logging 2018-02-22 09:51:59 +00:00
046352606e Bugfix: $uid wasn't available in that context 2018-02-22 07:05:56 +00:00
2897333c28 Most queries are now done with the dba functions 2018-02-22 06:52:58 +00:00
8ad2ebbf47 $u is now $user 2018-02-21 23:10:29 +00:00
8e0496c040 Better naming of variables 2018-02-21 22:55:23 +00:00
5a91c746e9 $arr is now $item 2018-02-21 21:39:07 +00:00
82bd26edb9 The item class had been improved (e.g. database calls) 2018-02-21 21:08:37 +00:00
ae705261f1 Function is only used locally 2018-02-21 05:21:55 +00:00
a59796d1d4 No gcontact-id anymore (It wasn't really used) 2018-02-21 05:15:55 +00:00
Hypolite Petovan
eed35c3e69
Merge pull request #4484 from annando/item-guid
The guid creation for posts is now done in a separate function
2018-02-20 23:22:11 -05:00
475969a1d3 The guid creation for posts is now done in a separate function 2018-02-21 04:13:13 +00:00
3e46382459 Standard stuff 2018-02-20 11:20:28 +00:00
a3af6807ac Improved resource id creation 2018-02-20 10:02:07 +00:00
d90b93cfda Several more improvements to the database structure 2018-02-20 07:40:21 +00:00
6c26dcf1c7 The network is now just a 4 character field 2018-02-19 13:58:04 +00:00
0062fede79 Issue 1312: Improve account expiry 2018-02-18 22:19:20 +00:00
d0fa80b195 Issue 4228: Don't post an item if it belongs to a picture upload without an post 2018-02-18 17:29:14 +00:00
a9a85849f4 Issue 4369: Added logging to know why a post is stored 2018-02-18 16:43:18 +00:00
d119beef3f Issue 4396: Avoid SQL error during UImport 2018-02-17 10:37:14 +00:00
Hypolite Petovan
9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan
0c52866693 Refactor bbcode() into BBCode::convert() 2018-02-14 21:33:55 -05:00
Hypolite Petovan
29f5270313 Remove unused parameter preserve_nl in BBCode::convert 2018-02-14 21:31:28 -05:00
Hypolite Petovan
ee380c3149 Fix undeclared variable in Content\Text\BBCode 2018-02-14 20:25:23 -05:00
3e456ddcb8 Issue 4396: WSOD with uimport 2018-02-14 23:13:53 +00:00
Hypolite Petovan
bcd896c604
Merge pull request #4460 from annando/bugfix-dfrn-mail
DFRN: Bugfix for not storing mails
2018-02-14 17:11:47 -05:00
2f71a6f80f DFRN: Bugfix for not storing mails 2018-02-14 22:08:16 +00:00
Hypolite Petovan
41cd5af54f
Merge pull request #4459 from annando/unmark-contact
Bugfix and improvements for unmarking potentially archived contacts
2018-02-14 17:01:17 -05:00
Michael Vogel
79696a19e5
Merge pull request #4455 from MrPetovan/task/4176-fix-undeclared-variables-2
[Scrutinizer] Fix undeclared variables part 6: src/ (except Protocol/)
2018-02-14 22:49:43 +01:00
43b1eccbcd Bugfix and improvements for unmarking potentially archived contacts 2018-02-14 21:18:16 +00:00
Hypolite Petovan
cdc8a3b68d
Merge pull request #4457 from annando/accept-archived
Diaspora: Accept posts from archived contacts
2018-02-14 09:46:24 -05:00
878b2be63d Diaspora: Accept posts from archived contacts 2018-02-14 14:29:28 +00:00
Hypolite Petovan
d419d07f73 [Scrutinizer] Fix undeclared variables in src/ (except Protocol/)
- Use dba::selectFirst to remove intermediate variables `$r`
- Remove unused variable `$url_recipients` in Worker\Dellivery
2018-02-14 00:05:00 -05:00
Hypolite Petovan
d8e9ed5ff8 [Scrutinizer] Fix undeclared variables in src/Protocol/
- Use dba::selectFirst to remove intermediate variables `$r`
- Remove unused variable `$sender` in Protocol\Email
- Simplify Protocol\OStatus:fetchAuthor cascading queries
2018-02-13 23:58:46 -05:00
Hypolite Petovan
2234bb92ae
Merge pull request #4449 from annando/probe-pump
Improved profile probing for pump.io
2018-02-13 08:25:47 -05:00
6a486aa92b Remove address from name 2018-02-13 07:10:05 +00:00
4c91729bc9
Merge pull request #4447 from MrPetovan/bug/4445-improve-bbcode-quote-html
Add paragraph to BBCode conversion of [quote]
2018-02-13 07:09:22 +01:00
7df60ae634 Improved profile probing for pump.io 2018-02-13 05:54:09 +00:00
Hypolite Petovan
4bc1672921 Add paragraph to BBCode conversion of [quote] 2018-02-12 22:37:30 -05:00
Hypolite Petovan
219182d41e
Merge pull request #4446 from annando/worker-priority
Bugfix: The provided worker priority had been ignored
2018-02-12 22:29:53 -05:00
6289e307aa Bugfix: The provided worker priority had been ignored 2018-02-13 02:26:35 +00:00
rabuzarus
af3a57376a Item::tagDeliver(): remove contact as array key for hooks because it was never declared 2018-02-12 17:05:01 +01:00
rabuzarus
58b4169097 fix undeclared $uid variables in Item::insert() 2018-02-12 16:56:52 +01:00
rabuzarus
342b9af734 fix undeclared variables or wrong variable names (/src) 2018-02-12 16:08:28 +01:00
Michael Vogel
e90b3f606d
Merge pull request #4439 from MrPetovan/bug/4396-use-dba-exists-in-uimport
Add dba::exists usages to UserImport::importAccount
2018-02-12 06:02:30 +01:00