]> git.mxchange.org Git - friendica.git/log
friendica.git
8 years agoDFRN: Remote tagging works now
Michael Vogel [Sun, 20 Mar 2016 14:53:37 +0000 (15:53 +0100)]
DFRN: Remote tagging works now

8 years agoMerge pull request #2417 from annando/1603-sess_data
fabrixxm [Fri, 18 Mar 2016 17:46:28 +0000 (18:46 +0100)]
Merge pull request #2417 from annando/1603-sess_data

There is no table "sess_data" - this database call is useless

8 years agoThere is no table "sess_data" - this database call is useless
Michael Vogel [Fri, 18 Mar 2016 15:42:10 +0000 (16:42 +0100)]
There is no table "sess_data" - this database call is useless

8 years agoMerge pull request #2416 from tobiasd/20160317-issue2330
fabrixxm [Fri, 18 Mar 2016 07:29:30 +0000 (08:29 +0100)]
Merge pull request #2416 from tobiasd/20160317-issue2330

added title element to emoji images in main repository

8 years agoadded title element to emoji images in main repository
Tobias Diekershoff [Thu, 17 Mar 2016 16:41:06 +0000 (17:41 +0100)]
added title element to emoji images in main repository

8 years agoMerge pull request #2415 from annando/1603-dfrn-hash
Tobias Diekershoff [Wed, 16 Mar 2016 15:08:32 +0000 (16:08 +0100)]
Merge pull request #2415 from annando/1603-dfrn-hash

DFRN: Mentions were imported as hash tags

8 years agoDFRN: Mentions were imported as hash tags
Michael Vogel [Wed, 16 Mar 2016 10:44:45 +0000 (11:44 +0100)]
DFRN: Mentions were imported as hash tags

8 years agoMerge pull request #2414 from annando/1603-display-query
Tobias Diekershoff [Sun, 13 Mar 2016 12:18:53 +0000 (13:18 +0100)]
Merge pull request #2414 from annando/1603-display-query

The display contained bad sql queries

8 years agoThe display contained bad sql queries
Michael Vogel [Sun, 13 Mar 2016 12:04:12 +0000 (13:04 +0100)]
The display contained bad sql queries

8 years agoMerge pull request #2413 from tobiasd/20160312-socnetsettings
Michael Vogel [Sat, 12 Mar 2016 18:49:03 +0000 (19:49 +0100)]
Merge pull request #2413 from tobiasd/20160312-socnetsettings

missing include file for the SocNet settings

8 years agomissing include file for the SocNet settings
Tobias Diekershoff [Sat, 12 Mar 2016 15:25:17 +0000 (16:25 +0100)]
missing include file for the SocNet settings

8 years agoMerge pull request #2411 from tobiasd/20160312-dos
Michael Vogel [Sat, 12 Mar 2016 09:23:45 +0000 (10:23 +0100)]
Merge pull request #2411 from tobiasd/20160312-dos

Hotkey documentation

8 years agoMerge pull request #2412 from annando/1603-double-encode-ping
Tobias Diekershoff [Sat, 12 Mar 2016 08:43:41 +0000 (09:43 +0100)]
Merge pull request #2412 from annando/1603-double-encode-ping

The name in the notifications has to be double encoded

8 years agoThe name in the notifications has to be double encoded
Michael Vogel [Sat, 12 Mar 2016 08:21:13 +0000 (09:21 +0100)]
The name in the notifications has to be double encoded

8 years agoHotkey documentation
Tobias Diekershoff [Sat, 12 Mar 2016 07:57:07 +0000 (08:57 +0100)]
Hotkey documentation

8 years agoMerge pull request #2410 from tobiasd/20160312-messagespo
Michael Vogel [Sat, 12 Mar 2016 07:42:55 +0000 (08:42 +0100)]
Merge pull request #2410 from tobiasd/20160312-messagespo

regenerated messages.po file for picking up the workers

