]> git.mxchange.org Git - friendica.git/log
friendica.git
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 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 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

8 years agoIT update to the strings
Tobias Diekershoff [Wed, 17 Feb 2016 14:13:45 +0000 (15:13 +0100)]
IT update to the strings

8 years agoMerge remote-tracking branch 'upstream/develop' into 1602-mixed-content
Michael Vogel [Wed, 17 Feb 2016 11:18:46 +0000 (12:18 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content

8 years agoSome more ...
Michael Vogel [Wed, 17 Feb 2016 11:18:36 +0000 (12:18 +0100)]
Some more ...

8 years agoMerge pull request #2363 from tobiasd/2016ß217-credits
fabrixxm [Wed, 17 Feb 2016 08:01:29 +0000 (09:01 +0100)]
Merge pull request #2363 from tobiasd/2016ß217-credits

make_credits.py: handle exception with non-existing addon directory

8 years agoJust some more removed baseurls ...
Michael Vogel [Wed, 17 Feb 2016 07:08:28 +0000 (08:08 +0100)]
Just some more removed baseurls ...

8 years agohandle exception with non-existing addon directory
Tobias Diekershoff [Wed, 17 Feb 2016 07:00:38 +0000 (08:00 +0100)]
handle exception with non-existing addon directory

8 years agoMerge pull request #2355 from annando/1602-remove-simplepie
Tobias Diekershoff [Wed, 17 Feb 2016 06:24:34 +0000 (07:24 +0100)]
Merge pull request #2355 from annando/1602-remove-simplepie

Simplepie is removed since we don't use it anymore

8 years agoMerge pull request #2362 from soko1/translate
Tobias Diekershoff [Wed, 17 Feb 2016 06:21:33 +0000 (07:21 +0100)]
Merge pull request #2362 from soko1/translate

Complemented and improved russian translation

8 years agoRemove the baseurl where possible to avoid mixed content
Michael Vogel [Tue, 16 Feb 2016 23:01:24 +0000 (00:01 +0100)]
Remove the baseurl where possible to avoid mixed content

8 years agoComplemented and improved russian translation
Sakałoŭ Alaksiej [Tue, 16 Feb 2016 17:57:15 +0000 (20:57 +0300)]
Complemented and improved russian translation

8 years agoAdded documentation.
Michael Vogel [Tue, 16 Feb 2016 07:06:55 +0000 (08:06 +0100)]
Added documentation.

8 years agoMerge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie
Michael Vogel [Tue, 16 Feb 2016 06:58:01 +0000 (07:58 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie

8 years agoMerge pull request #2356 from annando/1602-redmatrix-name
Tobias Diekershoff [Mon, 15 Feb 2016 06:38:16 +0000 (07:38 +0100)]
Merge pull request #2356 from annando/1602-redmatrix-name

We now show the correct platform (redmatrix or hubzilla)

8 years agoMerge pull request #2349 from annando/1602-gcontact-cleanup
Tobias Diekershoff [Mon, 15 Feb 2016 06:37:11 +0000 (07:37 +0100)]
Merge pull request #2349 from annando/1602-gcontact-cleanup

Updating of gcontact data has improved

8 years agoMerge remote-tracking branch 'upstream/develop' into 1602-redmatrix-name
Michael Vogel [Sun, 14 Feb 2016 20:03:57 +0000 (21:03 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1602-redmatrix-name

8 years agoMerge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie
Michael Vogel [Sun, 14 Feb 2016 19:57:57 +0000 (20:57 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie

8 years agoSimplepie is removed since we don't use it anymore
Michael Vogel [Sun, 14 Feb 2016 18:50:59 +0000 (19:50 +0100)]
Simplepie is removed since we don't use it anymore

8 years agoFallback when there is no nick name
Michael Vogel [Sun, 14 Feb 2016 14:08:49 +0000 (15:08 +0100)]
Fallback when there is no nick name

8 years agoWe now show the correct platform (redmatrix or hubzilla)
Michael Vogel [Sun, 14 Feb 2016 14:05:43 +0000 (15:05 +0100)]
We now show the correct platform (redmatrix or hubzilla)

8 years agoThe feed function has now a simulation mode
Michael Vogel [Sun, 14 Feb 2016 14:02:59 +0000 (15:02 +0100)]
The feed function has now a simulation mode

8 years agoSmall bugfix for the keyword bug in the gcontact table
Michael Vogel [Sun, 14 Feb 2016 11:39:57 +0000 (12:39 +0100)]
Small bugfix for the keyword bug in the gcontact table

8 years ago"addr" and "server_url" are now generated directly in "update_gcontact" if not given.
Michael Vogel [Sun, 14 Feb 2016 10:56:23 +0000 (11:56 +0100)]
"addr" and "server_url" are now generated directly in "update_gcontact" if not given.

8 years agoapi: throw HTTPException instead of calling api_error directly
fabrixxm [Sun, 14 Feb 2016 10:24:51 +0000 (11:24 +0100)]
api: throw HTTPException instead of calling api_error directly

there was some places where api_error() was called instead of throwing
correct subclass of HTTPException. This was causing php errors.

Dogygen comment of api_error() is updated as well

8 years agoThe shadow contact (contact with uid=0) will be updated now as well.
Michael Vogel [Sun, 14 Feb 2016 06:31:57 +0000 (07:31 +0100)]
The shadow contact (contact with uid=0) will be updated now as well.

8 years agoDFRN Bugfix: The poco data wasn't sent
Michael Vogel [Sat, 13 Feb 2016 23:14:03 +0000 (00:14 +0100)]
DFRN Bugfix: The poco data wasn't sent

8 years agoAvoid errors when noscrape data can't be fetched.
Michael Vogel [Sat, 13 Feb 2016 21:20:00 +0000 (22:20 +0100)]
Avoid errors when noscrape data can't be fetched.

8 years agoOStatus: The gcontact table will now be updated from the conversation as well
Michael Vogel [Sat, 13 Feb 2016 20:35:05 +0000 (21:35 +0100)]
OStatus: The gcontact table will now be updated from the conversation as well

8 years agoMerge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup
Michael Vogel [Sat, 13 Feb 2016 19:12:31 +0000 (20:12 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup

8 years agoMerge pull request #2351 from annando/1602-performance-unread-group
Tobias Diekershoff [Sat, 13 Feb 2016 18:43:33 +0000 (19:43 +0100)]
Merge pull request #2351 from annando/1602-performance-unread-group

Optimized query for unread group postings

8 years agoMerge pull request #2350 from annando/1602-vier-aside-img
Tobias Diekershoff [Sat, 13 Feb 2016 18:42:35 +0000 (19:42 +0100)]
Merge pull request #2350 from annando/1602-vier-aside-img

Vier: Pictures in the side bar shouldn't be larger than the side bar

8 years agoOptimized query for unread group postings
Michael Vogel [Sat, 13 Feb 2016 17:15:24 +0000 (18:15 +0100)]
Optimized query for unread group postings

8 years agoVier: Pictures in the side bar shouldn't be larger than the side bar
Michael Vogel [Sat, 13 Feb 2016 13:21:53 +0000 (14:21 +0100)]
Vier: Pictures in the side bar shouldn't be larger than the side bar

8 years agoUpdate the gcontact entry when the contact entry is checked for updates
Michael Vogel [Sat, 13 Feb 2016 13:09:08 +0000 (14:09 +0100)]
Update the gcontact entry when the contact entry is checked for updates

8 years agoAdded a to-do
Michael Vogel [Sat, 13 Feb 2016 12:30:53 +0000 (13:30 +0100)]
Added a to-do

8 years agoMerge pull request #2334 from fabrixxm/feature_autoloader
Tobias Diekershoff [Sat, 13 Feb 2016 11:27:24 +0000 (12:27 +0100)]
Merge pull request #2334 from fabrixxm/feature_autoloader

Autoloader

8 years agoImprovements how gcontact entries are updated
Michael Vogel [Sat, 13 Feb 2016 11:26:58 +0000 (12:26 +0100)]
Improvements how gcontact entries are updated

8 years agodoc: add quick intro to autoloading
fabrixxm [Sat, 13 Feb 2016 09:57:37 +0000 (10:57 +0100)]
doc: add quick intro to autoloading

8 years agoMerge pull request #2348 from annando/1602-poller-again
Tobias Diekershoff [Fri, 12 Feb 2016 10:25:49 +0000 (11:25 +0100)]
Merge pull request #2348 from annando/1602-poller-again

Database connections: When we now check for user values and system values

8 years agoDatabase connections: When we now check for user values we check the system values...
Michael Vogel [Fri, 12 Feb 2016 10:04:25 +0000 (11:04 +0100)]
Database connections: When we now check for user values we check the system values as well

8 years agodocs: small fixes to help sidebar
Fabrixxm [Fri, 12 Feb 2016 08:26:42 +0000 (09:26 +0100)]
docs: small fixes to help sidebar

8 years agodocs: add brief autoloading help page, fix smarty3 help page name
Fabrixxm [Fri, 12 Feb 2016 08:25:33 +0000 (09:25 +0100)]
docs: add brief autoloading help page, fix smarty3 help page name

8 years agoMerge pull request #2346 from annando/1602-poller-user-limits
Tobias Diekershoff [Fri, 12 Feb 2016 07:17:30 +0000 (08:17 +0100)]
Merge pull request #2346 from annando/1602-poller-user-limits

Poller: Now the user limits can be detected automatically as well

8 years agoMerge pull request #2347 from annando/1602-dfrn-forum
Tobias Diekershoff [Fri, 12 Feb 2016 07:16:10 +0000 (08:16 +0100)]
Merge pull request #2347 from annando/1602-dfrn-forum

DFRN-Bugfix: Forums should work now

8 years agoAdded some documentation
Michael Vogel [Fri, 12 Feb 2016 06:39:08 +0000 (07:39 +0100)]
Added some documentation

8 years agoDFRN-Bugfix: Forums should work now
Michael Vogel [Thu, 11 Feb 2016 21:35:06 +0000 (22:35 +0100)]
DFRN-Bugfix: Forums should work now

8 years agoPoller: Now the user limits can be detected automatically as well
Michael Vogel [Thu, 11 Feb 2016 20:39:34 +0000 (21:39 +0100)]
Poller: Now the user limits can be detected automatically as well

8 years agoMerge pull request #2344 from annando/1602-poller-processlist
Tobias Diekershoff [Thu, 11 Feb 2016 10:51:02 +0000 (11:51 +0100)]
Merge pull request #2344 from annando/1602-poller-processlist

Poller: Use the processlist

8 years agoPoller: Use the processlist when the number of maximum database connections was provi...
Michael Vogel [Thu, 11 Feb 2016 10:33:45 +0000 (11:33 +0100)]
Poller: Use the processlist when the number of maximum database connections was provided manually

8 years agoMerge pull request #2343 from fabrixxm/api_ping
Tobias Diekershoff [Thu, 11 Feb 2016 08:34:47 +0000 (09:34 +0100)]
Merge pull request #2343 from fabrixxm/api_ping

fix missing html2plain() function declaration

8 years agofix missing html2plain() function declaration
fabrixxm [Thu, 11 Feb 2016 08:05:00 +0000 (09:05 +0100)]
fix missing html2plain() function declaration

8 years agoMerge pull request #2336 from stieben/move-div-pause
Tobias Diekershoff [Thu, 11 Feb 2016 06:36:37 +0000 (07:36 +0100)]
Merge pull request #2336 from stieben/move-div-pause

Move div#pause to view/default.php

8 years agoMerge pull request #2341 from annando/1602-contact-bugfix
Tobias Diekershoff [Thu, 11 Feb 2016 06:35:32 +0000 (07:35 +0100)]
Merge pull request #2341 from annando/1602-contact-bugfix

Bugfix: The "keywords" field in the gcontact table wasn't set correctly

8 years agoMerge pull request #2325 from fabrixxm/api_ping
Michael Vogel [Wed, 10 Feb 2016 22:47:11 +0000 (23:47 +0100)]
Merge pull request #2325 from fabrixxm/api_ping

Api for notifications

8 years agoBugfix: The "keywords" field in the gcontact table wasn't set correctly
Michael Vogel [Wed, 10 Feb 2016 22:39:18 +0000 (23:39 +0100)]
Bugfix: The "keywords" field in the gcontact table wasn't set correctly

8 years agoMerge pull request #2338 from annando/1602-poller-max
Tobias Diekershoff [Wed, 10 Feb 2016 11:49:49 +0000 (12:49 +0100)]
Merge pull request #2338 from annando/1602-poller-max

Poller: The maximum number of connections can now be configured

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

8 years agoPoller: The maximum number of connections can now be configured
Michael Vogel [Tue, 9 Feb 2016 22:28:33 +0000 (23:28 +0100)]
Poller: The maximum number of connections can now be configured

8 years agoAdded div#pause to themes' default.php
Andrej Stieben [Tue, 9 Feb 2016 15:41:19 +0000 (16:41 +0100)]
Added div#pause to themes' default.php

As requested by @tobiasd and @rabuzarus.

8 years agoMoved div#pause from index.php to view/default.php
Andrej Stieben [Tue, 9 Feb 2016 14:54:35 +0000 (15:54 +0100)]
Moved div#pause from index.php to view/default.php

This closes #2320.

8 years agoMerge branch 'develop' into api_ping
Fabrixxm [Tue, 9 Feb 2016 13:06:57 +0000 (14:06 +0100)]
Merge branch 'develop' into api_ping

8 years agoMerge pull request #2332 from annando/1602-no-guid
fabrixxm [Tue, 9 Feb 2016 12:40:05 +0000 (13:40 +0100)]
Merge pull request #2332 from annando/1602-no-guid

Get rid of the "guid" table. We don't need it anymore.

8 years agoadd some doxygen comments
Fabrixxm [Tue, 9 Feb 2016 10:10:00 +0000 (11:10 +0100)]
add some doxygen comments

8 years agolet autoloader include files for HTMLPurifier
Fabrixxm [Tue, 9 Feb 2016 10:08:26 +0000 (11:08 +0100)]
let autoloader include files for HTMLPurifier

8 years agoadd composer-derived autoloader
Fabrixxm [Tue, 9 Feb 2016 10:07:37 +0000 (11:07 +0100)]
add composer-derived autoloader

8 years agoUpdate HTMLPurifier to v4.7.0
Fabrixxm [Tue, 9 Feb 2016 10:06:17 +0000 (11:06 +0100)]
Update HTMLPurifier to v4.7.0

8 years agoMerge pull request #2331 from fabrixxm/revert_pr2319
Michael Vogel [Tue, 9 Feb 2016 09:52:46 +0000 (10:52 +0100)]
Merge pull request #2331 from fabrixxm/revert_pr2319

Revert "Merge pull request #2319 from stieben/develop"

8 years agoGet rid of the "guid" table. We don't need it anymore.
Michael Vogel [Tue, 9 Feb 2016 09:21:10 +0000 (10:21 +0100)]
Get rid of the "guid" table. We don't need it anymore.