Commit graph

21687 commits

Author SHA1 Message Date
Tobias Diekershoff 381474f314
Merge pull request #6155 from fabrixxm/issues/localredirect
Use appropriate redirect in dfrn_poll
2018-11-17 17:36:04 +01:00
fabrixxm 1e9e06a325 Use appropriate redirect in dfrn_poll
Got an error while remote auth to a local user, where $destination_url
is relative.
2018-11-17 16:12:45 +01:00
Hypolite Petovan f5d58d07e1
Merge pull request #6154 from JonnyTischbein/issue_open_commentbox_post_with_replies
[frio] Fix opening comment box when Post has replies
2018-11-17 10:01:05 -05:00
Hypolite Petovan ce82f5cec9
Merge pull request #6147 from Alkarex/stylesheet-path-html-encoding
Fix lack of HTML encoding for stylesheet link
2018-11-17 09:55:26 -05:00
Hypolite Petovan 9c2ba6abe9
Merge pull request #6153 from JonnyTischbein/issue_return_delete_comments
Fix return url when delete comment from display
2018-11-17 09:54:47 -05:00
Jonny Tischbein dd7d556c86 Fix opening comment box when Post has replies 2018-11-17 15:53:34 +01:00
Alexandre Alapetite 4d092872a5 Escaping moved to template
https://github.com/friendica/friendica/pull/6147#pullrequestreview-176051481
2018-11-17 14:01:07 +01:00
Jonny Tischbein cf9c3444bc Fix return url when delete comment from display 2018-11-17 13:56:58 +01:00
Hypolite Petovan 9e25270699
Merge pull request #6145 from Alkarex/ATOM-title-encoding
Fix ATOM feed entry titles encoding
2018-11-17 07:01:53 -05:00
Hypolite Petovan 3e1e2d3071
Merge pull request #6146 from Alkarex/atom-link-title-dfrn
Title difference for two different ATOM feeds
2018-11-17 06:50:09 -05:00
Hypolite Petovan 02aa11fb7a
Merge pull request #6143 from tobiasd/20181116-Vagranthtaccess
cp htaccess in Vagrant VM on setup
2018-11-17 06:49:40 -05:00
Michael Vogel c66650f7d8
Merge pull request #6151 from fabrixxm/issues/6119
dbstructure: check for comment value or use default
2018-11-17 12:31:08 +01:00
fabrixxm c13e078c42 dbstructure: check for comment value or use default
fix #6119
2018-11-17 11:43:01 +01:00
Alexandre Alapetite dd65c5d150 Apply correct title encoding to all cases 2018-11-17 01:30:53 +01:00
Alexandre Alapetite e45d32d5a5 Fix lack of HTML encoding for stylesheet link
Previous to the fix, the home page had a line like (notice the wrongly
encoded `&`):