8 years agoregenerated messages.po file for picking up the workers
Tobias Diekershoff [Sat, 12 Mar 2016 06:36:44 +0000 (07:36 +0100)]
regenerated messages.po file for picking up the workers

8 years agoMerge pull request #2409 from annando/1503-worker-setting
Tobias Diekershoff [Sat, 12 Mar 2016 06:30:55 +0000 (07:30 +0100)]
Merge pull request #2409 from annando/1503-worker-setting

The worker settings are now available in the admin settings

8 years agoMerge pull request #2408 from annando/1603-goaway
Tobias Diekershoff [Sat, 12 Mar 2016 06:29:32 +0000 (07:29 +0100)]
Merge pull request #2408 from annando/1603-goaway

Another fix for "goaway". Hopefully now finale.

8 years agoMerge pull request #2407 from annando/1603-optimize-table
Tobias Diekershoff [Sat, 12 Mar 2016 06:28:44 +0000 (07:28 +0100)]
Merge pull request #2407 from annando/1603-optimize-table

The table optimisation level calculation is now also using the index size

8 years agoRemove the setting description from the documentation since it isn't a hidden one...
Michael Vogel [Fri, 11 Mar 2016 22:44:46 +0000 (23:44 +0100)]
Remove the setting description from the documentation since it isn't a hidden one anymore.

8 years agoThe worker settings are now available in the admin settings
Michael Vogel [Fri, 11 Mar 2016 22:28:11 +0000 (23:28 +0100)]
The worker settings are now available in the admin settings

8 years agoAnother fix for "goaway". Hopefully now finale.
Michael Vogel [Fri, 11 Mar 2016 19:43:31 +0000 (20:43 +0100)]
Another fix for "goaway". Hopefully now finale.

8 years agoThe table optimisation level calculation is now using the index size as well
Michael Vogel [Fri, 11 Mar 2016 19:32:22 +0000 (20:32 +0100)]
The table optimisation level calculation is now using the index size as well

8 years agoMerge pull request #2405 from annando/1603-ostatus4-bugfix
fabrixxm [Thu, 10 Mar 2016 05:08:30 +0000 (06:08 +0100)]
Merge pull request #2405 from annando/1603-ostatus4-bugfix

Bugfix: A parameter was missing for the OStatus author check

8 years agoBugfix: A parameter was missing for the OStatus author check
Michael Vogel [Wed, 9 Mar 2016 21:51:17 +0000 (22:51 +0100)]
Bugfix: A parameter was missing for the OStatus author check

8 years agoMerge pull request #2404 from annando/1603-no-lock
fabrixxm [Wed, 9 Mar 2016 21:08:41 +0000 (22:08 +0100)]
Merge pull request #2404 from annando/1603-no-lock

Don't create lock files if the process is called from the poller

8 years agoSome small addition to the OStatus part. Better check if we follow the actor.
Michael Vogel [Wed, 9 Mar 2016 20:53:30 +0000 (21:53 +0100)]
Some small addition to the OStatus part. Better check if we follow the actor.

8 years agoAdded documentation
Michael Vogel [Tue, 8 Mar 2016 21:42:37 +0000 (22:42 +0100)]
Added documentation

8 years agoChanged parameter order
Michael Vogel [Tue, 8 Mar 2016 21:28:49 +0000 (22:28 +0100)]
Changed parameter order

8 years agoThe function to check for maxload and the lockfile is centralized
Michael Vogel [Tue, 8 Mar 2016 19:28:09 +0000 (20:28 +0100)]
The function to check for maxload and the lockfile is centralized

8 years agoDon't create lock files if the process is called from the poller via the worker
Michael Vogel [Mon, 7 Mar 2016 23:20:06 +0000 (00:20 +0100)]
Don't create lock files if the process is called from the poller via the worker

8 years agoMerge pull request #2401 from annando/1603-ostatus-completion
Tobias Diekershoff [Sun, 6 Mar 2016 20:13:05 +0000 (21:13 +0100)]
Merge pull request #2401 from annando/1603-ostatus-completion

