Commit graph

4659 commits

Author SHA1 Message Date
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
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
6619e0791d Much more standards 2016-12-01 22:52:35 +00:00
13150c09a5 File was missing 2016-12-01 21:11:52 +00:00
6845775ff9 Store spooled data 2016-12-01 20:53:18 +00:00
c5d571287c Merge branch '1612-spool' of github.com:annando/friendica into 1612-spool 2016-12-01 13:58:47 +00:00
eff4ad2e0a Spool items that couldn't be stored 2016-12-01 13:50:26 +00:00
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
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
57c95c93e1 The frontend worker is now working as a full replacement for the crontab. 2016-11-30 19:24:58 +00:00
63389ba23d Pending or blocked - that's the question ... 2016-11-30 04:30:48 +00:00
cc5eebd173 The frontend worker can now fork background processes 2016-11-29 22:40:19 +00:00
624fabf884 Somehow the changes of pull request 2748 got vanished 2016-11-29 20:25:27 +00:00
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
af3549fa01 The first check for "pending" isn't neccessary. 2016-11-29 18:31:37 +00:00
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
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
fd28ecaacc Pending contacts shouldn't be displayed in the sidebar 2016-11-29 06:40:35 +00:00
eede89f537 Some brackets added 2016-11-28 22:18:37 +00:00
3a76a6766f Issue 2772: Pending contacts should now be displayed 2016-11-28 22:11:13 +00:00
e7ef34298a remove "blubb" 2016-11-28 21:48:06 +00:00
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
636a033364 Added documentation, config stuff, ... 2016-11-27 09:02:08 +00:00
d71321c834 Some added documentation 2016-11-27 01:11:22 +00:00
e856ab9a09 The worker can now run from the frontend as well 2016-11-27 00:55:05 +00:00
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
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
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
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
89d5aa64ba Mark contacts as dead or undead while transmitting and receiving messages 2016-11-19 20:10:29 +00:00
b95bf00e89 Additional info in registration request 2016-11-19 18:22:49 +01:00
a7dae15e82 added return value to doxygen header 2016-11-19 14:34:06 +01:00
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
f4c52f5a0e send email confirming pending registration #2916 2016-11-18 20:16:22 +01:00
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
b1999459af Removed commented code 2016-11-16 06:29:30 +00:00
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
b628e82465 Merge pull request #2910 from annando/1611-slinky
Several shorteners doesn't work anymore
2016-11-15 09:53:38 +01:00
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
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
88d073f3d9 URI of "remote self" are looking better now. 2016-11-14 06:55:17 +00:00
5ef688f1d2 Case correction 2016-11-14 05:44:18 +00:00
3de7b6d6ce Several shorteners doesn't work anymore 2016-11-13 19:19:35 +00:00
1aa9b7242d Merge remote-tracking branch 'upstream/develop' into 1611-parseurl 2016-11-13 19:12:11 +00:00
6dfaa5a95f Some more standard stuff 2016-11-13 19:09:47 +00:00
e925c4139c Some documentation 2016-11-13 18:28:55 +00:00
26936755d9 Bugfix: Locations without coordinates aren't good for Diaspora 2016-11-13 17:42:26 +00:00
2937df21ad Standard stuff 2016-11-13 08:50:01 +00:00
e5f55a5919 Improved handling with wrong formatted urls and fetchinfo 2016-11-12 20:23:00 +00:00
d24e3a6a92 Removed "&" 2016-11-12 17:20:26 +00:00
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
Hypolite Petovan
7b9470b804 misc performance: remove extraneous session write DB query 2016-11-06 00:52:31 -04:00
Hypolite Petovan
bae9f0852f misc performance: cache contact details by url during script 2016-11-06 00:51:23 -04:00
27a2e44d89 Merge pull request #2888 from annando/1610-priority-dbclean
Improved priorities and some more dbclean queries
2016-11-05 08:27:02 +01:00
ba1cd57087 Merge pull request #2887 from annando/1611-api-performance
API calls should be much faster than before
2016-11-05 08:25:09 +01:00
4b33573c20 Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean 2016-11-05 05:25:22 +00:00
Michael Vogel
50651340ce Merge pull request #2886 from rabuzarus/0311_fix_photo_albums
cache: serialize the cache content directly in the cache class
2016-11-05 06:12:29 +01:00
37985a0d3f Use "micro" 2016-11-04 22:56:50 +00:00
fbfaef1968 API calls should be much faster than before 2016-11-04 22:45:20 +00:00
rabuzarus
e446e9571f some more coding style correction 2016-11-04 19:26:28 +01:00
rabuzarus
5459b00499 cache: serialize the cache content directly in the cache class 2016-11-04 16:44:49 +01:00
rabuzarus
75166cae27 Merge pull request #2882 from Hypolite/improvement/bbcode-documentation
BBCodes documentation improvement
2016-11-04 02:34:29 +01:00
Hypolite Petovan
3579a14945 bbcode documentation: minor formatting changes 2016-11-03 21:01:09 -04:00
3a2ec5e4db missing placeholder for name_cache value 2016-11-03 14:00:20 +01:00
Michael Vogel
9dd3e9d19a Merge pull request #2878 from Hypolite/improvement/ping-performance
Improving ping.php performance
2016-11-02 21:56:18 +01:00
Hypolite Petovan
aff467adf2 bbcode documentation: improve cleancss 2016-11-01 23:08:26 -04:00
Hypolite Petovan
73627df520 Merge branch 'develop' into improvement/bbcode-documentation 2016-11-01 19:29:56 -04:00
b5d004e1d7 run dbclean as long as there is some data to be purged 2016-11-01 21:36:15 +00:00
Hypolite Petovan
5e188a9250 ping.php improvement: datetime.php formatting 2016-11-01 02:04:59 -04:00
4d966e1e21 Changed priority for onepoll/further enhancement for dbclean 2016-10-31 21:32:08 +00:00
Hypolite Petovan
63b1e822cd bbcode documentation: improved webfinger profile regexp 2016-10-31 00:00:12 -04:00
Hypolite Petovan
c2e17cb9c4 bbcode documentation: fix broken bookmark form: #^[url]...[/url]
- Prevents the advance recognition of `^` in tags before bbcode()
- Formatting
- Documentation
2016-10-30 23:59:14 -04:00
2e59eec35d Added some comments 2016-10-29 22:06:18 +00:00
8ab90f02c3 Shadow entry mechanism improved 2016-10-29 21:27:56 +00:00
7bd79c67a7 Avoiding deadlocks and small sql improvements 2016-10-29 20:17:33 +00:00
Hypolite Petovan
8e50254bb9 Merge branch 'develop' into improvement/ping-performance 2016-10-28 22:26:38 -04:00
Hypolite Petovan
0131656a06 ping.php perfomance: reverting useless session write changes 2016-10-28 22:15:24 -04:00
Hypolite Petovan
bc407080d2 ping.php performance: improve documentation and formatting 2016-10-28 22:14:51 -04:00
rabuzarus
a65479ccfd Merge pull request #2861 from annando/1610-performance
Some more performance stuff
2016-10-28 22:24:35 +02:00
Hypolite Petovan
f1c855e755 ping.php performance: Cache notification bbcode
- Add two fields to notifiy table to store cached bbcode result
- Add bbcode conversion on notif creation
- Add postfact caching if cache field is empty on retrieval
2016-10-28 06:28:16 -04:00
Hypolite Petovan
747f902e21 ping.php performance: optimizing session_write queries 2016-10-28 05:55:19 -04:00
Hypolite Petovan
63e5342ced ping.php performance: removing datetime_convert 2016-10-28 05:54:26 -04:00
d78b4e7ffc We are doing uncommitted reads a little bit different. (We avoid commit) 2016-10-28 09:08:13 +00:00
bebcbd04d3 We should check values after we fetched them :-) 2016-10-28 04:29:22 +00:00
6601e8c2b7 Prevent a memory Access Violation when the database isn't connected 2016-10-27 20:16:56 +00:00
3f0656fdbd Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-27 12:18:45 +00:00
86adaddca4 dbclean.php mustn't be stopped via "killme" 2016-10-26 05:57:11 +00:00
Michael Vogel
4996003800 Merge pull request #2874 from Hypolite/bug/fix-pgettext-typo
Fix pgettext function name typo
2016-10-25 22:31:59 +02:00
967ecb4205 Merge remote-tracking branch 'upstream/develop' into 1610-performance
Conflicts:
	include/Core/Config.php
	include/Core/PConfig.php
