26791 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	986877b1cf	Restore previous state	2020-03-03 22:22:59 +00:00
Michael	e38640da76	The original content of the post hadn't always been stored	2020-03-03 21:58:03 +00:00
Michael	d63e903d9f	Changed template for direction	2020-03-03 21:29:51 +00:00
Michael	0e0de5fcad	Debug switch added, output added	2020-03-03 21:25:18 +00:00
Hypolite Petovan	86a6268aac	Add guid context to item deletion logging	2020-03-03 12:01:03 -05:00
Michael	e3d3dc50e5	Store the direction only when there is content to store	2020-03-03 08:04:14 +00:00
Michael	af6db65961	Store the push/pull direction in the conversation table	2020-03-03 08:01:04 +00:00
Michael	6f0d40c6c0	Merge remote-tracking branch 'upstream/develop' into push-pull	2020-03-03 06:55:13 +00:00
Hypolite Petovan	6ae5f705b6	Rename Item::delete* methods to Item::markForDeletion*	2020-03-03 01:48:29 -05:00
Hypolite Petovan	dd613cda45	Merge pull request #8357 from annando/private ... Support unlisted public posts	2020-03-03 01:19:07 -05:00
Michael	55f43be92a	Changed setting description	2020-03-03 04:03:37 +00:00
Michael	a19151fa6a	Improved description, support for "unlisted" via DFRN as well.	2020-03-02 22:35:25 +00:00
Michael	dc9ea15bb1	Updated field description	2020-03-02 20:48:26 +00:00
Michael	530ecb27cf	Updated database.sql	2020-03-02 20:31:16 +00:00
Michael	3a6d3cd439	Fixing tests	2020-03-02 17:20:18 +00:00
Philipp	8770a2089e	Merge pull request #8354 from MrPetovan/bug/7134-local-post-deleted ... Add debug for item deletion	2020-03-02 17:23:35 +01:00
Michael	72c198990e	Merge remote-tracking branch 'upstream/develop' into private	2020-03-02 15:05:00 +00:00
Michael	d3c6f6de2a	New query for community page	2020-03-02 14:59:16 +00:00
Michael	31f912b78e	Warning removed	2020-03-02 14:51:53 +00:00
Hypolite Petovan	e008811514	Merge pull request #8350 from nupplaphil/bug/8342_not_link ... Add Login form in case of notification links	2020-03-02 09:31:54 -05:00
Hypolite Petovan	25dceccf77	Add debug for item deletion	2020-03-02 09:30:34 -05:00
Michael	4bf04dd6ee	Fixed fatal error	2020-03-02 12:29:08 +00:00
Michael	ca1b92bb34	Support unlisted public posts	2020-03-02 07:57:23 +00:00
nupplaPhil	55a5e43715	Add UID as parameter for notify repository call	2020-03-01 22:24:53 +01:00
Philipp	27b60b200e	Merge pull request #8352 from MrPetovan/bug/8002-album-drop-cancel ... Use sensible URLs for return after album actions instead of $_SESSION['photo_return'] in mod/photos	2020-03-01 22:21:33 +01:00
Michael Vogel	057df09ffb	Merge pull request #8353 from MrPetovan/bug/8219-frio-fix-contact-csv-import ... [frio] Enable file upload in settings form	2020-03-01 21:08:19 +01:00
Michael Vogel	25cc745d70	Merge pull request #8356 from MrPetovan/bug/notices ... Add check for semi-colon existence in theme file comment lines	2020-03-01 20:51:02 +01:00
Michael Vogel	61ed2843b7	Merge pull request #8355 from MrPetovan/bug/warnings ... Remove last on/off data occurrences in additional features	2020-03-01 20:36:37 +01:00
Hypolite Petovan	39a87b1f54	Add check for semi-colon existence in theme file comment lines ... - Address https://github.com/friendica/friendica/issues/8000#issuecomment-592946450	2020-03-01 14:19:46 -05:00
Hypolite Petovan	ad2b9198a4	Remove last on/off data occurrences in additional features ... - Address https://github.com/friendica/friendica/issues/7999#issuecomment-589808923	2020-03-01 14:15:08 -05:00
Hypolite Petovan	a344809d3c	[frio] Enable file upload in settings form	2020-03-01 10:15:56 -05:00
Hypolite Petovan	7ef3308a8d	Improve feedback in mod/settings	2020-03-01 10:15:35 -05:00
Hypolite Petovan	f814ca30d3	Use sensible URLs for return after album actions instead of $_SESSION['photo_return'] in mod/photos	2020-03-01 09:56:02 -05:00
Hypolite Petovan	b6fa528b63	Remove duplicate photo album edit link	2020-03-01 09:55:31 -05:00
nupplaPhil	c11cfd5e48	Rename notice message.	2020-03-01 15:38:23 +01:00
nupplaPhil	c751352d60	Add Login form in case of notification links	2020-03-01 13:47:02 +01:00
Philipp	b1b6533512	Merge pull request #8346 from MrPetovan/bug/notices ... Do not cache Contact::getDetailsByURL result if it doesn't come from the DB	2020-02-29 17:58:57 +01:00
Hypolite Petovan	dd999164c6	Do not cache Contact::getDetailsByURL result if it doesn't come from the DB ... - Address https://github.com/friendica/friendica/issues/8000#issuecomment-592169621	2020-02-29 11:41:33 -05:00
Hypolite Petovan	5ca98c17b6	Merge pull request #8324 from nupplaphil/feat/8245-user_mgmt ... Introduce user management per console	2020-02-29 11:32:40 -05:00
nupplaPhil	811f075aa1	Rename method name	2020-02-29 17:10:34 +01:00
nupplaPhil	ed422be734	Improve start/count parameter	2020-02-29 17:10:33 +01:00
nupplaPhil	d950a3241b	Add basic search	2020-02-29 17:10:32 +01:00
nupplaPhil	3a317c5c0d	More list sub commands	2020-02-29 17:10:32 +01:00
nupplaPhil	2adc6a0974	Add list command	2020-02-29 17:10:31 +01:00
nupplaPhil	ecf7f40704	Admin page improvements	2020-02-29 17:10:31 +01:00
nupplaPhil	0fade7fc0a	Fix Admin page	2020-02-29 17:10:30 +01:00
nupplaPhil	4f2bea5cb1	Move "regmod" functionality into Admin Users page	2020-02-29 17:10:29 +01:00
nupplaPhil	bb47624bf2	Add "User::remove()" to console command	2020-02-29 17:10:29 +01:00
nupplaPhil	0c3f8b124b	Add "User::block()" to console command	2020-02-29 17:10:28 +01:00
nupplaPhil	b4f6e8fda1	Move "User::deny()" to own method and update usages	2020-02-29 17:10:28 +01:00