New way of fetching the conversation id for thread completion

8 years agoAdded documentation
Michael Vogel [Sun, 6 Mar 2016 20:06:52 +0000 (21:06 +0100)]
Added documentation

8 years agoMerge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion
Michael Vogel [Sun, 6 Mar 2016 19:37:51 +0000 (20:37 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion

8 years agoNew way of fetching the conversation id for thread completion
Michael Vogel [Sun, 6 Mar 2016 19:36:28 +0000 (20:36 +0100)]
New way of fetching the conversation id for thread completion

8 years agoMerge pull request #2328 from rabuzarus/0602_contact_profile
fabrixxm [Sun, 6 Mar 2016 18:56:59 +0000 (19:56 +0100)]
Merge pull request #2328 from rabuzarus/0602_contact_profile

polishing of the contact-edit page

8 years agoMerge pull request #2400 from annando/1603-ostatus-thread
Tobias Diekershoff [Sun, 6 Mar 2016 18:40:01 +0000 (19:40 +0100)]
Merge pull request #2400 from annando/1603-ostatus-thread

Only import OStatus threads that are started by our contacts

8 years agoThis should work better ...
Michael Vogel [Sun, 6 Mar 2016 18:27:34 +0000 (19:27 +0100)]
This should work better ...

8 years agoOr back ...
Michael Vogel [Sun, 6 Mar 2016 14:13:19 +0000 (15:13 +0100)]
Or back ...

8 years agoRelocated the check.
Michael Vogel [Sun, 6 Mar 2016 14:11:04 +0000 (15:11 +0100)]
Relocated the check.

8 years agoOnly import OStatus threads if we follow the thread starter
Michael Vogel [Sun, 6 Mar 2016 13:53:30 +0000 (14:53 +0100)]
Only import OStatus threads if we follow the thread starter

8 years agoMerge pull request #2399 from annando/1603-default-group
Tobias Diekershoff [Sun, 6 Mar 2016 13:42:27 +0000 (14:42 +0100)]
Merge pull request #2399 from annando/1603-default-group

Central function for default group, special setting for OStatus

8 years agoSettings for only importing threads from our ostatus contacts
Michael Vogel [Sun, 6 Mar 2016 13:09:04 +0000 (14:09 +0100)]
Settings for only importing threads from our ostatus contacts

8 years agoClarification of description
Michael Vogel [Sun, 6 Mar 2016 12:26:30 +0000 (13:26 +0100)]
Clarification of description

8 years agoCentral function for default group, special setting for OStatus
Michael Vogel [Sun, 6 Mar 2016 12:15:27 +0000 (13:15 +0100)]
Central function for default group, special setting for OStatus

8 years agoMerge pull request #2398 from annando/1603-fontawesome4
Tobias Diekershoff [Sun, 6 Mar 2016 00:49:46 +0000 (01:49 +0100)]
Merge pull request #2398 from annando/1603-fontawesome4

The Font Awesome library is now updated, the reply button is changed

8 years agoMerge pull request #2397 from Quix0r/fixes/poller-warning
Michael Vogel [Sat, 5 Mar 2016 12:35:43 +0000 (13:35 +0100)]
Merge pull request #2397 from Quix0r/fixes/poller-warning

No processing if error or empty array

8 years agoThe Font Awesome library is now updated, the replxy button is changed
Michael Vogel [Sat, 5 Mar 2016 12:29:01 +0000 (13:29 +0100)]
The Font Awesome library is now updated, the replxy button is changed

8 years agoNo processing if error or empty array
Roland Haeder [Fri, 4 Mar 2016 21:38:18 +0000 (22:38 +0100)]
No processing if error or empty array

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoMerge pull request #2392 from Quix0r/minor/logging
fabrixxm [Wed, 2 Mar 2016 11:21:18 +0000 (12:21 +0100)]
Merge pull request #2392 from Quix0r/minor/logging

Minor: Some more logging to trace down bugs

8 years agoMerge pull request #2394 from annando/1603-federation
Tobias Diekershoff [Wed, 2 Mar 2016 09:41:02 +0000 (10:41 +0100)]
Merge pull request #2394 from annando/1603-federation

Small bugfix: Fixes problen when version number contains linebreaks

8 years agoMerge pull request #2393 from annando/1603-api-speed
Tobias Diekershoff [Wed, 2 Mar 2016 09:40:23 +0000 (10:40 +0100)]
Merge pull request #2393 from annando/1603-api-speed

API: Some small speed improvement when calling the home timeline.

8 years agoAPI: Some small speed improvement when calling the home timeline.
Michael Vogel [Tue, 1 Mar 2016 18:17:01 +0000 (19:17 +0100)]
API: Some small speed improvement when calling the home timeline.

8 years agoSmall bugfix: Fixes problen when version number contains linebreaks
Michael Vogel [Tue, 1 Mar 2016 18:14:45 +0000 (19:14 +0100)]
Small bugfix: Fixes problen when version number contains linebreaks

8 years agoClosed TODO: no .= needed here. #2392
Roland Haeder [Tue, 1 Mar 2016 17:28:06 +0000 (18:28 +0100)]
Closed TODO: no .= needed here. #2392

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoMerge pull request #2388 from Quix0r/fixes/prevent-e_notice_boot_php
fabrixxm [Tue, 1 Mar 2016 14:50:20 +0000 (15:50 +0100)]
Merge pull request #2388 from Quix0r/fixes/prevent-e_notice_boot_php

Prevent some E_NOTICE

8 years agoMerge pull request #2391 from Quix0r/fixes/http-security
fabrixxm [Tue, 1 Mar 2016 14:33:31 +0000 (15:33 +0100)]
Merge pull request #2391 from Quix0r/fixes/http-security

Missing exit() after header('Location: bla') is bad news

8 years agoMerge pull request #2389 from Quix0r/rewrites/theme_info_array_init
fabrixxm [Tue, 1 Mar 2016 14:32:34 +0000 (15:32 +0100)]
Merge pull request #2389 from Quix0r/rewrites/theme_info_array_init

$a->theme_info = array() should be avoided

8 years agoMerge pull request #2387 from Quix0r/fixes/html-errors
fabrixxm [Tue, 1 Mar 2016 14:31:28 +0000 (15:31 +0100)]
Merge pull request #2387 from Quix0r/fixes/html-errors

Some tags should not be self-closed

8 years ago<form> and <html> or <head> are not self-closing tags.
Roland Haeder [Tue, 1 Mar 2016 13:49:56 +0000 (14:49 +0100)]
<form> and <html> or <head> are not self-closing tags.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoDon't miss to add exit() after header('Location: bla') as header() does *NOT*
Roland Haeder [Tue, 1 Mar 2016 13:49:07 +0000 (14:49 +0100)]
Don't miss to add exit() after header('Location: bla') as header() does *NOT*
exit the script quickly enough. Always use an explicit exit() or you get real
trouble.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoMore logging in case of errors + logged network type + added TODO (for ugly E_NOTICE).
Roland Haeder [Tue, 1 Mar 2016 13:42:55 +0000 (14:42 +0100)]
More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE).

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoPrevent some E_NOTICE in identity.php
Roland Haeder [Tue, 1 Mar 2016 13:36:23 +0000 (14:36 +0100)]
Prevent some E_NOTICE in identity.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoPrevent some E_NOTICE in boot.php
Roland Haeder [Tue, 1 Mar 2016 13:32:19 +0000 (14:32 +0100)]
Prevent some E_NOTICE in boot.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoNo need to set $a->theme_info = array() everywhere if you can define it in App
Roland Haeder [Tue, 1 Mar 2016 13:27:38 +0000 (14:27 +0100)]
No need to set $a->theme_info = array() everywhere if you can define it in App
itself.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoMerge pull request #2386 from tobiasd/20160229-fedcolor
Michael Vogel [Mon, 29 Feb 2016 18:03:31 +0000 (19:03 +0100)]
Merge pull request #2386 from tobiasd/20160229-fedcolor

adding some colors to the Federation Statistics page of the admin panel

8 years agoadding some colors to the Federation Statistics page of the admin panel
Tobias Diekershoff [Mon, 29 Feb 2016 16:24:34 +0000 (17:24 +0100)]
adding some colors to the Federation Statistics page of the admin panel

8 years agoMerge pull request #2383 from tobiasd/20160225
Michael Vogel [Mon, 29 Feb 2016 10:11:54 +0000 (11:11 +0100)]
Merge pull request #2383 from tobiasd/20160225

a missing break

8 years agoMerge pull request #2384 from tobiasd/20160228-api
fabrixxm [Mon, 29 Feb 2016 07:54:36 +0000 (08:54 +0100)]
Merge pull request #2384 from tobiasd/20160228-api

old location might vanish, vinzv moved the GS API docs over here

8 years agoold location might vanish, vinzv moved the GS API docs over here
Tobias Diekershoff [Sun, 28 Feb 2016 07:30:45 +0000 (08:30 +0100)]
old location might vanish, vinzv moved the GS API docs over here

8 years agoa missing break
Tobias Diekershoff [Thu, 25 Feb 2016 20:37:37 +0000 (21:37 +0100)]
a missing break

8 years agoMerge pull request #2379 from annando/1602-abstract-doc
Tobias Diekershoff [Thu, 25 Feb 2016 12:15:12 +0000 (13:15 +0100)]
Merge pull request #2379 from annando/1602-abstract-doc

Some documentation for the usage of the "abstract" element.

8 years agoMerge pull request #2382 from tobiasd/20160204-doc
fabrixxm [Thu, 25 Feb 2016 07:46:25 +0000 (08:46 +0100)]
Merge pull request #2382 from tobiasd/20160204-doc

small stuff for the docs

8 years agoClient section in DeveloperIntro docs
Tobias Diekershoff [Wed, 24 Feb 2016 19:46:06 +0000 (20:46 +0100)]
Client section in DeveloperIntro docs

8 years agoWelcome to the live editing and commenting of the pull request ;-)
Michael Vogel [Wed, 24 Feb 2016 06:43:13 +0000 (07:43 +0100)]
Welcome to the live editing and commenting of the pull request ;-)

