]>
git.mxchange.org Git - friendica.git/log
Thomas Willingham [Mon, 19 Dec 2016 00:10:11 +0000 (00:10 +0000)]
This error message had me confused for about twenty minutes. I couldn't
figure out what was wrong with my imagick install that would make it give
me an orange button if it was installed. Of course, the problem was that
it wasn't installed, and the message was worded badly. This is a bit less
confusing.
Tobias Diekershoff [Sun, 18 Dec 2016 21:27:02 +0000 (22:27 +0100)]
Merge pull request #3022 from annando/1612-ostatus-follow2
Ostatus: The follow/unfollow XML should now be even more compliant.
Michael [Sun, 18 Dec 2016 20:34:34 +0000 (20:34 +0000)]
Mastodon: Hopefully we can now detect reshares better
Michael [Sun, 18 Dec 2016 20:02:13 +0000 (20:02 +0000)]
Ostatus: The follow/unfollow XML should now be even more compliant.
Tobias Diekershoff [Sun, 18 Dec 2016 18:11:34 +0000 (19:11 +0100)]
Merge pull request #3021 from annando/1612-ostatus-follow
OStatus: Follow/Unfollow should now work again.
Michael [Sun, 18 Dec 2016 17:36:48 +0000 (17:36 +0000)]
Removal of test code
Michael [Sun, 18 Dec 2016 17:10:38 +0000 (17:10 +0000)]
OStatus: Follow/Unfollow should now work again.
Tobias Diekershoff [Thu, 15 Dec 2016 17:44:44 +0000 (18:44 +0100)]
Merge pull request #3014 from annando/1612-missing-self-contact
Create missing self contact
Michael [Thu, 15 Dec 2016 07:15:33 +0000 (07:15 +0000)]
Create missing self contact
Tobias Diekershoff [Mon, 12 Dec 2016 06:54:59 +0000 (07:54 +0100)]
Merge pull request #3009 from annando/issue-2999
Issue 2999: Better Mastodon handling
Michael [Mon, 12 Dec 2016 06:51:08 +0000 (06:51 +0000)]
Restore empty line
Michael [Mon, 12 Dec 2016 06:46:02 +0000 (06:46 +0000)]
Issue 2999: Better Mastodon handling
Tobias Diekershoff [Mon, 12 Dec 2016 06:04:16 +0000 (07:04 +0100)]
Merge pull request #3007 from annando/1607-performance
Some more performance stuff
rabuzarus [Sun, 11 Dec 2016 19:01:09 +0000 (20:01 +0100)]
Merge pull request #3008 from annando/1612-probe-logging
Issue 2835: Some logging to detect possible problems with the probing
Michael [Sun, 11 Dec 2016 18:39:39 +0000 (18:39 +0000)]
Some logging to detect possible problems with the probing
Michael [Sun, 11 Dec 2016 17:37:12 +0000 (17:37 +0000)]
String is no integer
Michael [Sun, 11 Dec 2016 07:09:48 +0000 (07:09 +0000)]
Avoid SQL errors
Michael Vogel [Sat, 10 Dec 2016 23:22:20 +0000 (00:22 +0100)]
Merge pull request #3006 from rabuzarus/20161210_-_frio_submit_fix
frio: delete unneeded button attributes in search forms
rabuzarus [Sat, 10 Dec 2016 20:25:40 +0000 (21:25 +0100)]
frio: delete unneeded button attributes in search forms
Michael [Sat, 10 Dec 2016 12:28:49 +0000 (12:28 +0000)]
Code bautification
Michael [Sat, 10 Dec 2016 12:21:16 +0000 (12:21 +0000)]
Some more ...
Michael [Sat, 10 Dec 2016 12:19:57 +0000 (12:19 +0000)]
Redo the index changes for testing purposes
Michael [Sat, 10 Dec 2016 12:18:11 +0000 (12:18 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1607-performance
Michael Vogel [Sat, 10 Dec 2016 07:02:19 +0000 (08:02 +0100)]
Merge pull request #3004 from tobiasd/
20161210 -2932followup
add allowed protocols during installation
Tobias Diekershoff [Sat, 10 Dec 2016 06:16:16 +0000 (07:16 +0100)]
move that option up, as the admin panel has no control over it ATM
Tobias Diekershoff [Sat, 10 Dec 2016 06:05:35 +0000 (07:05 +0100)]
add the kickstart allowed protocols to htconfig.tpl. 2932 follow-up
Tobias Diekershoff [Sat, 10 Dec 2016 06:04:39 +0000 (07:04 +0100)]
make vier also the default from the emergency htconfig file
Michael Vogel [Fri, 9 Dec 2016 17:13:27 +0000 (18:13 +0100)]
Merge pull request #3000 from tobiasd/
20161208 -convert
only convert tables in friendica DB
Tobias Diekershoff [Fri, 9 Dec 2016 17:11:27 +0000 (18:11 +0100)]
Michael may keep the typo
Tobias Diekershoff [Fri, 9 Dec 2016 15:43:40 +0000 (16:43 +0100)]
use %placeholder% instead of Friendica
Michael Vogel [Fri, 9 Dec 2016 14:54:11 +0000 (15:54 +0100)]
Merge pull request #2932 from Hypolite/issue/missing-private-image-src
Fix Friendica private image URL replacing
Michael Vogel [Fri, 9 Dec 2016 14:53:20 +0000 (15:53 +0100)]
Merge pull request #3003 from tobiasd/
20161209 -lang
DE, ES update to the translation
rabuzarus [Fri, 9 Dec 2016 12:43:21 +0000 (13:43 +0100)]
Merge pull request #3002 from tobiasd/
20161209 -docissues
in docs there was a wrong link to the issue tracker
Tobias Diekershoff [Fri, 9 Dec 2016 11:36:28 +0000 (12:36 +0100)]
DE, ES update to the translation
Tobias Diekershoff [Fri, 9 Dec 2016 10:42:28 +0000 (11:42 +0100)]
Merge pull request #3001 from annando/1612-store-gcontact
The gcontact-id and the object field can now be stored with item_post
Tobias Diekershoff [Fri, 9 Dec 2016 10:38:08 +0000 (11:38 +0100)]
in docs there was a wrong link to the issue tracker
Michael [Fri, 9 Dec 2016 09:57:02 +0000 (09:57 +0000)]
The gcontact-id and the object field can now be stored with item_post
Tobias Diekershoff [Thu, 8 Dec 2016 20:11:47 +0000 (21:11 +0100)]
Merge pull request #2990 from Hypolite/fix-diaspora-medium-link
Improve diaspora2bb autolinker
Tobias Diekershoff [Thu, 8 Dec 2016 19:29:06 +0000 (20:29 +0100)]
only convert tables in friendica DB
Hypolite Petovan [Thu, 8 Dec 2016 04:18:10 +0000 (23:18 -0500)]
Adding default protocols on missing config value for backward compatibility
Hypolite Petovan [Thu, 8 Dec 2016 04:15:46 +0000 (23:15 -0500)]
Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src
# Conflicts:
# doc/htconfig.md
Hypolite Petovan [Thu, 8 Dec 2016 04:11:53 +0000 (23:11 -0500)]
Standards
Tobias Diekershoff [Tue, 6 Dec 2016 21:05:08 +0000 (22:05 +0100)]
Merge pull request #2996 from rabuzarus/20161206_-_help_doc_move_content
docu docs: some polishing
Michael Vogel [Tue, 6 Dec 2016 21:01:29 +0000 (22:01 +0100)]
Merge pull request #2994 from tobiasd/
20161206 -frontendworker
add frontend worker to the admin panel and regen master messages.po file
Tobias Diekershoff [Tue, 6 Dec 2016 20:47:37 +0000 (21:47 +0100)]
show some of the worker options only when the worker process is active
rabuzarus [Tue, 6 Dec 2016 14:03:57 +0000 (15:03 +0100)]
docu docs: some polishing
Tobias Diekershoff [Tue, 6 Dec 2016 13:19:00 +0000 (14:19 +0100)]
Merge pull request #2995 from rabuzarus/20161206_-_frio_nav_bar_link_change
frio: change some link behavior of user menu in the nav bar
rabuzarus [Tue, 6 Dec 2016 13:11:22 +0000 (14:11 +0100)]
frio: change some link behavior of user menu in the nav bar
Tobias Diekershoff [Tue, 6 Dec 2016 07:44:59 +0000 (08:44 +0100)]
add frontend worker to the admin panel and regen master messages.po file
Hypolite Petovan [Tue, 6 Dec 2016 03:48:02 +0000 (22:48 -0500)]
Formatting
Hypolite Petovan [Tue, 6 Dec 2016 03:47:52 +0000 (22:47 -0500)]
Fixs edge case where single stars on succeeding lines are wrongly turned into multi-line <em>
Hypolite Petovan [Tue, 6 Dec 2016 03:46:51 +0000 (22:46 -0500)]
Add <br> for each carriage return
Fixes #2993
Hypolite Petovan [Mon, 5 Dec 2016 02:33:29 +0000 (21:33 -0500)]
src and href attributes sanitization touchups
- Use Config::get
- Add default to config call
- Add always allowed protocol to href
- Remove relative root URLs from allowed forms
Hypolite Petovan [Mon, 5 Dec 2016 02:31:28 +0000 (21:31 -0500)]
Revert adding a leading slash to redir links
Michael Vogel [Sun, 4 Dec 2016 23:32:15 +0000 (00:32 +0100)]
Merge pull request #2989 from tobiasd/
20161203 -de
Update DE translation THX Rabuzarus
Tobias Diekershoff [Sun, 4 Dec 2016 16:49:15 +0000 (17:49 +0100)]
Merge pull request #2991 from rabuzarus/20161204_-_allowfullscreen
Bugfix: Fix full screen for embedded videos
Tobias Diekershoff [Sun, 4 Dec 2016 16:48:46 +0000 (17:48 +0100)]
Merge pull request #2992 from rabuzarus/20161204_-_fix_cache_call_in_identity.php
Bugfix: cached data doesn't need to get unserialized anymore
rabuzarus [Sun, 4 Dec 2016 14:15:23 +0000 (15:15 +0100)]
Bugfix: cached data doesn't need to get unserialized anymore
rabuzarus [Sun, 4 Dec 2016 13:55:57 +0000 (14:55 +0100)]
Bugfix: Fix full screen for embedded videos
Hypolite Petovan [Sun, 4 Dec 2016 03:04:13 +0000 (22:04 -0500)]
Improve diaspora2bb autolinker for URLs
- Add @ support for URLs (Medium URLs)
- Exclude trailing commas from autolinked URLs, likely to be normal text
- Formatting
Hypolite Petovan [Sat, 3 Dec 2016 19:19:57 +0000 (14:19 -0500)]
Add protocol whitelist for href/src attributes
- Add strict URL checker for src attributes
- Add protocol whitelist for href attributes
- Add error styling if URL fails to pass filter
- Add doc for new htconfig value
- Add emphasis to config key names in htconfig doc
Hypolite Petovan [Sat, 3 Dec 2016 15:39:06 +0000 (10:39 -0500)]
Revert adding baseurl to private image URL
Hypolite Petovan [Sat, 3 Dec 2016 15:34:48 +0000 (10:34 -0500)]
Merge branch 'develop' into issue/missing-private-image-src
Tobias Diekershoff [Sat, 3 Dec 2016 09:09:40 +0000 (10:09 +0100)]
Update DE translation THX Rabuzarus
Tobias Diekershoff [Fri, 2 Dec 2016 19:20:20 +0000 (20:20 +0100)]
Merge pull request #2988 from rabuzarus/20161202_-_embed_text_complete
autocomplete: add [embed] tag to tag autocomplete and to docu docs
rabuzarus [Fri, 2 Dec 2016 18:39:35 +0000 (19:39 +0100)]
autocomplete: add [embed] tag to tag autocomplete and to docu docs
Tobias Diekershoff [Fri, 2 Dec 2016 16:14:10 +0000 (17:14 +0100)]
Merge pull request #2986 from annando/1612-spool
Spool items that weren't stored before
Michael [Fri, 2 Dec 2016 09:54:34 +0000 (09:54 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1612-spool
Michael [Thu, 1 Dec 2016 22:52:35 +0000 (22:52 +0000)]
Much more standards
Michael [Thu, 1 Dec 2016 22:50:07 +0000 (22:50 +0000)]
Standards ...
Michael [Thu, 1 Dec 2016 21:11:52 +0000 (21:11 +0000)]
File was missing
Michael [Thu, 1 Dec 2016 20:53:18 +0000 (20:53 +0000)]
Store spooled data
Tobias Diekershoff [Thu, 1 Dec 2016 19:37:45 +0000 (20:37 +0100)]
Merge pull request #2985 from annando/1612-ping
Little improvements to the queries in ping.php
Michael [Thu, 1 Dec 2016 13:58:47 +0000 (13:58 +0000)]
Merge branch '1612-spool' of github.com:annando/friendica into 1612-spool
Michael [Thu, 1 Dec 2016 13:50:26 +0000 (13:50 +0000)]
Spool items that couldn't be stored
Michael [Thu, 1 Dec 2016 13:44:30 +0000 (13:44 +0000)]
Little improvements to the queries in ping.php
Tobias Diekershoff [Thu, 1 Dec 2016 13:10:08 +0000 (14:10 +0100)]
Merge pull request #2983 from annando/issue-2915-2918
Disable richtext editor for frio - followup for #2938
Tobias Diekershoff [Thu, 1 Dec 2016 07:51:04 +0000 (08:51 +0100)]
Merge pull request #2979 from annando/issue-2772
Issue 2772: Pending contacts should now be displayed
Tobias Diekershoff [Thu, 1 Dec 2016 07:47:31 +0000 (08:47 +0100)]
Merge pull request #2984 from annando/1611-frontend
The frontend worker is now a full replacement of the crontab call
Michael [Wed, 30 Nov 2016 19:24:58 +0000 (19:24 +0000)]
The frontend worker is now working as a full replacement for the crontab.
Michael [Wed, 30 Nov 2016 04:46:47 +0000 (04:46 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1611-frontend
Michael [Wed, 30 Nov 2016 04:30:48 +0000 (04:30 +0000)]
Pending or blocked - that's the question ...
Michael [Tue, 29 Nov 2016 22:40:19 +0000 (22:40 +0000)]
The frontend worker can now fork background processes
Michael [Tue, 29 Nov 2016 20:25:27 +0000 (20:25 +0000)]
Somehow the changes of pull request 2748 got vanished
Michael Vogel [Tue, 29 Nov 2016 20:09:59 +0000 (21:09 +0100)]
Merge pull request #2982 from rabuzarus/20161129_-_small_dfrn_request_polish
dfrn_request: include the graphic of the connection process into the doxygen header
Michael [Tue, 29 Nov 2016 20:04:31 +0000 (20:04 +0000)]
Disable richtext editor for frio - followup for #2938
rabuzarus [Tue, 29 Nov 2016 18:57:30 +0000 (19:57 +0100)]
dfrn_request: include the graphic of the connection process into the doxygen header
Michael Vogel [Tue, 29 Nov 2016 18:38:31 +0000 (19:38 +0100)]
Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing
Add protocol docu to the help docs
Michael Vogel [Tue, 29 Nov 2016 18:33:57 +0000 (19:33 +0100)]
Merge pull request #2981 from rabuzarus/20161129_-_small_dfrn_request_polish
dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries
Michael [Tue, 29 Nov 2016 18:31:37 +0000 (18:31 +0000)]
The first check for "pending" isn't neccessary.
Michael [Tue, 29 Nov 2016 18:23:34 +0000 (18:23 +0000)]
Maybe we shouldn't count pending contacts
rabuzarus [Tue, 29 Nov 2016 15:10:32 +0000 (16:10 +0100)]
protocol.md - fix typo
rabuzarus [Tue, 29 Nov 2016 15:00:07 +0000 (16:00 +0100)]
update contact request $ confirmation graphics
rabuzarus [Tue, 29 Nov 2016 14:52:12 +0000 (15:52 +0100)]
dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries
rabuzarus [Tue, 29 Nov 2016 13:59:00 +0000 (14:59 +0100)]
Merge pull request #2978 from annando/issue-2518
Issue 2518: Remove contact data in the background
Michael Vogel [Tue, 29 Nov 2016 08:42:26 +0000 (09:42 +0100)]
Merge pull request #2980 from rabuzarus/20161129_-_small_dfrn_request_polish
dfrn_request: added $blocked and $pending as variable to make code mo…
Tobias Diekershoff [Tue, 29 Nov 2016 08:40:59 +0000 (09:40 +0100)]
Merge pull request #2975 from annando/1611-frontend-worker
The worker can now run from the frontend as well
Michael [Tue, 29 Nov 2016 06:40:35 +0000 (06:40 +0000)]
Pending contacts shouldn't be displayed in the sidebar
rabuzarus [Tue, 29 Nov 2016 02:08:46 +0000 (03:08 +0100)]
dfrn_request: added $blocked and $pending as variable to make code more understandable
Michael [Mon, 28 Nov 2016 22:18:37 +0000 (22:18 +0000)]
Some brackets added