clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
23,257 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

23257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hypolite Petovan a0589676e8
Merge pull request #6159 from JonnyTischbein/issue_photo_permisson_upload_to_album 
[frio] Fix setting permisson as post for uploaded photo in album via modal create post
 2018-11-17 14:13:32 -05:00
Hypolite Petovan 807afa3059
Merge pull request #6158 from tobiasd/20181117-contactedittab 
Add link to user groups from /contact
 2018-11-17 14:12:30 -05:00
Jonny Tischbein 7c690c93bb Fix setting permisson as post for uploaded photo in album via modal create post 2018-11-17 19:14:59 +01:00
Tobias Diekershoff 6be831fd32 Add link to user groups from /contact 
There was no way to get to the contact group editor from the contact overview.

Additionally the documentation about the used accesskeys was updated.
 2018-11-17 18:33:12 +01:00
Hypolite Petovan 22fedc9a1a
Merge pull request #6152 from JonnyTischbein/issue_delete_from_saved_folder 
Fix deleting last element and displaying empty saved folder
 2018-11-17 11:59:24 -05:00
Hypolite Petovan e11f9d5a8e
Merge pull request #6156 from tobiasd/20181117-vagrantsql 
recreated SQL file for Vagrant VM from current DB structure
 2018-11-17 11:37:22 -05:00
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
Jonny Tischbein 590fbe8c6f More Code Standard 2018-11-17 17:27:12 +01:00
Jonny Tischbein 4f8e50d834 Code Standard 2018-11-17 17:24:30 +01:00
Tobias Diekershoff 0780dccf4f recreated SQL file for Vagrant VM from current DB structure 2018-11-17 16:25:51 +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
Jonny Tischbein 458b0f3545 Change how to decide between empty update and not called field file 2018-11-17 16:04:54 +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
Jonny Tischbein 56406b9910 Fix SQL Error if no items where found + Fix setting to null 2018-11-17 13:22:32 +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
Jonny Tischbein 52eb2281e4 Fix deleting last element from saved folder + Fix displaying empty saved folder 2018-11-17 12:41:00 +01: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 bd19e93c09 Minor code relocation 
https://github.com/friendica/friendica/pull/6144/files#r234385033
 2018-11-17 01:36:54 +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
Alexandre Alapetite d85e26d314 Refactor header with feed_mode 
https://github.com/friendica/friendica/pull/6140#issuecomment-439475027
 2018-11-16 23:29:26 +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
Alexandre Alapetite 97d164f69e Correct self attribute in ATOM feeds 
Fix for
https://github.com/friendica/friendica/issues/6128#issuecomment-439016471
Special case for DFRN to reduce the risk of unintended side effects
 2018-11-16 18:54:06 +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