```html
<link rel="stylesheet" href="view/theme/frio/style.pcss?f=&puid=1"
type="text/css" media="screen" />
```
2018-11-17 00:23:59 +01:00
Alexandre Alapetite b190c2e9c7 Title difference for two different ATOM feeds
Fix for
https://github.com/friendica/friendica/issues/6128#issuecomment-439016471
2018-11-17 00:05:13 +01:00
Alexandre Alapetite af38d22d38 Fix ATOM feed title encoding
Was HTML-encoded instead of plain Unicode.
Fixed only for feed_mode. Probably wrong as well for non_feed mode (not
sure how to test)
2018-11-16 23:52:36 +01:00
Tobias Diekershoff d81366bff4 cp htaccess in Vagrant VM on setup 2018-11-16 23:09:54 +01:00
Tobias Diekershoff 460c257cb4
Merge pull request #6142 from annando/databasesql
Updated database.sql
2018-11-16 21:28:38 +01:00
Michael Vogel 7b7ce91126
Merge pull request #6141 from tobiasd/20181116_lang
CS, FR, PL translation updates
2018-11-16 21:25:52 +01:00
Michael 6aef4aea0e Updated database.sql 2018-11-16 20:21:33 +00:00
Tobias Diekershoff 31d9be8337 CS, FR, PL translation updates 2018-11-16 20:08:31 +01:00
Hypolite Petovan 58e35f037b
Merge pull request #6136 from annando/delete-locally
Improved delete text to clarify AP comment delete behaviour
2018-11-15 18:26:12 -05:00
Hypolite Petovan b7ed5454c9
Merge pull request #6139 from annando/feed-mode
Some more feed simplification
2018-11-15 18:21:05 -05:00
Michael c3b6727fad Some more feed simplification 2018-11-15 16:21:37 +00:00
Hypolite Petovan 779612d4a8
Merge pull request #6138 from annando/feed-mode
Make feeds look more like feeds
2018-11-15 09:16:08 -05:00
Hypolite Petovan 5eb8929f0c
Merge pull request #6137 from Alkarex/WebSub_fixes
WebSub fixes
2018-11-15 09:13:59 -05:00
Michael 5f258dac22 Make feeds look more like feeds 2018-11-15 13:21:58 +00:00
Alexandre Alapetite 51f0d52100 WebSub fixes
More fixes related to https://github.com/friendica/friendica/issues/6128
* Bug when using direct ATOM URL, which ends with .atom after nick name
* Bug when callback URL already has some ?query=parameters (which is
quite usual)
Slight refactoring
2018-11-15 12:54:04 +01:00
Michael 6ad082a710 Improved delete text to clarify AP comment delete behaviour 2018-11-15 06:36:06 +00:00
Tobias Diekershoff 921094017c
Merge pull request #6134 from annando/6128-again
We now use our regular feed that allows anonymous polling
2018-11-15 06:19:13 +01:00
Michael 08433873f5 Issue 6128 again: We now use our regular feed that allows anonymous polling 2018-11-14 19:26:23 +00:00
Hypolite Petovan 4894e89f03
Merge pull request #6132 from annando/notice
Just some notice again
2018-11-14 09:46:57 -05:00
Michael 268862dd7c Just some notice again 2018-11-14 10:54:42 +00:00
Tobias Diekershoff 89cc79b77b
Merge pull request #6131 from annando/diaspora-relocation
Create a new GUID on user import
2018-11-14 10:27:25 +01:00
Tobias Diekershoff b0d8a2fcd0
Merge pull request #6127 from annando/notice
Avoid "Cannot modify header information - headers already sent"
2018-11-14 10:20:47 +01:00
Michael 88a4733e5f Forgotten "use" 2018-11-14 06:00:01 +00:00
Michael 9271b21d51 Create a new GUID on user import 2018-11-14 05:58:03 +00:00
Hypolite Petovan 6996a172e8
Merge pull request #6130 from annando/develop
Issue 6128: Websub could work now
2018-11-13 18:46:17 -05:00
Michael Vogel cf4a560c12
Merge pull request #6129 from friendica/5891-follow-up
Convert remaining instances of "contacts" in mod/(un)follow
2018-11-13 23:29:01 +01:00
Michael a5ddaa9dbc Issue 6128: Websub could work now 2018-11-13 22:23:16 +00:00
Hypolite Petovan d697dbd794
Convert remaining instances of "contacts" in mod/follow 2018-11-13 16:02:33 -05:00
Hypolite Petovan 537164fd02
Convert remaining instances of "contacts" in mod/unfollow 2018-11-13 16:01:01 -05:00
Michael 83ae873646 Avoid "Cannot modify header information - headers already sent" 2018-11-13 20:20:54 +00:00
Hypolite Petovan e6557ca9c5
Merge pull request #6126 from annando/notice-return-path
Fixes notice "PHP Notice:  Undefined index: return_path"
2018-11-13 13:58:10 -05:00
Michael e1875cf206 Fixes notice "PHP Notice: Undefined index: return_path" 2018-11-13 18:10:37 +00:00
Tobias Diekershoff f8eb38b275
Merge pull request #6123 from friendica/fabrixxm-patch-1
Fix Notice in LegacyModule
2018-11-13 15:09:00 +01:00
fabrixxm 972775e58e
Fix Notice in LegacyModule
Notice: Only variables should be passed by reference in src/LegacyModule.php on line 68
2018-11-13 14:37:51 +01:00
Tobias Diekershoff 320c986e05
Merge pull request #6121 from annando/hide
Don't suggest hidden contacts / Added AP to the suggestions
2018-11-13 09:39:58 +01:00
Tobias Diekershoff b0c875cbfc
Merge pull request #6120 from annando/issue-6032
Issue 6032: Avoid fatal error
2018-11-13 09:38:08 +01:00