nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
18838 commits 2 branches 55 tags 148 MiB
Commit graph

18838 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Müller 1d552b5e66
[TASK] Install script: Add installation class 2018-04-18 11:43:23 +02:00
Marcus Müller 96d8591b95
[TASK] Remove auto_install.php 2018-04-18 11:40:16 +02:00
Marcus Müller 791071a1c6
[CLEANUP] Code: Remove function 2018-04-16 14:56:02 +02:00
Marcus Müller 03748ddd64
[FEATURE] Install Script: Add first version 2018-04-16 10:57:27 +02:00
Hypolite Petovan 33d60efd8e
Merge pull request #4822 from annando/issue-4816 
Issue-4816: Avoid SQL errors / Unarchive living relais servers
 2018-04-12 07:13:27 -04:00
Michael Vogel 7e004aab9b
Merge pull request #4821 from tobiasd/20180412-lng 
DE and NL translation updates THX Karel and S.Krumbholz
 2018-04-12 11:03:49 +02:00
Michael Vogel d372014d2e
Merge pull request #4820 from tobiasd/20180412-contactreason 
added missiing information to theme templates
 2018-04-12 11:03:12 +02:00
Michael 4fd4d277f0 Store in lowercase to avoid duplicates 2018-04-12 08:55:36 +00:00
Michael e83e31a968 Merge remote-tracking branch 'upstream/develop' into issue-4816 2018-04-12 08:53:56 +00:00
Tobias Diekershoff 9cadee1d32 DE and NL translation updates THX Karel and S.Krumbholz 2018-04-12 10:41:49 +02:00
Tobias Diekershoff 00311af79b added missiing information to theme templates 2018-04-12 10:33:28 +02:00
Hypolite Petovan 9d928417a1
Merge pull request #4817 from annando/relais-duplicates 
Avoid sending relay posts to servers that already received content
 2018-04-11 19:00:34 -04:00
Hypolite Petovan d934425d62
Merge pull request #4812 from tobiasd/20180411-noreply 
noreply should not be translate-able in email addresses
 2018-04-11 18:59:17 -04:00
Michael 88eaef6704 Merge branch 'issue-4816' of github.com:annando/friendica into issue-4816 2018-04-11 19:21:23 +00:00
Michael edcf1466a7 Relay: Avoid sending relay posts to servers that already received content 2018-04-11 19:01:25 +00:00
Michael 75f97db4ec Issue-4816: Avoid SQL errors / Unarchive living relais servers 2018-04-11 18:56:22 +00:00
Tobias Diekershoff 0cab448ba1 make it unreadable... almost 2018-04-11 14:12:53 +02:00
Hypolite Petovan 98c9aefcbb
Merge pull request #4813 from tobiasd/20180411-homeexample 
added example home css and html file
 2018-04-11 07:58:17 -04:00
Hypolite Petovan fd92343f38
Merge pull request #4811 from tobiasd/20180411-lng3 
translation updates
 2018-04-11 07:55:57 -04:00
Tobias Diekershoff c7969b2f52 more text 2018-04-11 11:25:16 +02:00
Tobias Diekershoff df0430cb48 added example home css and html file 2018-04-11 11:03:18 +02:00
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