2016-10-25 16:16:01 +00:00
Michael Vogel
4fdced1a0a Merge pull request #2862 from Hypolite/settings-save-perf
Performance improvements: Settings save (alt), profiler, logger
2016-10-25 07:56:11 +02:00
Michael Vogel
80efc422bf Added documentation 2016-10-25 05:44:57 +00:00
Hypolite Petovan
a9e90d111d Restore newline at end of file 2016-10-24 22:18:22 -04:00
Hypolite Petovan
2fc2a1a228 Fix typo in get_available_languages function name
- Add Doxygen comment block
- Fix formatting
- Renamed variable for faster understanding
2016-10-24 22:17:02 -04:00
Hypolite Petovan
d0b95e642f Reverted changes to config 2016-10-24 11:57:17 -04:00
rabuzarus
b0d6c244c5 function nav_info(): insert lost comment 2016-10-24 14:02:38 +02:00
Michael Vogel
3463a442ba Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-24 08:12:13 +00:00
Michael Vogel
8cab3b5592 More transactions, more queries on uncommitted data 2016-10-24 08:10:27 +00:00
Michael Vogel
47b8975bb6 poller.php is now working with transactions as well. 2016-10-23 23:31:56 +00:00
Michael Vogel
1ade94fd8a Some code reformatting 2016-10-23 23:14:35 +00:00
Michael Vogel
b99f5b576e Fixed code structure 2016-10-23 22:12:45 +00:00
Michael Vogel
ee5ada6991 We now use memcache if configured and installed. 2016-10-23 21:59:40 +00:00
Michael Vogel
deb2fee2f0 pconfig: Improved behaviour with already stored values 2016-10-23 07:49:21 +00:00
Hypolite Petovan
437ae412fa More include/nav.php formatting
- Add Doxygen comment block for `nav_info()`
- Remove superfluous by-reference symbol and added type hinting to
`nav_info()` declaration
- More formatting
2016-10-22 22:58:44 -04:00
Hypolite Petovan
4b0e76f3b7 Fix Issue #2803 - Hovercard view profile link and public directory link
- Change "Edit Contact" link to "View Contact" in `include/Contact.php`
and `include/conversation.php`
- Add zrl parameter to public directory on single user instances
- Improved formatting of modified functions
2016-10-22 22:49:12 -04:00
Hypolite Petovan
b806f87874 Formatting changes to make @annando happy 2016-10-22 13:54:30 -04:00
Michael Vogel
561f45b83b And again ... 2016-10-22 10:33:18 +00:00
Michael Vogel
66da84d1a9 Just some more code adjustments 2016-10-22 10:21:43 +00:00
Michael Vogel
b429b85680 CSR changes, split dbclean in separate processes if worker is active 2016-10-22 10:14:41 +00:00
Michael Vogel
31409e2ca1 dbclean is restructured 2016-10-22 04:57:52 +00:00
Hypolite Petovan
f9d713b228 Settings save: Switch from strict to fuzzy comparison 2016-10-21 23:23:44 -04:00
Hypolite Petovan
9a59878190 Standards enforcing 2016-10-21 23:08:42 -04:00
Hypolite Petovan
44d5dec06f Improve logger performance
- Reorder condition to prevent constant lookup (one-time ~3,500 substr)
- Enforce coding standards
2016-10-21 23:00:05 -04:00
Michael Vogel
bc324c3ef4 Setting for the callstack in the database query added 2016-10-21 23:42:45 +00:00
Michael Vogel
a8bef370d3 Some code adjustements and performance improvements to the DFRN feed. 2016-10-21 23:04:04 +00:00
Michael Vogel
501c45def5 Some more improved queries 2016-10-21 18:25:21 +00:00
Michael Vogel
fd2d8cc180 Orphans are removed without giant lock problems 2016-10-20 22:05:21 +00:00