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

19751 Commits

Author SHA1 Message Date
Hypolite Petovan f54c032e87
Merge pull request #5128 from tobiasd/20180525-5067 
exchange help text
 2018-05-25 16:22:45 -04:00
Tobias Diekershoff 9041bacebf exchange help text 2018-05-25 20:32:48 +02:00
Tobias Diekershoff e996354922 Opt-In to listing in the directory 2018-05-25 19:53:03 +02:00
Tobias Diekershoff b317db0c10 fixed 4146 2018-05-25 18:06:16 +02:00
Hypolite Petovan d51a98b3fe
Merge pull request #5122 from tobiasd/20180525-4146 
applying changes to mods/sample-nginx.config from #5019
 2018-05-25 11:10:16 -04:00
Hypolite Petovan 4aa46272a9
Merge pull request #5123 from rabuzarus/20180526_-_load_correct_theme 
Bugfix: compute the current theme each time we want to know which theme is beeing used
 2018-05-25 08:14:03 -04:00
Tobias Diekershoff 6e02c0e908 hopefully fixing indentation... 2018-05-25 13:56:54 +02:00
Hypolite Petovan 3f133292eb
Merge pull request #5124 from tobiasd/20180525-lng 
IS and PL translation updates
 2018-05-25 07:05:48 -04:00
Tobias Diekershoff 9970618e85 translations 2018-05-25 11:26:36 +02:00
rabuzarus c66d1f01a3 add missing database use statements 2018-05-25 09:05:16 +02:00
Tobias Diekershoff 5c6b9cb64a update IS translations THX Sveinn í Felli 2018-05-25 08:58:00 +02:00
Tobias Diekershoff 22e78c1bed update PL translations THX waldis 2018-05-25 08:56:34 +02:00
rabuzarus f013625382 fix typo in comment 2018-05-25 08:52:03 +02:00
rabuzarus 8174bfeb2b Bugfix: compute the current theme each time we want to know which theme is beeing used 2018-05-25 08:44:01 +02:00
Tobias Diekershoff 132653ac56 applying changes to mods/sample-nginx.config from #5019 2018-05-25 08:22:49 +02:00
Michael de609e49f0 Improved logging 2018-05-24 22:00:54 +00:00
Michael f8230badba Avoid problems with better variable naming 2018-05-24 21:46:57 +00:00
Michael 1bce39120d Reconnect after the connection had been lost. 2018-05-24 21:19:59 +00:00
Tobias Diekershoff 9712be38ee 4655 hopefully fixed as well 2018-05-24 08:18:42 +02:00
Tobias Diekershoff df6183aebf 2 issues fixed 2018-05-24 07:54:19 +02:00
Tobias Diekershoff e814e805c5
Merge pull request #5119 from MrPetovan/task/5116-remove-dns-get-record-from-dba 
Remove obsolete DNS test from include/dba
 2018-05-24 07:53:25 +02:00
Hypolite Petovan b0155fe37b Remove obsolete DNS test from include/dba 2018-05-24 01:31:03 -04:00
Hypolite Petovan e9dbf55400
Merge pull request #5117 from annando/issue-5010 
Issue 5010: Don't show removed users
 2018-05-24 00:51:31 -04:00
Michael 4a67919be7 Issue 5010: Don't show removed users 2018-05-24 04:44:02 +00:00
Michael 87b5e26063 Do a hard exit when the SQL connection went down 2018-05-24 04:07:39 +00:00
Tobias Diekershoff 6f78422a49 use correct nick 2018-05-23 14:42:55 +02:00
Tobias Diekershoff a57e5398d6 13th draft, forgotten unsupported addons, newly closed issues 2018-05-23 11:02:23 +02:00
Hypolite Petovan 44caf05f06
Merge pull request #5110 from annando/nodeinfo 
Nodeinfo: The number of comments is now calculated more reliable
 2018-05-22 17:20:06 -04:00
Hypolite Petovan e1fcebe791
Merge pull request #5112 from annando/issue-5111 
Issue 5111: missing "use DBM" in "removeme"
 2018-05-22 17:16:03 -04:00
Michael 5430354f54 Issue 5111: missing "use DBM" in "removeme" 2018-05-22 20:17:32 +00:00
Michael 89a20ddbd7 Nodeinfo: The number of comments is now calculated more reliable 2018-05-22 20:10:18 +00:00
Tobias Diekershoff 3e51a23bd5
Merge pull request #5109 from rabuzarus/20180522_-_frio_nav_about_instance 
frio - add "info about the instance" link into the navbar for non-authed users
 2018-05-22 15:10:44 +02:00
Michael Vogel ddf5bd6093
Merge pull request #5108 from tobiasd/20180522-lng 
update DE translations THX hauke
 2018-05-22 13:04:27 +02:00
rabuzarus 0d7d688649 frio - add "info about the instance" link into the navbar for non-authed users 2018-05-22 12:44:35 +02:00
Tobias Diekershoff 5b8ebbd556 reorganized the addon section 2018-05-22 08:44:34 +02:00
Tobias Diekershoff 5de562d381 update DE translations THX hauke 2018-05-22 07:12:43 +02:00
Hypolite Petovan 8779f22b5f
Merge pull request #5106 from tobiasd/20180521-en 
EN US and GB translation updates THX AndyH3
 2018-05-21 10:55:36 -04:00
Tobias Diekershoff 8fd9916aa5 EN US and GB translation updates THX AndyH3 2018-05-21 16:08:07 +02:00
Tobias Diekershoff df17038ee2
Merge pull request #5105 from annando/dont-proxy 
Don't proxy pictures when they are sent to other networks
 2018-05-21 13:00:49 +02:00
Michael df531cd400 Don't proxy pictures when they are sent to other networks 2018-05-21 10:15:50 +00:00
Tobias Diekershoff 2473a954ca added changes frim the overlap time 3.6rc/develop 2018-05-21 11:09:32 +02:00
Tobias Diekershoff f790bfca85 typo 2018-05-21 10:51:33 +02:00
Michael Vogel f7e6178fd3
Merge pull request #5103 from tobiasd/20180521-ru 
RU translations THX pztrn
 2018-05-21 08:47:42 +02:00
Michael Vogel 458c0511f2
Merge pull request #5102 from tobiasd/20180521-tos 
forgot to rename vars in TOS template
 2018-05-21 08:46:47 +02:00
Tobias Diekershoff 42fe83d3ff RU translations 2018-05-21 07:33:22 +02:00
Tobias Diekershoff 1d78fa9645 RU translations THX pztrn 2018-05-21 07:31:35 +02:00
Tobias Diekershoff becd9b4879 forgot to rename vars in TOS template 2018-05-21 06:02:49 +02:00
Tobias Diekershoff a110bcde72 more translations done 2018-05-20 19:39:59 +02:00
Hypolite Petovan a0a4074de6
Merge pull request #5098 from tobiasd/20180520-msg 
translation update DE, FR, FI, PL
 2018-05-20 12:34:48 -04:00
Tobias Diekershoff a4d11db74e update PL translations THX waldis 2018-05-20 18:11:42 +02:00