8 years agoClarification between statusnet and GNU Social.
Michael Vogel [Wed, 24 Feb 2016 06:37:18 +0000 (07:37 +0100)]
Clarification between statusnet and GNU Social.

8 years agoOne line, one sentence
Michael Vogel [Wed, 24 Feb 2016 06:33:20 +0000 (07:33 +0100)]
One line, one sentence

8 years agoMerge pull request #2380 from annando/issue-2373
Tobias Diekershoff [Wed, 24 Feb 2016 06:28:40 +0000 (07:28 +0100)]
Merge pull request #2380 from annando/issue-2373

Bugfix: Resharing on the display page works again.

8 years agoCorrected explanation
Michael Vogel [Wed, 24 Feb 2016 06:22:32 +0000 (07:22 +0100)]
Corrected explanation

8 years agoBugfix: Resharing on the display page works again.
Michael Vogel [Wed, 24 Feb 2016 06:20:23 +0000 (07:20 +0100)]
Bugfix: Resharing on the display page works again.

8 years agoclarification to the docs
Tobias Diekershoff [Fri, 5 Feb 2016 05:47:17 +0000 (06:47 +0100)]
clarification to the docs

8 years agoSome documentation for the usage of the "abstract" element.
Michael Vogel [Tue, 23 Feb 2016 21:45:06 +0000 (22:45 +0100)]
Some documentation for the usage of the "abstract" element.

