rabuzarus
|
4224209497
|
Merge develop into 20171122_-_port_tagcloud
Conflicts:
include/features.php
|
2017-11-25 23:41:20 +01: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 #3955 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 #3952 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 #3953 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 #3951 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 #3948 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 #3949 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 #3945 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 #3944 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 #3940 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 #3943 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 |
|
|
Hypolite Petovan
|
6ecc464a68
|
Merge pull request #3941 from annando/children-merge
Some posts weren't shown
|
2017-11-24 16:49:21 -05:00 |
|
|
Michael
|
3046455b1c
|
Some posts weren't shown
|
2017-11-24 21:39:12 +00:00 |
|
|
hoergen
|
d672f39930
|
Bookmarklet for sharing links to friendica
|
2017-11-24 22:11:57 +01:00 |
|
|
Tobias Diekershoff
|
5a0f33dca0
|
Merge pull request #3939 from annando/fix-sql
Fix some SQL problems
|
2017-11-24 09:53:36 +01:00 |
|
|
Michael Vogel
|
adc720a7fc
|
Merge pull request #3938 from MrPetovan/task/3878-mov-HTTPExceptions-to-src
Move HTTPExceptions to src
|
2017-11-24 09:44:44 +01:00 |
|
|
Michael
|
4a4be4d664
|
Fix some SQL problems
|
2017-11-24 07:44:02 +00:00 |
|
|
Hypolite Petovan
|
9943393b71
|
Remove include/HTTPExceptions.php
|
2017-11-23 23:52:23 -05:00 |
|
|
Hypolite Petovan
|
1f4fc87fd9
|
Use new HTTPExceptions in API
|
2017-11-23 23:48:15 -05:00 |
|
|
Hypolite Petovan
|
365850f26a
|
Fix httpdesc to work with new namespace
|
2017-11-23 23:47:52 -05:00 |
|
|
Hypolite Petovan
|
b41bf77ec8
|
Add HTTPException class files
|
2017-11-23 23:40:54 -05:00 |
|
|
Michael Vogel
|
4032ad3418
|
Merge pull request #3935 from MrPetovan/task/3878-move-ExAuth-to-src
Move ExAuth class to src
|
2017-11-24 05:40:06 +01:00 |
|
|
Hypolite Petovan
|
fd8b9deaaf
|
Merge pull request #3934 from zeroadam/Contact
Second Contact
|
2017-11-23 21:01:02 -05:00 |
|
Adam Magness
|
9df0457340
|
whitespace
remove whitespace
|
2017-11-23 20:59:00 -05:00 |
|
|
Hypolite Petovan
|
5ec011c7be
|
Merge pull request #3937 from annando/additional
Additional features still had got problems
|
2017-11-23 20:43:46 -05:00 |
|
|
Hypolite Petovan
|
0d23a56706
|
Merge pull request #3936 from zeroadam/Standards
src Standards
|
2017-11-23 20:43:10 -05:00 |
|
|
Hypolite Petovan
|
40c37d76fe
|
Don't cache the xmpp/password PConfig value
|
2017-11-23 20:34:35 -05:00 |
|
|
Adam Magness
|
130e02ddef
|
Review
null_date and spaces at end of line
|
2017-11-23 19:22:30 -05:00 |
|
|
Michael
|
da5857529f
|
Additional features still had got problems
|
2017-11-23 20:41:35 +00:00 |
|
|
Adam Magness
|
609a4de5d0
|
src Standards
This basically completes coding standards changes for the entire src directory, with the exception of App.php
|
2017-11-23 14:01:58 -05:00 |
|
|
Hypolite Petovan
|
d5887f9f9a
|
Add use dba
|
2017-11-23 10:23:16 -05:00 |
|
|
Hypolite Petovan
|
93924ceac4
|
Move ExAuth class to src
- Move executed code to separate readStdin function
|
2017-11-23 09:46:04 -05:00 |
|