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

19340 Commits

Author SHA1 Message Date
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
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
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 H 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
Michael fc60e23314 Added comments / hourly workerqueue deletion 2018-05-15 17:50:29 +00:00
Michael 3e475f3b82 Delete the shadow post when it is the last one 2018-05-15 16:40:13 +00:00
Michael 4a7bf95926 Fix: Delete all item copies if it is an original item 2018-05-15 15:51:58 +00:00
Tobias Diekershoff 0848cef605
Merge pull request #5055 from annando/worker-spawning 
Fix for the slow spawning of workers
 2018-05-15 08:22:33 +02:00
Tobias Diekershoff ba4f9b6136
Merge pull request #5054 from annando/diaspora-comments 
Fix: public comments weren't distributed to the followers.
 2018-05-15 07:30:34 +02:00
Michael 8564eeec4e Fix: public comments weren't distributed to the followers. 2018-05-15 04:33:28 +00:00
Hypolite Petovan 5e2d2e15d6
Merge pull request #5053 from Quix0r/latest-rc 
Fix for "Illegal string offset 'success'"
 2018-05-14 21:39:25 -04:00
Roland Häder e409001dfb
Fixed "constant" result, maybe there is a $ missing? 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-15 03:26:20 +02:00
Hypolite Petovan dd4af5aba7
Merge pull request #5045 from tobiasd/20180514-msg 
regenerated master messages.po file
 2018-05-14 08:15:01 -04:00
Tobias Diekershoff 348ed5d1ba regenerated master messages.po file 2018-05-14 07:12:04 +02:00
Michael f1b5e828db Fix for the slow spawning of workers 2018-05-14 05:02:18 +00:00
Hypolite Petovan f937dabc9e
Merge pull request #5044 from annando/no-feed-reshare 
We mustn't reshare a feed item (only DFRN and Diaspora)
 2018-05-13 18:31:58 -04:00
Michael Vogel 24ef818d0d
Merge pull request #5038 from tobiasd/20180519-3834 
dont delete but remove from your stream
 2018-05-13 22:24:59 +02:00