Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-26 03:20:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
19068 commits 3 branches 64 tags 237 MiB
Commit graph

19068 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan
a9f1f47be2
Merge pull request #4931 from annando/no-ignored 
Don't distribute for ignored contacts
 2018-04-25 12:07:00 -04:00
Michael
66547e5107 Don't distribute for ignored contacts 2018-04-25 16:00:21 +00:00
Hypolite Petovan
801a13aa10
Merge pull request #4915 from M-arcus/patch-4 
[DOCS] Docs: Minor improvements
 2018-04-25 08:06:04 -04:00
Marcus Müller
ce52f40bdc [DOCS] Fix intendation 2018-04-25 11:29:56 +02:00
Hypolite Petovan
d49df631fb
Merge pull request #4929 from annando/diaspora-rework 
Improvements for the Diaspora protocol
 2018-04-24 14:56:35 -04:00
Michael
ad45a73bf3 Improvements for the Diaspora protocol 2018-04-24 18:34:35 +00:00
Hypolite Petovan
c8cc8e57c2
Merge pull request #4925 from rabuzarus/20180424_-_frio_invite_template 
frio - provide a template for invite page
 2018-04-24 11:37:10 -04:00
rabuzarus
ac753e3320 frio - provide a template for invite page 2018-04-24 17:33:48 +02:00
Hypolite Petovan
8d8aef5624
Merge pull request #4924 from annando/item-distribution 
Item distribution is now done via the public post
 2018-04-24 11:00:14 -04:00
Michael
5019d46071 We only need the uid 2018-04-24 14:58:39 +00:00
Michael
5cf745af44 Item distribution is now done via the public post 2018-04-24 13:21:25 +00:00
Marcus Müller
008f2a2ec7 [DOCS] Hooks: Add hooks intendation to german docs 2018-04-24 13:25:06 +02:00
Marcus Müller
7ac4b17c80 [DOCS] Hooks: Add empty line 2018-04-24 13:21:16 +02:00
Marcus Müller
81d636d05d [DOCS] Titles: Fix spaces 2018-04-24 13:20:44 +02:00
Michael Vogel
1f48373c51
Merge pull request #4922 from tobiasd/20180424-lng 
update FI translations THX Kris
 2018-04-24 10:03:04 +02:00
Tobias Diekershoff
c458a12135 update FI translations THX Kris 2018-04-24 07:58:31 +02:00
Michael
7230cc0bed Merge remote-tracking branch 'upstream/develop' into item-distribution 2018-04-24 04:23:38 +00:00
Tobias Diekershoff
e51a017d92
Merge pull request #4917 from annando/show-private-forums 
Show private forums in the sidebar
 2018-04-23 18:47:21 +02:00
Michael
c3ee596ff4 Show private forums in the sidebar 2018-04-23 16:41:00 +00:00
Marcus Müller
efdb7a3835
[DOCS] Addons: Restructure hooks 2018-04-23 17:20:16 +02:00
Hypolite Petovan
a66e9b81ba
Merge pull request #4873 from astifter/develop 
Remove pagination when empty, move new Member Tips and use common widget to find people.
 2018-04-23 10:23:21 -04:00
Hypolite Petovan
2f024a3a6d
Merge pull request #4913 from tobiasd/20180423-phpunit 
phpunit compat 5.6 vs 7.x
 2018-04-23 08:00:13 -04:00
Tobias Diekershoff
2f6a898b62
Merge pull request #4916 from M-arcus/patch-5 
[DOCS] Installation: Fix small errors
 2018-04-23 13:49:24 +02:00
Michael
ba35b19af6 Public federated items now always are having an entry with "uid=0" 2018-04-23 11:14:25 +00:00
Marcus Müller
78a974ad41
[DOCS] Installation: Fix multiple sentences 2018-04-23 12:24:47 +02:00
Marcus Müller
70d11d377b
[DOCS] Installation: Fix title 2018-04-23 12:22:39 +02:00
Tobias Diekershoff
c66c09d5fd
Merge pull request #4914 from AndyHee/doc20180423 
Update Profiles.md
 2018-04-23 12:03:28 +02:00
Marcus Müller
6599898774
[DOCS] Account docs: Fix titles 2018-04-23 11:45:44 +02:00
Andy H3
3ac43f73c3
Update Profiles.md 2018-04-23 16:43:52 +07:00
Tobias Diekershoff
bcc298204e use strlen instead of count(php7.2 fails) 2018-04-23 09:37:56 +02:00
Tobias Diekershoff
6e313736f4 remove comment 2018-04-23 09:37:06 +02:00
Tobias Diekershoff
f1535c0f01 use strlen instead of count as above (php7.2 fails) 2018-04-23 09:35:12 +02:00
Tobias Diekershoff
61a380975b there are more then 1 test ATM 2018-04-23 08:53:46 +02:00
Tobias Diekershoff
c31a54175d comment out use clause 2018-04-23 08:47:42 +02:00
Tobias Diekershoff
0a58637ace phpunit compat 5.6 vs 7.x 2018-04-23 08:42:13 +02:00
Hypolite Petovan
a25c07b162
Merge pull request #4912 from annando/archivecontacts 
Added console command to manually archive contacts
 2018-04-23 02:07:53 -04:00
Michael
b3d24f0ff2 DFRN: mark for archival at different places 2018-04-23 06:03:55 +00:00
Hypolite Petovan
aa6584684e
Merge pull request #4911 from tobiasd/20180423-travis 
travis indentation
 2018-04-23 01:49:16 -04:00
Tobias Diekershoff
125f0df473 travix indentation 2018-04-23 07:42:48 +02:00
Michael
866fbb4d80 Added console command to manually archive contacts 2018-04-23 05:33:47 +00:00
Hypolite Petovan
3f3456efde
Merge pull request #4910 from tobiasd/20180423-lng 
translation updates DE and FI
 2018-04-23 01:32:15 -04:00
Tobias Diekershoff
82bf2d984e update DE translations 2018-04-23 07:13:10 +02:00
Tobias Diekershoff
fa38089a95 update FI translations THX Kris 2018-04-23 07:13:02 +02:00
Michael Vogel
b1a668a3ea
Merge pull request #4909 from MrPetovan/bug/4898-fix-php-72-warnings 
Fix PHP 7.2 warnings
 2018-04-23 06:50:21 +02:00
Hypolite Petovan
00985fe340 Fix self warning in Util\Temporal 2018-04-23 00:03:27 -04:00
Hypolite Petovan
9b052b5ea8 Fix count() warning in Object\Post 2018-04-23 00:02:18 -04:00
Hypolite Petovan
b0564ea40d Fix count() warning in Model\Profile 
- Replace x() calls with empty() in Profile::load
- Remove extraneous $a->page['aside'] initialization
 2018-04-23 00:01:46 -04:00
Hypolite Petovan
da4892b4d2 Fix count() warning in mod/friendica 
- Add default value for Config call
 2018-04-23 00:00:29 -04:00
Hypolite Petovan
a84477ed2d Fix count() warning in include/dba.php 2018-04-23 00:00:06 -04:00
Michael Vogel
0ff51c2b13
Merge pull request #4908 from rabuzarus/20180421_frio_some_missing_admin_templates 
frio - Bugfix - there was a wrong user count in admin-users template
 2018-04-23 00:32:52 +02:00