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

19762 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
be469f6bca Fix for subscribing to the wrong feed from OStatus 2018-05-18 13:23:27 +00:00
Hypolite Petovan
83ff57777f
Merge pull request #5079 from annando/fix-self 
Fix: Sometimes the contact endpoints seem to be wrong
 2018-05-18 08:54:00 -04:00
Hypolite Petovan
599551ba51
Merge pull request #5080 from annando/changed-structure 
Changed database structure
 2018-05-18 08:53:37 -04:00
Michael
0374b0be6a Changed database structure 2018-05-18 12:50:57 +00:00
Hypolite Petovan
2b0d37b7d0
Merge pull request #5078 from annando/fix-ostatus-subscription 
Fix: Subscriptions from GNU Social partially don't work
 2018-05-18 08:27:31 -04:00
Michael
8983c61023 Fix: Sometimes the contact endpoints seem to be wrong 2018-05-18 12:26:10 +00:00
Michael
feb3d76a5b Fix: Subscriptions from GNU Social partially don't work 2018-05-18 12:18:12 +00:00
Hypolite Petovan
13ae3436b6
Merge pull request #5076 from tobiasd/20180517-extract 
dont parse the addons directory for translateable strings
 2018-05-17 19:59:57 -04:00
Hypolite Petovan
1d2b0c0a81
Merge pull request #5077 from annando/fix-blocking-ostatus 
Fix to OStatus delivery to be not so blocking to other tasks
 2018-05-17 19:59:08 -04:00
Michael
4355014492 Now it should work ... 2018-05-17 23:47:15 +00:00
Michael
f4a71b76dd Dynamic priority handling 2018-05-17 23:43:44 +00:00
Michael
6a8c85fac4 Changed database structure 2018-05-17 23:35:24 +00:00
Michael
61824119e4 Moved functionality in new model class 2018-05-17 23:30:49 +00:00
Michael
5a1e1c1ec9 Fix to OStatus delivery to be not so blocking to other tasks 2018-05-17 22:17:03 +00:00
Tobias Diekershoff
fb4f9eb875 dont parse the addons directory for translateable strings 2018-05-17 22:41:06 +02:00
Hypolite Petovan
f764adef5a
Merge pull request #5073 from tobiasd/20180517-msg 
regen master messages.po
 2018-05-17 11:40:19 -04:00
Tobias Diekershoff
2ec8bf24b3 regen master messages.po 2018-05-17 16:58:51 +02:00
Tobias Diekershoff
41b7d75cca
Merge pull request #5072 from Alkarex/ru-plural-intval-bug 
i18n ru intval bug
 2018-05-17 09:43:25 +02:00
Alexandre Alapetite
102377f19f Rebuild PO to strings 
```sh
for i in view/lang/*/messages.po; do bin/console po2php $i; done
```
 2018-05-17 09:31:29 +02:00
Alexandre Alapetite
f980516545 Fix PoToPhp 
https://github.com/friendica/friendica/pull/5072#issuecomment-389754406
 2018-05-17 08:12:55 +02:00
Tobias Diekershoff
ac67f3c154
Merge pull request #5071 from annando/fix-duplicated-posts 
Bugfix: Only send a notifier when the item was really edited
 2018-05-17 07:59:56 +02:00
Alexandre Alapetite
2a9d364bb7 i18n ru intval bug 
Should fix: Got error 'PHP message: PHP Warning:  A non-numeric value
encountered in /home/alex/public_html/f.a80.fr/view/lang/ru/strings.php
on line 5\n

PHP 7.2.5 / Ubuntu 18.04 LTS
 2018-05-17 07:57:55 +02:00
Michael
b333c7ae2e Bugfix: Only send a notifier when the item was really edited 2018-05-17 05:49:55 +00:00
Tobias Diekershoff
e107fae8e8
Merge pull request #5070 from Alkarex/sizeof-bug 
sizeof bug
 2018-05-17 07:43:18 +02:00
Alexandre Alapetite
e7d2d27938 sizeof bug 
sizeof cannot be used to test existance.

