Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-16 02:13:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
19992 commits 3 branches 64 tags 246 MiB
Commit graph

19992 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
8ea37a9d0b 5th draft 2018-03-31 08:44:25 +02:00
Michael Vogel
4724c7de72
Merge pull request #4718 from MrPetovan/bug/fix-console-url-argument 
Console: Use $argv instead of $_SERVER['argv']
 2018-03-31 06:02:23 +02:00
Hypolite Petovan
bdacaa424e
Merge pull request #4717 from annando/fix-profiles 
Fix: Avoid a WSOD when saving the profile
 2018-03-30 23:52:03 -04:00
Michael
80cca09a53 Fix: Avoid a WSOD when saving the profile 2018-03-31 03:33:19 +00:00
Hypolite Petovan
3b81c66150 Use $argv instead of $_SERVER['argv'] 2018-03-30 22:56:04 -04:00
Hypolite Petovan
bcf974a995
Merge pull request #4716 from annando/password-console 
New functionality to set a password for a given user
 2018-03-30 16:00:07 -04:00
Michael
491db963db Changed comments 2018-03-30 19:57:14 +00:00
Michael
2eb4912dbf New functionality to set a password for a given user 2018-03-30 19:17:12 +00:00
Tobias Diekershoff
7a46bbbd3a 4th draft 2018-03-30 08:22:08 +02:00
Michael
1613f2a1c4 Ensure that public contacts can't create toplevel posts 2018-03-30 06:20:00 +00:00
Michael
c9f02d534e Merge remote-tracking branch 'upstream/develop' into dfrn-2 2018-03-30 05:45:29 +00:00
Michael Vogel
ca37b34333
Merge pull request #4713 from MrPetovan/bug/suppress-profile-message-follow 
Suppress confusing error message in mod/follow
 2018-03-30 07:39:00 +02:00
Michael Vogel
a2b6ff7b25
Merge pull request #4712 from MrPetovan/task/improve-text-highlight 
Improve text highlight
 2018-03-30 07:27:42 +02:00
Hypolite Petovan
d13f36938c Suppress error message for non-existing contacts in mod/follow 2018-03-29 23:29:41 -04:00
Hypolite Petovan
3a58fe48bd Fix formatting in mod/follow 2018-03-29 23:28:48 -04:00
Hypolite Petovan
80b6dc5787 Add fallback to regular code if language doesn't exist 2018-03-29 19:29:36 -04:00
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
535a9838fc 3rd draft 2018-03-29 12:42:55 +02: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
Tobias Diekershoff
27c09b445e typo 2018-03-29 06:23:28 +02:00
Tobias Diekershoff
2b93819ae3 3.6.1 changelog (1st draft) 2018-03-28 20:17:10 +02: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