Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-25 18:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
20731 commits 3 branches 64 tags 237 MiB
Commit graph

20731 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
2eabe45a8e Contact reject does work now as well 2018-09-15 22:25:58 +00:00
Michael
e45206ae5d Merge remote-tracking branch 'upstream/2018.08-rc' into ap1 2018-09-15 20:49:46 +00:00
Michael
f5104f3e46 Removed harcoded host names 2018-09-15 20:48:24 +00:00
Michael
86bd283705 The whole contact handling does work now, yeah ... 2018-09-15 20:31:05 +00:00
Michael
6a8ebc8639 Contact follow and unfollow workd partially 2018-09-15 18:54:45 +00:00
Michael
96f575fe28 Processing of personal inbox enabled 2018-09-15 10:14:56 +00:00
Michael
35854a0ad1 Adding "(AP)" to the server name when posted via AP 2018-09-15 10:13:41 +00:00
Michael
957c70d1c6 Several improvements 2018-09-15 07:40:19 +00:00
Michael
fb5b6e4a14 New uri format for our posts that is AP compatible 2018-09-15 07:37:34 +00:00
Michael
2e7ca76e15 More fields to import / like could possibly work 2018-09-14 21:10:49 +00:00
Michael
61e2c7d20d Added AP to many network conditions / enabling inbox processing 2018-09-14 16:51:32 +00:00
Hypolite Petovan
79d36b932b
Merge pull request #5761 from annando/endless 
The endless saga of the fight against notices continues
 2018-09-14 00:36:42 -04:00
Michael
7b45bdea17 Preparation for adding more networks there 2018-09-13 22:12:33 +00:00
Michael
c2f6b166c7 We now use the regular probing function 2018-09-13 21:57:41 +00:00
Michael
8c00e88f79 The endless saga of the fight against notices continues 2018-09-13 21:11:52 +00:00
rabuzarus
4079524f78
Merge pull request #5760 from annando/issue-5721 
Issue 5721: Temporarily deactivate the picture upload from private mails
 2018-09-13 18:35:00 +02:00
Michael
63b5cb4fc6 Issue 5721: Temporarily deactivate the picture upload from private mails 2018-09-13 15:46:37 +00:00
Hypolite Petovan
70c94abd8e
Merge pull request #5759 from annando/issue-5733 
Issue 5733: Removing contacts does work now on the same machine as well
 2018-09-12 19:40:03 -04:00
Michael
f7b03bc5f3 Missing $ 2018-09-12 21:33:44 +00:00
Michael
67fa0ed433 Signature check added 2018-09-12 21:30:10 +00:00
Michael
c4825a8b53 Fixing parentheses 2018-09-12 18:49:36 +00:00
Michael
969311cb44 Replacing the non standard "title" with "name" 2018-09-12 18:48:18 +00:00
Michael Vogel
f3a97a0828
Merge pull request #5758 from MrPetovan/bug/fix-empty-notifications 
Fix introductions notifications links
 2018-09-12 06:14:51 +00:00
Michael
7daa46503d Don't risk incompatibilities 2018-09-12 06:13:04 +00:00
Michael
96d10c25e3 Issue 5733: Removing contacts does work now on the same machine as well 2018-09-12 06:05:14 +00:00
Michael
8c07baf54b Better http answers 2018-09-12 06:01:28 +00:00
Hypolite Petovan
7529fc61dd Fix introductions notifications links 2018-09-11 19:54:45 -04:00
Hypolite Petovan
18fd86f51e
Merge pull request #5756 from annando/more-notices 
Burn notices, burn
 2018-09-11 07:36:02 -04:00
Michael
f566db52d3 And more notices ... 2018-09-11 08:04:14 +00:00
Michael
1afa6523bc Adding (temporary) calls to AP in existing stuff 2018-09-11 07:07:56 +00:00
Michael
8b96a53fba Burn notices, burn 2018-09-11 04:10:11 +00:00
Michael
0a5476591d Activitity pub - first commit with much test code 2018-09-10 21:07:25 +00:00
Michael Vogel
aa2ab3d0e7
Merge pull request #5753 from MrPetovan/bug/5752-fix-warning-count 
Fix count being called on the wrong variable in mod/notes
 2018-09-10 05:05:39 +00:00
Hypolite Petovan
e461474290 Fix count being called on the wrong variable in mod/notes 2018-09-09 18:34:05 -04:00
Michael Vogel
dcb9bf4136
Merge pull request #5750 from MrPetovan/bug/5723-frio-fix-new-event-acl 
[frio] Fix new event ACL
 2018-09-09 16:40:31 +00:00
Hypolite Petovan
11a3b45957 [frio] Fix ACL selection in new event modal 
- Fix this.allow_cid.push isn't a function error
 2018-09-09 10:10:17 -04:00
Hypolite Petovan
4edbea3ed0 Fix JS error when no acl is defined 2018-09-09 09:54:54 -04:00
Hypolite Petovan
071aff223a Format source of mod/events 2018-09-09 09:51:59 -04:00
Hypolite Petovan
f4e0ab55c7
Merge pull request #5749 from annando/again 
Notices come, notices go ...
 2018-09-09 09:12:02 -04:00
Michael
d581318c7c Notices come, notices go ... 2018-09-09 06:32:01 +00:00
Michael Vogel
21341eb32c
Merge pull request #5748 from MrPetovan/bug/fix-addon-config-overwrite 
Add overwrite parameter to App->loadConfigFile
 2018-09-08 13:15:15 +00:00
Hypolite Petovan
791a77f441 Add overwrite parameter to App->loadConfigFile 2018-09-08 02:37:53 -04:00
Michael Vogel
05567b9866
Merge pull request #5746 from MrPetovan/bug/fix-empty-notifications 
Restore template choice by notification label
 2018-09-07 15:45:10 +00:00
Benjamin Lorteau
71215115eb Restore template choice by notification label 2018-09-07 11:15:23 -04:00
Tobias Diekershoff
c18da1444d
Merge pull request #5744 from annando/fix-preview 
Fix for #5732 - too much links had been detected as photos
 2018-09-07 09:01:14 +02:00
Michael
99244d33f5 Fix for #5732 - too much links had been detected as photos 2018-09-07 06:10:33 +00:00
Tobias Diekershoff
55f72b5767
Merge pull request #5743 from MrPetovan/bug/fix-empty-notifications 
Fix empty notifications
 2018-09-07 07:33:47 +02:00
Hypolite Petovan
480d792356
Merge pull request #5732 from annando/fix-picture-posts 
Fix: Posts with pictures will now look good again on connector networks
 2018-09-06 19:00:44 -04:00
Hypolite Petovan
f85af78097 Source format mod/notifications 
- Add array alignment
- Convert remaining double quotes to quotes
- Replace x() with defaults()
- Add missing spaces
 2018-09-06 18:55:06 -04:00
Hypolite Petovan
2f7ba13702 Restore display when there aren't unread notifications 2018-09-06 18:42:57 -04:00