keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19618 commits 4 branches 0 tags 179 MiB
Commit graph

19618 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Philipp Holzer
6973aaefc2 Add Install Mode 
- Added $install_mode in Class App instead
- Extracted the install business logic to a new Class Install
- Replaced all $a->module == 'install' with $a->install_mode
 2018-04-23 22:56:59 +02:00
Andreas Neustifter
6a1ce9c9c0 Fix login dialog layout for frio. 
Rearrange login dialog distinguish better between logging und registering.
 2018-04-23 20:29:55 +00:00
Andreas Neustifter
e5ed2fdede Remove complete section when registering disabled. 
Move out the check so that the complete div containing the register-link is removed.
 2018-04-23 20:29:55 +00:00
Andreas Neustifter
fe74a3d697 Remove empty help spans from templates. 
The empty spans from the templates mess up the layout sometimes, and are useless weight anyway.
Lets get rid of them.
 2018-04-23 20:29:55 +00:00
Andreas Neustifter
2d8a4a923f Fix login dialog layout. 
Rearrange login dialog distinguish better between logging und registering.
 2018-04-23 20:29:55 +00:00
Andreas Neustifter
5d1d0d1a9f Remove empty help spans from templates. 
The empty spans from the templates mess up the layout sometimes, and are useless weight anyway.
Lets get rid of them.
 2018-04-23 20:29:55 +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
Michael Vogel
37e5272f92
Merge pull request #4881 from MrPetovan/task/4867-guess-language-from-plaintext 
Guess language from plaintext
 2018-04-23 00:26:05 +02:00
rabuzarus
763b061a2b frio - Bugfix - there was a wrong user count in admin-users template 2018-04-23 00:26:00 +02:00
Hypolite Petovan
4e9236e9e9
Merge pull request #4907 from rabuzarus/20180421_frio_some_missing_admin_templates 
Frio - rework admin users  and admin  contactblock template to be more consistant with other setting pages
 2018-04-22 18:14:50 -04:00
rabuzarus
12e7b6c3c8
Merge pull request #4906 from MrPetovan/task/content-filter-one-liner 
Move content filter HTML in a template
 2018-04-23 00:14:22 +02:00
Hypolite Petovan
087bfbc6a7 Forgot new line at end of file in templates/wall/content_filter.tpl 2018-04-22 18:13:13 -04:00