friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
15,982 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

15982 Commits

Author SHA1 Message Date
Michael 0e8104b172 Links to profiles in mails mow show the profile address and "redir" always works 2017-08-31 12:01:44 +00:00
Tobias Diekershoff a62e8b7c05 Merge pull request #3674 from annando/display 
Display hadn't shown public items that weren't known to the user
 2017-08-30 22:34:51 +02:00
Tobias Diekershoff 65f1bcb780 Merge pull request #3673 from annando/contact-updating 
Better updating of contacts
 2017-08-30 22:34:01 +02:00
Tobias Diekershoff 5f356fa5e3 Merge pull request #3672 from annando/api-repeat 
Bugfix: Repeating of posts generated a SQL error
 2017-08-30 22:32:06 +02:00
Michael 5f33f28b9e Display hadn't shown public items that weren't known to the user 2017-08-30 20:20:01 +00:00
Michael 1cc50a80f4 Only update if there is a change 2017-08-30 19:33:16 +00:00
Michael 0083c16e87 Better updating of contacts 2017-08-30 18:05:41 +00:00
Michael dbaed91a75 Bugfix: Repeating of posts generated a SQL error 2017-08-30 17:55:23 +00:00
Tobias Diekershoff 0fa84d01b0 Merge pull request #3670 from annando/json-webfinger 
Support for JSON based webfinger
 2017-08-30 08:31:30 +02:00
Michael 157473e4f6 Merge remote-tracking branch 'upstream/develop' into json-webfinger 2017-08-30 06:22:02 +00:00
Michael 5ab697e726 Removed unused template variable 2017-08-30 06:20:01 +00:00
Michael 02179e9419 Some missing tab 2017-08-30 06:16:31 +00:00
Michael 04f286dca2 Support for JSON based webfinger 2017-08-30 05:34:37 +00:00
Tobias Diekershoff 51a070ecf3 Merge pull request #3669 from annando/pleroma 
Pleroma servers are now detected and displayed in the statistics
 2017-08-29 22:49:17 +02:00
Michael 1893c3df16 Pleroma-Servers are now detected and displayed in the statistics 2017-08-29 16:40:08 +00:00
Tobias Diekershoff c948e4cdc3 Merge pull request #3668 from annando/frio-register 
Only show register link when "register" is allowed
 2017-08-29 08:02:18 +02:00
Michael 3a3f3d933e Only show register link when "register" is allowed 2017-08-29 05:12:49 +00:00
Tobias Diekershoff b6d265de79 Merge pull request #3667 from annando/probe-warning 
Avoid warnings from probe
 2017-08-29 07:07:21 +02:00
Michael 4bc2076763 Avoid warnings from probe 2017-08-29 04:51:02 +00:00
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