Commit graph

4624 commits

Author SHA1 Message Date
Michael
73e330abbe Restore empty line 2016-12-12 06:51:08 +00:00
Michael
17f15e793f Issue 2999: Better Mastodon handling 2016-12-12 06:46:02 +00:00
Tobias Diekershoff
352b168e2d Merge pull request #3007 from annando/1607-performance
Some more performance stuff
2016-12-12 07:04:16 +01:00
Michael
0c99cee092 Some logging to detect possible problems with the probing 2016-12-11 18:39:39 +00:00
Michael
5c04402448 String is no integer 2016-12-11 17:37:12 +00:00
Michael
c666c98559 Code bautification 2016-12-10 12:28:49 +00:00
Michael
00c74a7d6d Some more ... 2016-12-10 12:21:16 +00:00
Michael
5572bd0cf9 Redo the index changes for testing purposes 2016-12-10 12:19:57 +00:00
Michael
fc3c1601b1 Merge remote-tracking branch 'upstream/develop' into 1607-performance 2016-12-10 12:18:11 +00:00
Michael Vogel
af42e5e481 Merge pull request #2932 from Hypolite/issue/missing-private-image-src
Fix Friendica private image URL replacing
2016-12-09 15:54:11 +01:00
Tobias Diekershoff
4059e58bbf Merge pull request #2990 from Hypolite/fix-diaspora-medium-link
Improve diaspora2bb autolinker
2016-12-08 21:11:47 +01:00
Hypolite Petovan
cd354d3a57 Adding default protocols on missing config value for backward compatibility 2016-12-07 23:18:10 -05:00
Hypolite Petovan
88e336b3bc Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src
# Conflicts:
#	doc/htconfig.md
2016-12-07 23:15:46 -05:00
Hypolite Petovan
e29023dc8c Standards 2016-12-07 23:11:53 -05:00
Hypolite Petovan
aef2c7373c Formatting 2016-12-05 22:48:02 -05:00
Hypolite Petovan
d0cb8cdccf Fixs edge case where single stars on succeeding lines are wrongly turned into multi-line <em> 2016-12-05 22:47:52 -05:00
Hypolite Petovan
60b9203dd5 Add <br> for each carriage return
Fixes #2993
2016-12-05 22:46:51 -05:00
Hypolite Petovan
2b75ad5e0a 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
2016-12-04 21:33:29 -05:00
Hypolite Petovan
5e20aed428 Revert adding a leading slash to redir links 2016-12-04 21:31:28 -05:00
Tobias Diekershoff
9899c30d0f Merge pull request #2991 from rabuzarus/20161204_-_allowfullscreen
Bugfix: Fix full screen for embedded videos
2016-12-04 17:49:15 +01:00
rabuzarus
3d4e1176ec Bugfix: cached data doesn't need to get unserialized anymore 2016-12-04 15:15:23 +01:00
rabuzarus
5ca93d0541 Bugfix: Fix full screen for embedded videos 2016-12-04 14:55:57 +01:00
Hypolite Petovan
166df0180b Improve diaspora2bb autolinker for URLs
- Add @ support for URLs (Medium URLs)
- Exclude trailing commas from autolinked URLs, likely to be normal text
- Formatting
2016-12-03 22:04:13 -05:00
Hypolite Petovan
979fc6d38a 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
2016-12-03 14:19:57 -05:00
Hypolite Petovan
47a370c5e3 Revert adding baseurl to private image URL 2016-12-03 10:39:06 -05:00
Hypolite Petovan
0f2c27e041 Merge branch 'develop' into issue/missing-private-image-src 2016-12-03 10:34:48 -05:00
Michael
6619e0791d Much more standards 2016-12-01 22:52:35 +00:00
Michael
13150c09a5 File was missing 2016-12-01 21:11:52 +00:00
Michael
6845775ff9 Store spooled data 2016-12-01 20:53:18 +00:00
Michael
c5d571287c Merge branch '1612-spool' of github.com:annando/friendica into 1612-spool 2016-12-01 13:58:47 +00:00
Michael
eff4ad2e0a Spool items that couldn't be stored 2016-12-01 13:50:26 +00:00
Tobias Diekershoff
6ef69ad2da Merge pull request #2983 from annando/issue-2915-2918
Disable richtext editor for frio - followup for #2938
2016-12-01 14:10:08 +01:00
Tobias Diekershoff
1fc35d5f44 Merge pull request #2979 from annando/issue-2772
Issue 2772: Pending contacts should now be displayed
2016-12-01 08:51:04 +01:00
Michael
57c95c93e1 The frontend worker is now working as a full replacement for the crontab. 2016-11-30 19:24:58 +00:00
Michael
63389ba23d Pending or blocked - that's the question ... 2016-11-30 04:30:48 +00:00
Michael
cc5eebd173 The frontend worker can now fork background processes 2016-11-29 22:40:19 +00:00
Michael
624fabf884 Somehow the changes of pull request 2748 got vanished 2016-11-29 20:25:27 +00:00
Michael
d49325d177 Disable richtext editor for frio - followup for #2938 2016-11-29 20:04:31 +00:00
Michael Vogel
efb2df41ba Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing
Add protocol docu to the help docs
2016-11-29 19:38:31 +01:00
Michael
af3549fa01 The first check for "pending" isn't neccessary. 2016-11-29 18:31:37 +00:00
Michael
b2302f6290 Maybe we shouldn't count pending contacts 2016-11-29 18:23:34 +00:00
rabuzarus
250f978872 Merge pull request #2978 from annando/issue-2518
Issue 2518: Remove contact data in the background
2016-11-29 14:59:00 +01:00
Tobias Diekershoff
d55d500e35 Merge pull request #2975 from annando/1611-frontend-worker
The worker can now run from the frontend as well
2016-11-29 09:40:59 +01:00
Michael
fd28ecaacc Pending contacts shouldn't be displayed in the sidebar 2016-11-29 06:40:35 +00:00
Michael
eede89f537 Some brackets added 2016-11-28 22:18:37 +00:00
Michael
3a76a6766f Issue 2772: Pending contacts should now be displayed 2016-11-28 22:11:13 +00:00
Michael
e7ef34298a remove "blubb" 2016-11-28 21:48:06 +00:00
Michael
a38a5019d0 Issue 2518: Remove contact data in the background 2016-11-28 21:44:04 +00:00
Michael Vogel
9894f7cea7 Merge pull request #2965 from tobiasd/20161122-cpActiveResponse
active response
2016-11-28 21:14:42 +01:00
Michael Vogel
37e8f6b442 Merge pull request #2973 from rabuzarus/berlin_parse_url
parse_url: recognize image/video/audio files + move functions into own class
2016-11-28 21:05:31 +01:00
rabuzarus
ac39928e5d upload connection graphics & update doxygen headers to insert link to the spec 2016-11-28 16:23:47 +01:00
rabuzarus
f229d65f85 ParseUrl: some docu work 2016-11-27 23:41:55 +01:00
rabuzarus
85b51ee41c xml:php - some code standard work 2016-11-27 20:42:40 +01:00
rabuzarus
56e38dd6bd move function deletenode() to the xml class 2016-11-27 20:19:43 +01:00
Michael
636a033364 Added documentation, config stuff, ... 2016-11-27 09:02:08 +00:00
Michael
d71321c834 Some added documentation 2016-11-27 01:11:22 +00:00
Michael
e856ab9a09 The worker can now run from the frontend as well 2016-11-27 00:55:05 +00:00
Michael
ba1a304589 Delivery to other systems was needlessly deferred. 2016-11-24 03:34:11 +00:00
rabuzarus
e9226eaf45 parse_url: recognize image/video/audio files + move functions into own class 2016-11-24 01:11:22 +01:00
Michael Vogel
4eeb5a0a17 Merge pull request #2969 from gerhard6380/develop
Develop
2016-11-23 05:13:31 +01:00
Hypolite Petovan
4937a3b7d8 Add the self property to conversation responses
- Add a condition to check if the current user is amongst the responses
- Populate the responses array with the self attribute
2016-11-22 18:35:19 +01:00
Michael
edbdd0e34a Bugfix: We should only search in the current database for MyISAM tables 2016-11-22 16:47:08 +00:00
Michael Vogel
46ba1a46f5 Merge pull request #2896 from rabuzarus/0311_fix_photo_albums
chache: check for valid serialized data + uncomment caching of contac…
2016-11-21 04:04:36 +01:00
Michael
3de862712d Issue 2772: Posts from pending contacts should be displayed as well. 2016-11-20 16:52:57 +00:00
rabuzarus
721ac5fb9e cache: use unserialize(false) 2016-11-20 17:32:37 +01:00
Hypolite Petovan
003e6a7371 Improve BBCode javascript stripping regex 2016-11-19 18:01:45 -05:00
Tobias Diekershoff
914330bb8f Merge pull request #2940 from annando/1611-dead-contacts
Mark contacts as dead or undead while transmitting and receiving messages
2016-11-19 22:59:57 +01:00
Michael
89d5aa64ba Mark contacts as dead or undead while transmitting and receiving messages 2016-11-19 20:10:29 +00:00
Tobias Diekershoff
b95bf00e89 Additional info in registration request 2016-11-19 18:22:49 +01:00
Tobias Diekershoff
a7dae15e82 added return value to doxygen header 2016-11-19 14:34:06 +01:00
Tobias Diekershoff
32c0a9ef43 added return value to doxygen header 2016-11-19 14:32:01 +01:00
Hypolite Petovan
c2eb2f460b Fix Friendica private image URL replacing
- Add baseurl to redir_private_images to prevent empty src attribute in
generated HTML
- URL encode the URL parameter url and conurl
- Formatting
- Documentation
2016-11-18 22:05:56 -05:00
Tobias Diekershoff
f4c52f5a0e send email confirming pending registration #2916 2016-11-18 20:16:22 +01:00
Michael
ccd484643d Polling feeds is now done with a higher priority. 2016-11-17 23:06:22 +00:00
rabuzarus
0f81411b26 Bugfix: avatar images for activty like was not shown notifications page 2016-11-16 13:21:13 +01:00
Michael
b1999459af Removed commented code 2016-11-16 06:29:30 +00:00
Michael
126c4774c3 Merge remote-tracking branch 'upstream/develop' into 1607-performance
Conflicts:
	include/dbstructure.php
	mod/item.php
	mod/nodeinfo.php
