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

18972 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
ef8e984c62 noreply should not be translate-able in email addresses 2018-04-11 08:17:44 +02:00
Tobias Diekershoff
4fbea5088a translation updates 2018-04-11 08:02:38 +02:00
Michael Vogel
4a67bc60b0
Merge pull request #4808 from tobiasd/20180410-deis 
Updates to DE and IS translation
 2018-04-10 18:37:48 +02:00
Tobias Diekershoff
3119eabce5 IS translation THX Sveinn í Felli 2018-04-10 18:30:59 +02:00
Tobias Diekershoff
71218ecff9 DE translations THX Copiis 2018-04-10 18:30:17 +02:00
Tobias Diekershoff
9d5abaca1c
Merge pull request #4807 from annando/archival-days 
We can now define the days after a contact is archived
 2018-04-10 14:34:18 +02:00
Michael
869d8ab12d We can now define the days after a contact is archived 2018-04-10 11:10:02 +00:00
Tobias Diekershoff
eaff717696
Merge pull request #4806 from MrPetovan/task/improve-strikethrough-support 
[BBCode] Improve support for strikethrough
 2018-04-10 12:44:40 +02:00
Hypolite Petovan
369518e7b6 [BBCode] Improve support for strikethrough 2018-04-10 06:23:40 -04:00
Hypolite Petovan
d6893a45fe
Merge pull request #4802 from Rudloff/feature/api_get_user 
api_get_user() should not return false right away if the number in the URL is not a valid user
 2018-04-10 05:28:56 -04:00
Pierre Rudloff
f3d98b2864 api_get_user() should not return false right away if the number in the URL is not a valid user 2018-04-10 10:46:10 +02:00
Tobias Diekershoff
799bd75fb2
Merge pull request #4801 from annando/ignore-callstack 
Ignore function "call_user_func_array" in the callstack
 2018-04-10 10:04:25 +02:00
Michael
ea9b4cc523 Ignore function "call_user_func_array" in the callstack 2018-04-10 05:55:36 +00:00
Michael Vogel
8faf5efcad
Merge pull request #4800 from tobiasd/20180410-lng 
Updates to the EN-GB, EN-US and FI-FI translations
 2018-04-10 07:34:53 +02:00
Tobias Diekershoff
6928f0bd02 Updates to the EN-GB, EN-US and FI-FI translations 2018-04-10 07:23:50 +02:00
Michael Vogel
f527e74f97
Merge pull request #4798 from MrPetovan/bug/prevent-empty-uid-in-preloadconfigadapter 
Prevent empty $uid from messing up the PreloadConfigAdapter
 2018-04-10 07:07:10 +02:00
Michael Vogel
c4c0d09744
Merge pull request #4799 from MrPetovan/task/hide-ignored-unfollowed-contact-posts 
Reintroduce own posts in network list
 2018-04-10 06:58:36 +02:00
Hypolite Petovan
20843fee38 Reintroduce own posts in network list 2018-04-09 22:50:03 -04:00
Hypolite Petovan
c7ad76f9ab Prevent empty $uid from messing up the PreloadConfigAdapter 2018-04-09 21:24:22 -04:00
Hypolite Petovan
83c3744628
Merge pull request #4796 from Rudloff/feature/travis 
Enable Travis
 2018-04-09 20:30:59 -04:00
Pierre Rudloff
e695e1060f Regroup old tests in the TextTest class 2018-04-10 02:21:33 +02:00
Hypolite Petovan
31d1a8c6c5
Merge pull request #4797 from annando/dba 
Old database functions had been replaced in the workers
 2018-04-09 19:43:23 -04:00
Michael
08abf65f7b Old database functions had been replaced in the workers 2018-04-09 21:34:23 +00:00
Pierre Rudloff
9a40f17257 Remove old tests 
Add tests for the BaseObject class
 2018-04-09 23:03:29 +02:00