Fixes: Got error 'PHP message: PHP Warning:  sizeof(): Parameter must be
an array or an object that implements Countable in
/.../include/items.php on line 66\n':  1 Time(s)

PHP 7.2.5 / Ubuntu 17.04 LTS
 2018-05-17 07:37:50 +02:00
Hypolite Petovan
c9bca54228
Merge pull request #5069 from Quix0r/tickets/4965 
Changed tooltip from #4965
 2018-05-16 21:02:46 -04:00
Roland Häder
dd18cf8de5
Fixes for #4965: 
- updated messages.po file

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-17 02:27:30 +02:00
Roland Häder
d1783e9aeb
Fixes for #4965: 
- better descriptive tooltip for adding/removing contact from/to group

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-17 02:24:42 +02:00
Hypolite Petovan
b1c38641cd
Merge pull request #5068 from Quix0r/fixes/rc-openid-login 
OpenId possibly fixed
 2018-05-16 18:42:43 -04:00
Roland Häder
6129eb1623
OpenId possibly fixed: 
- The LightOpenId class' constructor now requires the hostname from where the
  requested started, added it now
- sometimes need to invoke get_app() as $a was not around

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-17 00:24:25 +02:00
Hypolite Petovan
ce75177d4e
Merge pull request #5022 from Rudloff/feature/test_api 
Add API tests
 2018-05-16 08:25:11 -04:00
Michael Vogel
e8e93768db
Merge pull request #5065 from tobiasd/2018.05-rc 
added link to the TOS page if it is activated
 2018-05-16 14:21:24 +02:00
Tobias Diekershoff
f285d9c7eb add link to TOS in frios registration template if enabled 2018-05-16 13:41:56 +02:00
Pierre Rudloff
e7fceb8e61 Make DatabaseTest::getConnection() return the correct database name to PHPUnit 2018-05-16 13:15:28 +02:00
Pierre Rudloff
f3ca3b2bd5 Add some explanation in DatabaseTest::getConnection() 2018-05-16 13:14:50 +02:00
Pierre Rudloff
f7064be41f Remove useless line breaks in DatabaseTest 2018-05-16 13:09:05 +02:00
Pierre Rudloff
5ece452a32 Remove unused class import in DatabaseTest 2018-05-16 13:08:17 +02:00
Tobias Diekershoff
eec0826750 added link to the TOS page if it is activated 2018-05-16 11:57:06 +02:00
Tobias Diekershoff
dcc8274353
Merge pull request #5064 from annando/followup-pr-5060 
Follow up to PR 5060: Missing index update
 2018-05-16 11:12:17 +02:00
Michael
3b2752c2fe Follow up to PR 5060: Missing index update 2018-05-16 08:59:15 +00:00
Hypolite Petovan
f11b6c131e
Merge pull request #5061 from AndyHee/2018.05-rc 
Update sample-nginx.config
 2018-05-16 00:26:20 -04:00
Andy H3
e22f7a3c31
Update sample-nginx.config 
Updated default path to PHP7.0

PHP5.0 is not considered standard any more.
 2018-05-16 11:10:19 +07:00
Hypolite Petovan
c3a532a9f6
Merge pull request #5060 from annando/item-delete 
item deletion now works again
 2018-05-15 23:56:23 -04:00
Michael
84248ac4c1 Grammar stuff 2018-05-16 03:54:08 +00:00
Michael
c9f55f6b3d Show "Remove from your screen" or "delete" depending of the impact of the deletion 2018-05-15 21:06:34 +00:00
Michael
e77cd17495 We do the notify stuff now directly in the item class 2018-05-15 19:50:29 +00:00
Michael
fe8a4d50c8 Merge branch 'item-delete' of github.com:annando/friendica into item-delete 2018-05-15 19:31:05 +00:00
Michael
4a1bbd114c Lower priority for "remote self" 2018-05-15 19:29:14 +00:00
Michael
82937189ba Only delete undeleted items 2018-05-15 19:25:35 +00:00
Hypolite Petovan
db3bcd8ac6
Merge pull request #5059 from tobiasd/20180515-fixdev 
revertig file movements
 2018-05-15 13:53:31 -04:00