Commit graph

18800 commits

Author SHA1 Message Date
Michael Vogel
707588ee0e
Merge pull request #4701 from tobiasd/20180328-msg
regenerated the master messages.po file
2018-03-28 09:32:40 +02:00
Tobias Diekershoff
e4ff071e8b regenerated master messages.po file 2018-03-28 08:45:50 +02:00
Tobias Diekershoff
acb1a082b9 messages.po output file needs to be in /util 2018-03-28 08:45:42 +02:00
Tobias Diekershoff
26be334dc1
Merge pull request #4698 from annando/direct-relay
Direct transfer without a relay is now possible
2018-03-28 08:36:44 +02:00
Michael
17a6cb18b8 Relais settings are added to admin backend 2018-03-28 06:16:46 +00:00
Michael Vogel
b969df89b2
Merge pull request #4700 from tobiasd/20180328-translationdocs
translation docs updated with a note, that the console tool has to be called from the base directory of the Friendica installation
2018-03-28 07:42:12 +02:00
Michael Vogel
9cf73e2a5c
Merge pull request #4699 from tobiasd/20180328-pl
update to the PL translation THX waldis
2018-03-28 07:41:35 +02:00
Tobias Diekershoff
8d53fed096 translation docs updated with a note, that the console tool has to be called from the base directory of the Friendica installation 2018-03-28 07:20:46 +02:00
Tobias Diekershoff
34318666cd update to the PL translation THX waldis 2018-03-28 07:07:56 +02:00
Michael
bfd057f148 Direct transfer without a relay is now possible 2018-03-28 04:24:38 +00:00
Hypolite Petovan
6102a16613
Merge pull request #4693 from annando/doxygen-relay
Forgotten doxygen header
2018-03-27 11:24:38 -04:00
Michael
7868de529e Forgotten doxygen header 2018-03-27 15:12:19 +00:00
Hypolite Petovan
5e5fde0a63
Merge pull request #4692 from Rudloff/patch-1
Update CHANGELOG
2018-03-27 11:01:22 -04:00
Pierre Rudloff
b73178115e
Update CHANGELOG
Small typo in my name 😜
2018-03-27 16:58:24 +02:00
Hypolite Petovan
27155fead7
Merge pull request #4691 from annando/relais-discovery
Added server discovery for their relais configuration
2018-03-27 08:50:27 -04:00
Hypolite Petovan
7c63563e1c
Merge pull request #4690 from annando/no-async
Asynchronous Javascript is deactivated
2018-03-27 08:48:11 -04:00
Michael
8bdd417b04 Asynchronous Javascript is deactivated 2018-03-27 05:45:56 +00:00
Hypolite Petovan
35e18e9e1e
Merge pull request #4686 from annando/no-warn-app
Avoid the warning of an unitialized variable in .htconfig.php
2018-03-26 20:44:53 -04:00
Hypolite Petovan
5a6b846445
Merge pull request #4687 from annando/fix-relay
Fix sending messages to relay servers
2018-03-26 20:40:44 -04:00
Michael
bc03c8846c Fix sending messages to relay servers 2018-03-26 23:39:59 +00:00
Michael
b48df6a828 Avoid the warning of an unitialized variable in .htconfig.php 2018-03-26 20:58:34 +00:00
Michael
00c444a699 Only update when changed 2018-03-26 06:17:50 +00:00
Michael
6b84cb9715 Only add tags in the "tags" scope 2018-03-26 06:11:55 +00:00
Michael
e65bd0325e Added server discovery for their relais configuration 2018-03-26 05:44:53 +00:00
Tobias Diekershoff
25981e8a22
Update issue_template.md 2018-03-26 06:48:16 +02:00
Michael Vogel
bfc2bda9b6
Merge pull request #4682 from MrPetovan/task/4681-nsfw-add-hashtag-only-hiding
Move suppress_tags config usage to template
2018-03-25 22:26:17 +02:00
Hypolite Petovan
2fa5e7be0a
Merge pull request #4685 from annando/fix-event
Bugfix: Prevent "Uncaught TypeError"
2018-03-25 15:10:37 -04:00
Michael
dece06c571 Bugfix: Prevent "Uncaught TypeError: Argument 1 passed to Friendica\Model\Event::formatListForExport() must be of the type array, object given" 2018-03-25 18:56:35 +00:00
Tobias Diekershoff
8329c48511
Merge pull request #4684 from annando/missing-avatar
Using the default avatar when no avatar was found for the self contact
2018-03-25 19:54:32 +02:00
Michael
402c0fc770 Using the default avatar when no avatar was found for the self contact 2018-03-25 17:26:40 +00:00
Tobias Diekershoff
cec0fc189f
Update issue_template.md 2018-03-25 18:32:56 +02:00
Tobias Diekershoff
1a186d88b9
Update issue_template.md 2018-03-25 18:10:07 +02:00
Tobias Diekershoff
4fb258a97e
added template for issues at github 2018-03-25 17:42:26 +02:00
Hypolite Petovan
30113dd6ef
Merge pull request #4683 from annando/update-self
The "self" contact is now updated at a central place
2018-03-25 09:25:10 -04:00
Michael Vogel
2c00e3ad36
Merge pull request #4680 from MrPetovan/bug/4669-check-getInfoFromURL-parameter
Check Image::getInfoFromURL parameter
2018-03-25 10:39:17 +02:00
Michael
ad3e4b894e Update the public contact 2018-03-25 08:20:13 +00:00
Michael
abb49150db Update the avatar 2018-03-25 08:15:22 +00:00
Hypolite Petovan
daffc27061 Move suppress_tags config to template
- Add new item.suppress_tags template variable
- Fix template formatting
2018-03-25 00:38:23 -04:00
Hypolite Petovan
09f04c1985 Add Image::getInfoFromURL return check 2018-03-24 20:03:55 -04:00
Hypolite Petovan
13f58abe05 Add parameter check in Image::getInfoFromURL 2018-03-24 20:03:28 -04:00
Hypolite Petovan
7f3db49742
Merge pull request #4679 from annando/issue-4673
Issue 4673: Avoid "Incorrect date value: '0000-00-00' for column 'bd'"
2018-03-24 18:59:04 -04:00
Michael
a0451e1c62 Merge remote-tracking branch 'upstream/develop' into update-self 2018-03-24 22:50:14 +00:00
Michael
e8e6436f08 Issue 4673: Avoid "Incorrect date value: '0000-00-00' for column 'bd'" 2018-03-24 22:27:04 +00:00
Hypolite Petovan
bcf9fa147e
Merge pull request #4678 from annando/issue-4666
Fix: No "not null" when text is replaced by varchar
2018-03-24 18:09:21 -04:00
Michael
5bca333bf0 Fix: No "not null" when text is replaced by varchar 2018-03-24 21:57:50 +00:00
Michael Vogel
b8ffa1dec7
Merge pull request #4677 from MrPetovan/bug/4670-fix-po2php-command
Revert po2php command "fix"
2018-03-24 22:43:55 +01:00
Hypolite Petovan
11e68b70bb Fix number constant used in Console\PoToPhp 2018-03-24 16:09:19 -04:00
Hypolite Petovan
91eb644743 Fix formatting in Console\PoToPhp 2018-03-24 16:08:56 -04:00
Hypolite Petovan
641bd5eaa6
Merge pull request #4674 from annando/acl-fix
Fix the ACL problem issue 4616
2018-03-24 15:48:02 -04:00
Michael
341499e8ca standards 2018-03-24 19:40:35 +00:00