8 years agocontactedit-actions-button: use internal links instead of full links
rabuzarus [Tue, 23 Feb 2016 18:26:03 +0000 (19:26 +0100)]
contactedit-actions-button: use internal links instead of full links

8 years agocontactedit-actions-button: move repair back to tabbar
rabuzarus [Tue, 23 Feb 2016 18:19:45 +0000 (19:19 +0100)]
contactedit-actions-button: move repair back to tabbar

8 years agoMerge pull request #2370 from annando/1602-mixed-content
fabrixxm [Tue, 23 Feb 2016 07:45:19 +0000 (08:45 +0100)]
Merge pull request #2370 from annando/1602-mixed-content

Initial work to prevent mixed content, allow hidden tor services ...

8 years agoMerge remote-tracking branch 'upstream/develop' into 1602-mixed-content
Michael Vogel [Tue, 23 Feb 2016 07:03:30 +0000 (08:03 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content

8 years agoMerge pull request #2377 from annando/1602-abstract
Tobias Diekershoff [Tue, 23 Feb 2016 07:01:13 +0000 (08:01 +0100)]
Merge pull request #2377 from annando/1602-abstract

New BBCode element "abstract" for network depending messages.

8 years agoAdded documentation
Michael Vogel [Tue, 23 Feb 2016 06:56:49 +0000 (07:56 +0100)]
Added documentation

8 years agoThe "abstract" has moved after the "nobb" part in bbcode.
Michael Vogel [Tue, 23 Feb 2016 06:21:40 +0000 (07:21 +0100)]
The "abstract" has moved after the "nobb" part in bbcode.

8 years agoNew BBCode element "abstract" for network depending messages.
Michael Vogel [Mon, 22 Feb 2016 22:20:59 +0000 (23:20 +0100)]
New BBCode element "abstract" for network depending messages.

8 years agoMerge remote-tracking branch 'upstream/develop' into 1602-mixed-content
Michael Vogel [Fri, 19 Feb 2016 10:55:57 +0000 (11:55 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content

8 years agoMerge pull request #2372 from annando/issue-2367
fabrixxm [Fri, 19 Feb 2016 07:30:54 +0000 (08:30 +0100)]
Merge pull request #2372 from annando/issue-2367

Issue 2367: The data for the gserver table is now sanitized.

8 years agoIssue 2367: The data for the gserver table is now sanitized.
Michael Vogel [Fri, 19 Feb 2016 06:30:28 +0000 (07:30 +0100)]
Issue 2367: The data for the gserver table is now sanitized.

8 years agoMerge remote-tracking branch 'upstream/develop' into 1602-mixed-content
Michael Vogel [Thu, 18 Feb 2016 07:15:58 +0000 (08:15 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content

8 years agoMerge pull request #2366 from annando/1602-array_merge
Tobias Diekershoff [Thu, 18 Feb 2016 06:50:43 +0000 (07:50 +0100)]
Merge pull request #2366 from annando/1602-array_merge

Avoid "array_merge" warning.

8 years agoAvoid "array_merge" warning.
Michael Vogel [Thu, 18 Feb 2016 06:41:08 +0000 (07:41 +0100)]
Avoid "array_merge" warning.

8 years agoMerge pull request #2354 from fabrixxm/issues/api-errors
Michael Vogel [Thu, 18 Feb 2016 06:26:33 +0000 (07:26 +0100)]
Merge pull request #2354 from fabrixxm/issues/api-errors

api: throw HTTPException instead of calling api_error directly

8 years ago"get_baseurl" and "z_root" are disappearing ...
Michael Vogel [Wed, 17 Feb 2016 22:47:32 +0000 (23:47 +0100)]
"get_baseurl" and "z_root" are disappearing ...

8 years agoMerge pull request #2365 from tobiasd/20160217-it
fabrixxm [Wed, 17 Feb 2016 14:18:15 +0000 (15:18 +0100)]
Merge pull request #2365 from tobiasd/20160217-it

IT update to the strings