clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,772 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

18772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hypolite Petovan 586b0b6e57 Add bash to text_highlight language list 2018-03-29 19:29:09 -04:00
Hypolite Petovan 8a2d41e53f
Merge pull request #4711 from rabuzarus/20180329_-_cropperjs 
update javascript cropper library
 2018-03-29 14:40:51 -04:00
rabuzarus 515ef66c52 cropperjs: fix composer.lock 2018-03-29 20:30:26 +02:00
rabuzarus 4efa2109ee cropperjs: use npm-asset for composer 2018-03-29 18:39:26 +02:00
rabuzarus 51841ab148 cropperjs: fix indention 2018-03-29 18:06:56 +02:00
rabuzarus 34204ca580 update javascript cropper library 2018-03-29 17:57:06 +02:00
Hypolite Petovan 5f40b306b8
Merge pull request #4707 from tobiasd/20180329-vagrant 
make sure that the VM has php-zip installed that is needed by composer
 2018-03-29 08:07:44 -04:00
Hypolite Petovan 1db6c42aa8
Merge pull request #4706 from tobiasd/20180329-installation 
added a hint to the htconfig file
 2018-03-29 08:07:20 -04:00
Tobias Diekershoff 399344a1f8 make sure that the VM has php-zip installed that is needed by composer 2018-03-29 12:06:16 +02:00
Tobias Diekershoff 2cc2b886b2 little wording change 2018-03-29 11:49:40 +02:00
Tobias Diekershoff 1cd18b6bf9 prevent nun-configured node due copying htconfig.php files 2018-03-29 11:40:45 +02:00
Tobias Diekershoff 4326fa4e19
Merge pull request #4704 from MrPetovan/bug/4608-hashtag-autocomplete-ci 
Make hashtag autocomplete case-insensitive
 2018-03-29 09:41:30 +02:00
Hypolite Petovan f84c8d665a
Merge pull request #4705 from tobiasd/20180329-de 
update to the DE and PL translation
 2018-03-29 02:12:18 -04:00
Tobias Diekershoff 5eedaabdde update for PL translation THX waldis 2018-03-29 07:24:45 +02:00
Tobias Diekershoff 99244f383e update for DE translation 2018-03-29 07:23:56 +02:00
Tobias Diekershoff 07954f7bcf typo 2018-03-29 06:57:02 +02:00
Hypolite Petovan 84b4ff58b6 Make Hashtag autocomplete case-insensitive 2018-03-29 00:47:27 -04:00
Hypolite Petovan a5bb8f4e7d Strip strtolower from Module\Hashtag 2018-03-29 00:47:14 -04:00
rabuzarus 6dc6581aca
Merge pull request #4702 from annando/sql-fix 
Fixed SQL query
 2018-03-28 13:43:17 +02:00
Tobias Diekershoff 752a9f4b08
Merge pull request #4703 from annando/fix-relocation 
A relocation hadn't changed the hostname
 2018-03-28 10:42:33 +02:00
Michael 9bfc7bf584 A relocation hadn't changed the hostname 2018-03-28 08:09:45 +00:00
Michael 2465bbaac8 Fixed SQL query 2018-03-28 08:04:20 +00:00
Michael Vogel 707588ee0e
Merge pull request #4701 from tobiasd/20180328-msg 
regenerated the master messages.po file
 2018-03-28 09:32:40 +02:00
Tobias Diekershoff e4ff071e8b regenerated master messages.po file 2018-03-28 08:45:50 +02:00
Tobias Diekershoff acb1a082b9 messages.po output file needs to be in /util 2018-03-28 08:45:42 +02:00
Tobias Diekershoff 26be334dc1
Merge pull request #4698 from annando/direct-relay 
Direct transfer without a relay is now possible
 2018-03-28 08:36:44 +02:00
Michael 17a6cb18b8 Relais settings are added to admin backend 2018-03-28 06:16:46 +00:00
Michael Vogel b969df89b2
Merge pull request #4700 from tobiasd/20180328-translationdocs 
translation docs updated with a note, that the console tool has to be called from the base directory of the Friendica installation
 2018-03-28 07:42:12 +02:00
Michael Vogel 9cf73e2a5c
Merge pull request #4699 from tobiasd/20180328-pl 
update to the PL translation THX waldis
 2018-03-28 07:41:35 +02:00
Tobias Diekershoff 8d53fed096 translation docs updated with a note, that the console tool has to be called from the base directory of the Friendica installation 2018-03-28 07:20:46 +02:00
Tobias Diekershoff 34318666cd update to the PL translation THX waldis 2018-03-28 07:07:56 +02:00
Michael bfd057f148 Direct transfer without a relay is now possible 2018-03-28 04:24:38 +00:00
Hypolite Petovan 6102a16613
Merge pull request #4693 from annando/doxygen-relay 
Forgotten doxygen header
 2018-03-27 11:24:38 -04:00
Michael 7868de529e Forgotten doxygen header 2018-03-27 15:12:19 +00:00
Hypolite Petovan 5e5fde0a63
Merge pull request #4692 from Rudloff/patch-1 
Update CHANGELOG
 2018-03-27 11:01:22 -04:00
Pierre Rudloff b73178115e
Update CHANGELOG 
Small typo in my name 😜
 2018-03-27 16:58:24 +02:00
Hypolite Petovan 27155fead7
Merge pull request #4691 from annando/relais-discovery 
Added server discovery for their relais configuration
 2018-03-27 08:50:27 -04:00
Hypolite Petovan 7c63563e1c
Merge pull request #4690 from annando/no-async 
Asynchronous Javascript is deactivated
 2018-03-27 08:48:11 -04:00
Michael 8bdd417b04 Asynchronous Javascript is deactivated 2018-03-27 05:45:56 +00:00
Hypolite Petovan 35e18e9e1e
Merge pull request #4686 from annando/no-warn-app 
Avoid the warning of an unitialized variable in .htconfig.php
 2018-03-26 20:44:53 -04:00
Hypolite Petovan 5a6b846445
Merge pull request #4687 from annando/fix-relay 
Fix sending messages to relay servers
 2018-03-26 20:40:44 -04:00
Michael bc03c8846c Fix sending messages to relay servers 2018-03-26 23:39:59 +00:00
Michael b48df6a828 Avoid the warning of an unitialized variable in .htconfig.php 2018-03-26 20:58:34 +00:00
Michael 00c444a699 Only update when changed 2018-03-26 06:17:50 +00:00
Michael 6b84cb9715 Only add tags in the "tags" scope 2018-03-26 06:11:55 +00:00
Michael e65bd0325e Added server discovery for their relais configuration 2018-03-26 05:44:53 +00:00
Tobias Diekershoff 25981e8a22
Update issue_template.md 2018-03-26 06:48:16 +02:00
Michael Vogel bfc2bda9b6
Merge pull request #4682 from MrPetovan/task/4681-nsfw-add-hashtag-only-hiding 
Move suppress_tags config usage to template
 2018-03-25 22:26:17 +02:00
Hypolite Petovan 2fa5e7be0a
Merge pull request #4685 from annando/fix-event 
Bugfix: Prevent "Uncaught TypeError"
 2018-03-25 15:10:37 -04:00
Michael dece06c571 Bugfix: Prevent "Uncaught TypeError: Argument 1 passed to Friendica\Model\Event::formatListForExport() must be of the type array, object given" 2018-03-25 18:56:35 +00:00