Pierre Rudloff
2c7514d03c Enable Travis 2018-04-09 22:35:05 +02:00
Pierre Rudloff
7d953d952e Various small fixes (#4795) 
* Use strict comparison to avoid 0 == false
* Avoid unecessary loop
* Avoid undefined variable
* Fix wrong variable name
* Don't try to use the $status_info variable if it does not exist
* Avoid undefined variable
* Check that variable is defined before trying to use it
* Don't cast $data array to boolean
* Fix undefined array
* $reactivate_group variable is not always defined
* Variable $found is not always defined
* Remove unused return statement
* Fix undefined array
* api_unique_id_to_nurl() requires an integer as argument
* Don't try to use $uinfo if it is false
* Don't use the same variable names in inner loop
* Throw an exception if $fileext is not defined
 2018-04-09 15:34:53 -04:00
Michael Vogel
74e189039a
Merge pull request #4768 from MrPetovan/task/hide-ignored-unfollowed-contact-posts 
Hide posts from recently ignored/unfollowed contact
 2018-04-09 20:08:20 +02:00
Hypolite Petovan
2f016d4e45
Merge pull request #4794 from Rudloff/feature/return_type 
Return types
 2018-04-09 14:07:27 -04:00
Pierre Rudloff
773591a6ba Add some missing return types 2018-04-09 19:53:02 +02:00
Pierre Rudloff
4b36f3ad05 api_format_data() seems to never return an object 2018-04-09 19:34:09 +02:00
Hypolite Petovan
b684a74449
Merge pull request #4793 from Rudloff/feature/datatypes 
Throw a ForbiddenException if api_get_user() returns false
 2018-04-09 13:13:59 -04:00
Pierre Rudloff
9cde7881ee Throw a ForbiddenException if api_get_user() returns false 2018-04-09 18:52:38 +02:00
Hypolite Petovan
99b446eccc Remove useless intval() calls in mod/network 2018-04-09 09:19:49 -04:00
Hypolite Petovan
eea32ede5c
Merge pull request #4792 from ben-utzer/patch-1 
Improvement for the systemd timer unit
 2018-04-09 09:17:32 -04:00
utzer
a4f469d187
RemainAfterElapse=False 
> if RemainAfterElapse= is off, it might be started again if it is already elapsed, and thus be triggered multiple times
False will start the process again and again after the set time, this is the desired behavior for worker.php

Infos: https://www.freedesktop.org/software/systemd/man/systemd.timer.html
 2018-04-09 18:42:02 +05:30
Michael Vogel
785ef70e5d
Merge pull request #4789 from tobiasd/20180409-lng 
updated translations
 2018-04-09 10:53:16 +02:00
Tobias Diekershoff
ca3325bcbb updated translations 2018-04-09 10:17:25 +02:00
Tobias Diekershoff
66bcbe210a
Merge pull request #4788 from annando/more-relay 
Relay: Avoid empty tags / Always use the "relay account"
 2018-04-09 08:31:43 +02:00
Michael
105f3ca747 Relay: Avoid empty tags / Always use the "relay account" 2018-04-09 05:53:23 +00:00
Hypolite Petovan
7563adcc7d Use positive form for relationship check in mod/network 2018-04-08 20:47:16 -04:00
Hypolite Petovan
a2607ea00a
Merge pull request #4785 from annando/magiclink 
The magic link is added at more places
 2018-04-08 20:38:33 -04:00
Michael
5c2b54009e The magic link is added at more places 2018-04-08 19:17:50 +00:00
Alexandre Alapetite
e860cdf6a8 Swap if / elseif 
https://github.com/friendica/friendica/pull/4782#discussion_r179947984
 2018-04-08 16:02:25 +02:00
Hypolite Petovan
b28fd98acd Replaced < comparison with IN for contact.rel in mod/network 2018-04-08 09:59:43 -04:00
Alexandre Alapetite
82f1f2f00e Remove SQL column legacy_password 2018-04-08 14:53:12 +02:00
Alexandre Alapetite
cb26cd6d5d Remove legacy_password test 2018-04-08 14:42:18 +02:00
Hypolite Petovan
fa7bed8929
Merge pull request #4783 from annando/queue-relay 
Don't queue relay posts
 2018-04-08 08:35:36 -04:00
Alexandre Alapetite
129f6806f6 Fix update password rehash 
Fixes https://github.com/friendica/friendica/issues/4743
The logic for updating password was wrong:
b0a764b14c (diff-1466bb1a0a37fe9f7cf52eda8f3b431aR150)
 2018-04-08 12:40:35 +02:00
Michael Vogel
b2520bc48e
Merge pull request #4780 from tobiasd/20180408-pl 
update for PL translation THX waldis
 2018-04-08 12:36:56 +02:00
Michael
a75858f02c Don't queue relay posts 2018-04-08 09:46:47 +00:00