Michael Vogel
|
2cb17b8320
|
Merge pull request #3666 from rabuzarus/20170828_-_frio_photo_controls
Frio: provide single photo view template
|
2017-08-28 15:13:13 +02:00 |
|
rabuzarus
|
be6aa3cbf9
|
Frio: provide single photo view template
|
2017-08-28 14:29:11 +02:00 |
|
Tobias Diekershoff
|
0c1c39b679
|
Merge pull request #3665 from annando/local-remote-user
Bugfix: You cannot be local and remote at the same time
|
2017-08-28 06:55:22 +02:00 |
|
|
Tobias Diekershoff
|
f27a731676
|
Merge pull request #3664 from annando/acl-mentions
ACL automentions are now in the new format
|
2017-08-28 06:53:47 +02:00 |
|
Michael
|
21d27c2124
|
Bugfix: You cannot be local and remote at the same time
|
2017-08-28 04:46:04 +00:00 |
|
|
Michael
|
1190863e1e
|
ACL automentions are now in the new format
|
2017-08-27 20:39:15 +00:00 |
|
|
Tobias Diekershoff
|
ccb54f3ee4
|
Merge pull request #3663 from annando/no-redir
Don't add "redir" links on mentions
|
2017-08-27 12:48:40 +02:00 |
|
|
Michael
|
83ce42172b
|
Don't add "redir" links on mentions
|
2017-08-27 09:56:41 +00:00 |
|
|
Tobias Diekershoff
|
93e447cbf0
|
Merge pull request #3662 from annando/issue-3611
Possibly Issue 3611: Better feed handling when there is no body
|
2017-08-27 09:59:15 +02:00 |
|
|
Michael
|
12ae59dba3
|
No linefeeds
|
2017-08-27 07:12:27 +00:00 |
|
|
Michael
|
d8acb62ba6
|
Small formatting issue
|
2017-08-27 07:02:44 +00:00 |
|
|
Michael
|
a36c8a0173
|
Possibly Issue 3611: Better feed handling when there is no body
|
2017-08-27 06:59:07 +00:00 |
|
rabuzarus
|
3df2246a77
|
Merge pull request #3660 from tobiasd/20170826-de
update DE translation
|
2017-08-26 20:10:29 +02:00 |
|
|
Tobias Diekershoff
|
5d9a64122a
|
update DE translation
|
2017-08-26 19:39:31 +02:00 |
|
|
Tobias Diekershoff
|
4788c924a0
|
Merge pull request #3659 from annando/more-static
And some more static warnings removed
|
2017-08-26 12:07:54 +02:00 |
|
|
Michael
|
a729519de9
|
And some more static warnings removed
|
2017-08-26 10:01:50 +00:00 |
|
|
Tobias Diekershoff
|
94f6f12ba3
|
Merge pull request #3658 from annando/static-methods
Avoid some more warnings
|
2017-08-26 10:32:28 +02:00 |
|
|
Michael Vogel
|
5ab1950e9d
|
Merge pull request #3657 from tobiasd/20170826-messages
regenerated master messages.po file
|
2017-08-26 10:00:32 +02:00 |
|
|
Michael
|
c382f9f3d7
|
Some more
|
2017-08-26 07:52:49 +00:00 |
|
|
Tobias Diekershoff
|
ef54a283ab
|
regenerated master messages.po file
|
2017-08-26 09:48:05 +02:00 |
|
|
Michael
|
5adfeb0bd5
|
App::get_baseurl is now replaced with System::baseUrl
|
2017-08-26 07:32:10 +00:00 |
|
|
Michael
|
3c24bed412
|
New class "System"
|
2017-08-26 06:04:21 +00:00 |
|
|
Tobias Diekershoff
|
080eba64b2
|
Merge pull request #3656 from rabuzarus/20170825_-_frio_photo_css_fix
Bugfix: fix missing closing div in Frio
|
2017-08-25 22:07:33 +02:00 |
|
|
rabuzarus
|
e03b0c9385
|
Bugfix: fix missing closing div in Frio
|
2017-08-25 20:03:49 +02:00 |
|
|
Tobias Diekershoff
|
e2b37fd7e4
|
Merge pull request #3655 from annando/static-methods
Statically used methods should be defined statically as well
|
2017-08-25 18:13:31 +02:00 |
|
|
Michael
|
b0c26921ad
|
Statically used methods should be defined statically as well
|
2017-08-25 15:56:08 +00:00 |
|
|
Tobias Diekershoff
|
959d6ae15e
|
Merge pull request #3654 from annando/externalpubsubhubbub
Removed external pubsubhubbub URL
|
2017-08-25 09:47:58 +02:00 |
|
|
Tobias Diekershoff
|
460dd3c2e3
|
Merge pull request #3653 from annando/removed-poormancron
Documentation was updated. (Reference to poormancron removed)
|
2017-08-25 09:47:13 +02:00 |
|
|
Tobias Diekershoff
|
8ac3cb6f66
|
Merge pull request #3652 from annando/missing-connect
Bugfix for "1" instead of "connect"
|
2017-08-25 09:45:40 +02:00 |
|
|
Michael
|
5c53544118
|
Removed external pubsubhubbub URL
|
2017-08-25 02:58:38 +00:00 |
|
|
Michael
|
21b239cbc7
|
Documentation was updated. (Reference to poormancron removed)
|
2017-08-25 02:49:25 +00:00 |
|
|
Michael Vogel
|
f589c084ff
|
Merge pull request #3651 from tobiasd/20170824-en
EN variants (missed a file)
|
2017-08-24 21:25:07 +02:00 |
|
|
Michael
|
2ecd5a55b7
|
Bugfix for "1" instead of "connect"
|
2017-08-24 19:11:27 +00:00 |
|
|
Tobias Diekershoff
|
b1dc6ae550
|
EN (missed a file)
|
2017-08-24 16:53:19 +02:00 |
|
|
Tobias Diekershoff
|
417ea99ba5
|
Merge pull request #3650 from annando/feed-probing
Probing sometimes failed / problems with some web servers
|
2017-08-24 10:16:24 +02:00 |
|
|
Michael
|
c09c806f78
|
Probing sometimes failed / problems with some web servers
|
2017-08-24 07:56:46 +00:00 |
|
|
Tobias Diekershoff
|
32a8a28b2c
|
Merge pull request #3649 from annando/pleroma2
Enhanced OStatus compatibility
|
2017-08-24 09:35:12 +02:00 |
|
|
Michael
|
ba52dd9fa7
|
Merge remote-tracking branch 'upstream/develop' into pleroma2
|
2017-08-24 06:26:58 +00:00 |
|
|
Michael
|
6998897a34
|
Limit the number of feed entries (Can solve resub problems)
|
2017-08-23 23:01:37 +00:00 |
|
|
rabuzarus
|
d990f9b32f
|
Merge pull request #3648 from annando/develop
Issue 3645: Avoid problems with boolean values
|
2017-08-23 22:59:01 +02:00 |
|
|
Michael
|
2293757a36
|
Just some empty lines
|
2017-08-23 20:33:32 +00:00 |
|
|
Michael
|
e533572ca3
|
Issue 3645: Avoid problems with boolean values
|
2017-08-23 19:40:42 +00:00 |
|
|
Michael Vogel
|
f83ad77624
|
Merge pull request #3647 from tobiasd/20170823-en
update EN US and GB variations
|
2017-08-23 15:37:11 +02:00 |
|
|
Tobias Diekershoff
|
277465fa1f
|
update EN US and GB variations
|
2017-08-23 14:53:37 +02:00 |
|
|
Michael
|
b378f5fb01
|
The "hub" url now contains the nickname
|
2017-08-23 05:01:15 +00:00 |
|
|
Michael
|
e607a9dcda
|
Our user feeds now look more like OStatus
|
2017-08-22 10:18:07 +00:00 |
|
|
Tobias Diekershoff
|
fdc8190567
|
Merge pull request #3642 from annando/pleroma
Compatibility with pleroma added
|
2017-08-22 08:40:36 +02:00 |
|
|
Michael
|
51dca9b034
|
Compatibility with pleroma added
|
2017-08-21 20:21:04 +00:00 |
|
|
Tobias Diekershoff
|
c9daecb80d
|
Merge pull request #3640 from annando/better-smiley-support
Preparation for Unicode Emojis
|
2017-08-21 06:54:15 +02:00 |
|
|
Michael
|
85c49060e2
|
Preparation for Unicode Emojis
|
2017-08-20 19:47:00 +00:00 |
|