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

19295 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan
89cf2ea186
Merge pull request #4975 from annando/fix-blocked-contacts 
"pending" shouldn't be set as well by default ...
 2018-05-03 14:22:50 -04:00
Michael
08bfced11b "pending" shouldn't be set as well by default ... 2018-05-03 18:19:40 +00:00
Hypolite Petovan
4158dcccaf
Merge pull request #4974 from annando/fix-blocked-contacts 
Ugly bugfix: Public contacts had been blocked automatically when created
 2018-05-03 14:06:01 -04:00
Michael
bce3b6f896 Urgent bugfix: Public contacts had been blocked automatically when created 2018-05-03 17:43:10 +00:00
Hypolite Petovan
fbe1206f35
Merge pull request #4973 from annando/diaspora-link 
Bugfix: Twitter "Reshares" are now appearing again on Diaspora
 2018-05-03 10:20:18 -04:00
Michael
53b7028d35 Reshares had been detected falsely so that were rejected by Diaspora 2018-05-03 13:03:41 +00:00
Michael
aba93df94f Ensure that the link will be displayed correctly on Diaspora 2018-05-03 04:43:50 +00:00
Hypolite Petovan
b6cb7c034f
Merge pull request #4972 from annando/dba-stuff 
Replace old database queries with the new ones
 2018-05-02 20:55:58 -04:00
Michael
eecd1e47e4 Some corrections 2018-05-02 21:12:48 +00:00
Michael
4ad655ab80 Replace old database queries with the new ones 2018-05-02 19:26:15 +00:00
Hypolite Petovan
8f9757aba5
Merge pull request #4962 from astifter/fix_cropped_find_button 
vier: Fix layout issue introduced with PR #4873.
 2018-05-01 08:43:45 -04:00
Hypolite Petovan
538143f628
Merge pull request #4967 from nupplaphil/4899-autoinstall-with-file 
AutomaticInstallation - use config file
 2018-05-01 08:19:02 -04:00
Philipp Holzer
559250b8b3 Updated help-text 
accidentaly changed `htconfig.php` (reverted)
 2018-05-01 13:21:42 +02:00
Philipp Holzer
95ef07d67b Updated help-text 2018-05-01 13:14:41 +02:00
Philipp Holzer
fa78f148c8 AutomaticInstallation - use config file 
- added new parameter "-f config file" to `AutomaticInstallation.php`
 2018-05-01 13:11:25 +02:00
Tobias Diekershoff
1935a8150d
Merge pull request #4964 from annando/delivery-foo 
Fixed private messaging/relaying is controlled by the parent
 2018-05-01 11:30:31 +02:00
Michael
1e0200884f Fixed private messaging/relaying is controlled by the parent 2018-05-01 06:37:12 +00:00
Andreas Neustifter
59b57459c6 Fix layout issue introduced with PR #4873. 
The find button in the find-people widget was badly layouted on Firefox under Debian.
Remove the width constraint and float: left so the button gracely drops to the next
line when necessary.
 2018-04-30 21:22:59 +00:00
Hypolite Petovan
352e136132
Merge pull request #4961 from annando/direct-dfrn 
Direct Relay is now working with DFRN as well
 2018-04-30 14:06:35 -04:00
Michael
b72bc0735f Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn 2018-04-30 16:52:44 +00:00
Michael
a182dd3400 Improved logging, avoiding PHP warning 2018-04-30 16:46:49 +00:00
Michael
1a8d0a573e Bugfix: Contact wasn't added on probing 2018-04-30 16:45:00 +00:00
Hypolite Petovan
2975d1a0be
Merge pull request #4959 from koyuawsmbrtn/develop 
Added dark scheme to frio
 2018-04-30 10:30:01 -04:00
Koyu Berteon
90b24251d2 Renamed files as requested 2018-04-30 15:38:46 +02:00
Koyu Berteon
125c3e7cab Corrected time 2018-04-30 15:34:23 +02:00
Koyu Berteon
01bd3a3a7b Fixed identation in dark.php 2018-04-30 15:27:40 +02:00
Koyu Berteon
72cab9bb93 Added dark scheme to frio 2018-04-30 15:25:31 +02:00
Hypolite Petovan
c1fe35523c
Merge pull request #4958 from rabuzarus/20180425_-_fix_help_aside 
The add widget class to the left aside for /help
 2018-04-30 09:20:43 -04:00
Michael
4909075321 Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn 2018-04-30 13:09:11 +00:00
Michael
5588f0d2ae Improved logging 2018-04-30 13:08:48 +00:00
Michael
b2b597288c Deliver with the new function when delivering to a "uid=0" contact 2018-04-30 13:07:40 +00:00
rabuzarus
0c0b715c63 Merge develop into 20180425_-_fix_help_aside 2018-04-30 14:56:25 +02:00
Michael
74aa3499b0 Additional logging 2018-04-30 12:41:56 +00:00
Hypolite Petovan
262665a176
Merge pull request #4955 from tobiasd/20180430-fi 
update FI translations THX Kris
 2018-04-30 06:51:52 -04:00
Tobias Diekershoff
839fd9f17e update FI translations THX Kris 2018-04-30 08:34:47 +02:00
Michael
bbbebb2b9c Don't spool relay deliveries 2018-04-30 05:56:40 +00:00
Michael
d0dd5c44d9 Update or create relay contact from discovery / process new protocol values 2018-04-30 05:33:47 +00:00
Michael
aa4945f4a0 "x-social-relay" now exposes all supported protocols 2018-04-30 04:01:04 +00:00
Hypolite Petovan
493314a067
Merge pull request #4920 from nupplaphil/install_mode 
Add Application Mode (Install, Maintenance, Normal)
 2018-04-29 14:31:13 -04:00
Philipp Holzer
b4f5311e7f Add Install Mode 
- merge `friendica/develop` to `nupplaphil/install_mode`
 2018-04-29 20:15:12 +02:00
Michael Vogel
bd0ba24518
Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app 
Move current_theme() to App
 2018-04-29 19:11:49 +02:00
Tobias Diekershoff
2c1b1841bb
Merge pull request #4954 from annando/hide-contacts 
Fix PR 4942: Fixed item query
 2018-04-29 18:40:01 +02:00
Michael
78f563407a Fix PR 4942: Fixed item query 2018-04-29 16:32:46 +00:00
Philipp Holzer
da9ac7b879 Add Install Mode 
- increased code quality
 2018-04-29 18:13:24 +02:00
Philipp Holzer
6cb277b0bb Add Install Mode 
- added PHP docBlock to methods
- increased code quality
 2018-04-29 18:11:24 +02:00
Hypolite Petovan
cc2703ce8d
Merge pull request #4953 from tobiasd/20180429-msg 
regenerated master messages.po file
 2018-04-29 07:05:02 -04:00
Tobias Diekershoff
52cc67e767 regenerated master messages.po file 2018-04-29 07:19:20 +02:00
Tobias Diekershoff
cb364f440f
Merge pull request #4952 from MrPetovan/bug/4947-fix-content-filter-self 
Fix own post check for content filter
 2018-04-29 06:41:55 +02:00
Hypolite Petovan
baf235e200
Merge pull request #4948 from annando/hash-ignored 
Corrected query to don't show hash tag posts from blocked or ignored contacts
 2018-04-28 20:37:47 -04:00
Hypolite Petovan
20289393da Fix own post check for content filter 2018-04-28 19:11:11 -04:00