Commit graph

16634 commits

Author SHA1 Message Date
Hypolite Petovan
09667dd82b
Merge pull request from tobiasd/20171126-docGettingStarted
this and should be an or
2017-11-26 09:23:50 -05:00
Tobias Diekershoff
2bf8ebaab9 this and should be an or 2017-11-26 15:19:40 +01:00
Tobias Diekershoff
0d7b3b4007
Merge pull request from annando/uexport-json
Avoid empty user export when there are UTF8 problems
2017-11-26 15:01:06 +01:00
Michael
f059b33390 Avoid empty user export when there are UTF8 problems 2017-11-26 13:58:24 +00:00
Hypolite Petovan
e82bbc75cd
Merge pull request from annando/default-features
Additional features should now work with the forumlist as well
2017-11-26 08:51:14 -05:00
Michael Vogel
28594f6d25
Merge pull request from MrPetovan/task/3946-use-random-bytes
Use random_bytes() in random_string()
2017-11-26 14:24:48 +01:00
Michael
e4995dbad5 Good looking and better performance 2017-11-26 13:12:54 +00:00
Hypolite Petovan
d5c38b9fc9 Add odd number of character support to random_string() 2017-11-26 07:57:29 -05:00
Michael Vogel
324b2dd014
Merge pull request from tobiasd/20171126-makecredits
add Ratten to the special contributors
2017-11-26 12:44:49 +01:00
Michael
774a7193d2 Added clarification 2017-11-26 11:43:02 +00:00
Michael
6cb637e8ab Default features should now work with the forumwidget again 2017-11-26 11:31:07 +00:00
Tobias Diekershoff
d459a825ae add Ratten to the special contributors who are not found in git and messages.po files 2017-11-26 10:58:15 +01:00
Hypolite Petovan
068d3dc746
Merge pull request from annando/image-forum
Images that are uploaded to public forums are now public
2017-11-25 21:40:33 -05:00
Hypolite Petovan
2a204ecdfd
Merge pull request from annando/awaiting-acknowledge
When we are requesting a connection, the contact is no longer "blocked"
2017-11-25 21:39:41 -05:00
Michael
cb7648359c When we are requesting a conneczion, the contactis no longer "blocked" 2017-11-26 02:31:26 +00:00
Hypolite Petovan
d38c040d50 Update random_string with random_bytes
- Updated update.php
2017-11-25 21:15:50 -05:00
Michael Vogel
dfccd2184e
Merge pull request from tobiasd/20171125-docEventsObsolete
Events docs had an obsolete paragraph
2017-11-26 03:05:54 +01:00
Michael
a7088f5b67 Images that are uploaded to public forums are now public 2017-11-26 02:03:59 +00:00
Tobias Diekershoff
797aac9a3b Events docs had an obsolete paragraph 2017-11-26 00:59:27 +01:00
Hypolite Petovan
8b38f7f012 Add paragonie/random_compat to Composer dependencies 2017-11-25 18:42:00 -05:00
Hypolite Petovan
e74d9d1113
Merge pull request from tobiasd/20171125-docEvents
calendar documentation
2017-11-25 17:58:16 -05:00
Hypolite Petovan
3c581b0dcc
Merge pull request from tobiasd/20171125-FAQlinks
updated links to Friendiqa
2017-11-25 17:57:00 -05:00
Tobias Diekershoff
add6f85cdf added German translation to the events documentation, THX Ratten 2017-11-25 22:57:00 +01:00
Tobias Diekershoff
5c7694d00e export cal is now in core 2017-11-25 21:57:19 +01:00
Tobias Diekershoff
9bb1be91d9 updated links to Friendiqa 2017-11-25 21:43:36 +01:00
Tobias Diekershoff
712efd9875
Merge pull request from silke/develop
Markdown formatting and minor changes
2017-11-25 18:16:30 +01:00
Silke Meyer
21a3a6f45b Markdown formatting and minor changes 2017-11-25 17:26:36 +01:00
Hypolite Petovan
05a09adb3b
Merge pull request from tobiasd/20171125-silentium2
update to the silence script
2017-11-25 11:14:54 -05:00
Tobias Diekershoff
2ac797be8e let there be SPACE 2017-11-25 17:10:29 +01:00
Hypolite Petovan
e6a8cac147
Merge pull request from annando/preview-again
Show the preview picture even if the posting contains the huge image
2017-11-25 11:06:23 -05:00
Tobias Diekershoff
2d61aaf118 some minor stuff 2017-11-25 17:05:27 +01:00
Hypolite Petovan
f54faf1363
Merge pull request from tobiasd/20171125-blockaccount
Script to block an account from the node
2017-11-25 11:04:22 -05:00
Tobias Diekershoff
8a91e631cf some more minor stuff 2017-11-25 17:02:42 +01:00
Michael
ba184f9038 Show the preview picture even if the posting contains the huge image 2017-11-25 16:00:51 +00:00
Tobias Diekershoff
32d71dbfcc update to the silence script 2017-11-25 16:55:58 +01:00
Tobias Diekershoff
d9185540a5 some minor stuff 2017-11-25 16:45:20 +01:00
Tobias Diekershoff
2d65eae2f5 Script to block an account from the node 2017-11-25 16:40:03 +01:00
Michael Vogel
5778747ad0
Merge pull request from tobiasd/20172511-silentium
silence accounts from global community page
2017-11-25 16:30:13 +01:00
Tobias Diekershoff
9f0e8cffba use all profile formats, typos 2017-11-25 16:25:53 +01:00
Tobias Diekershoff
f22fe7118d
Merge pull request from annando/further-information
Documentation for "fetch further information"
2017-11-25 15:57:21 +01:00
Michael
1adff81a25 Documentation for "fetch further information" 2017-11-25 14:43:28 +00:00
Tobias Diekershoff
8c2b678aaa silence accounts from global community page 2017-11-25 15:16:55 +01:00
Hypolite Petovan
9778aab949
Merge pull request from annando/issue-3911
Issue 3911: Fetch keywords for feeds
2017-11-25 07:10:03 -05:00
Michael
3cb906c420 Issue 3911: Fetch keywords for feeds 2017-11-25 11:59:20 +00:00
Tobias Diekershoff
e76ea3f5b8
Merge pull request from annando/always-preview
Always show small preview pictures, not the big ones
2017-11-25 11:18:29 +01:00
Michael
4ddcc77c77 Always show small preview pictures, not the big ones 2017-11-25 10:07:49 +00:00
Hypolite Petovan
34e808e912
Merge pull request from hoergen/develop
Bookmarklet for sharing links to friendica
2017-11-24 19:51:35 -05:00
hoergen
d7f0c08bce Added Description for creating a bookmark 2017-11-25 01:49:18 +01:00
Tobias Diekershoff
695094f9aa
Merge pull request from annando/getposts
getPostsFromUrl hadn't worked
2017-11-24 23:20:30 +01:00
Michael
abc0b90fa9 getpostsbyurl hadn't worked 2017-11-24 22:15:35 +00:00