2016-11-16 06:27:21 +00:00
rabuzarus
e4a625ad12 Bugfix: seen status was not handled correcty on the notifications page 2016-11-16 04:57:55 +01:00
Tobias Diekershoff
b628e82465 Merge pull request #2910 from annando/1611-slinky
Several shorteners doesn't work anymore
2016-11-15 09:53:38 +01:00
Tobias Diekershoff
44d79cbc27 Merge pull request #2911 from annando/1611-well-formatted-uri
URI of "remote self" are looking better now.
2016-11-15 09:53:14 +01:00
Michael
d4e3bc1924 Added documentation 2016-11-15 07:05:43 +00:00
rabuzarus
9878974e1f fix photos page permissions 2016-11-14 18:49:51 +01:00
Jens Tautenhahn
31ad26aae2 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-14 09:52:01 +01:00
Michael
88d073f3d9 URI of "remote self" are looking better now. 2016-11-14 06:55:17 +00:00
Michael
5ef688f1d2 Case correction 2016-11-14 05:44:18 +00:00
Michael
3de7b6d6ce Several shorteners doesn't work anymore 2016-11-13 19:19:35 +00:00
Michael
1aa9b7242d Merge remote-tracking branch 'upstream/develop' into 1611-parseurl 2016-11-13 19:12:11 +00:00
Michael
6dfaa5a95f Some more standard stuff 2016-11-13 19:09:47 +00:00
Michael
e925c4139c Some documentation 2016-11-13 18:28:55 +00:00
Michael
26936755d9 Bugfix: Locations without coordinates aren't good for Diaspora 2016-11-13 17:42:26 +00:00
Michael
2937df21ad Standard stuff 2016-11-13 08:50:01 +00:00
Michael
e5f55a5919 Improved handling with wrong formatted urls and fetchinfo 2016-11-12 20:23:00 +00:00
Michael
d24e3a6a92 Removed "&" 2016-11-12 17:20:26 +00:00
Michael
e6148f4c1c Performance improvements when storing items (via API) 2016-11-12 13:17:28 +00:00
gerhard6380
623d809cc3 changes in api call for showing profiles and disable proxy for images in html code for api calls 2016-11-09 21:35:52 +01:00
Jens Tautenhahn
12dd657868 fixes an sql error in NotificationsManager 2016-11-09 21:32:15 +01:00
rabuzarus
d025b83c93 ref_session_write: fix update for entry in the session table 2016-11-07 22:25:09 +01:00
rabuzarus
a337021c31 chache: correct misspelling 2016-11-07 22:20:13 +01:00
rabuzarus
915689dd79 chache: check for valid serialized data + uncomment caching of contact suggestion 2016-11-07 22:12:11 +01:00
Hypolite Petovan
67cdbe4538 misc performance: restore session write condition, keep 1 query 2016-11-06 01:00:17 -04:00