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

21979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hypolite Petovan 8ac018813c
Merge pull request #5731 from rabuzarus/20180906_-_magicLinks_for_event 
use magic links for event view
 2018-09-05 20:04:28 -04:00
Hypolite Petovan 164c05e953
Merge pull request #5730 from nupplaphil/friendica-5716 
CacheLockDriverTest Fixings
 2018-09-05 20:00:20 -04:00
rabuzarus 75a2576f78 use magic links in single event view 2018-09-06 01:42:35 +02:00
Philipp Holzer f148dcabc4
CacheLockDriverTest Fixings 
- Changing test behaviour
 2018-09-05 22:16:23 +02:00
Ralf Thees 7edbef9bdc Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-09-05 20:08:56 +02:00
Hypolite Petovan 8a1581cadd
Merge pull request #5727 from rabuzarus/20180905_-_rise_frio_version 
Frio - rise frio version
 2018-09-05 12:52:42 -04:00
Hypolite Petovan 3a751f0562
Merge pull request #5726 from rabuzarus/201805_-_edit_album_modal 
Frio - fix missing modal for editing photo albums
 2018-09-05 12:52:11 -04:00
rabuzarus 1fe1628237 lockview - prevent notices 2018-09-05 18:44:47 +02:00
rabuzarus f9fe162f2f Frio - rise version 2018-09-05 18:31:09 +02:00
rabuzarus 7c5e964581 Frio - fix missing modal for editing albums 2018-09-05 18:24:04 +02:00
rabuzarus 85fed927c3 Frio - addToModal() can now be used with an element ID as a parameter 2018-09-05 17:30:07 +02:00
Hypolite Petovan f6a35605c9
Merge pull request #5725 from rabuzarus/20180905_-_fix_lockview 
fix lockview for photos
 2018-09-05 10:02:21 -04:00
rabuzarus bd9d102da2 apply coding standards to lockview module 2018-09-05 14:24:51 +02:00
rabuzarus 88d25f977a fix lockview for photos 
- use the private field only for items because other tables than the item table don't have the private field
 2018-09-05 14:12:56 +02:00
Tobias Diekershoff 31cbc80981
Merge pull request #5722 from annando/dissolve 
Restore the behaviour to remove the remote contact upon termination
 2018-09-05 08:23:41 +02:00
Michael Vogel d7bb671b77
Merge pull request #5720 from MrPetovan/bug/fix-unfollow 
Remove extraneous SQL condition part in mod/unfollow
 2018-09-05 05:42:00 +00:00
Michael 9ef1d827f3 Restore the behaviour to remove the remote contact upon termination 2018-09-05 05:02:06 +00:00
Hypolite Petovan 9de0d35450 Remove extraneous SQL condition part in mod/unfollow 2018-09-04 19:29:36 -04:00
Hypolite Petovan 59d06b6c78
Merge pull request #5719 from annando/notices-yeah 
Good news, everyone - again somce notices removed
 2018-09-04 19:09:11 -04:00
Michael 635c8d7450 Beautified the code 2018-09-04 21:24:30 +00:00
Michael 821429fdf1 Good news, everyone - again somce notices removed 2018-09-04 17:48:09 +00:00
Michael Vogel 62c5e5d861
Merge pull request #5715 from MrPetovan/bug/fix-photo-attachment 
Fix 'photo' attachment
 2018-09-03 22:00:53 +00:00
Hypolite Petovan 9744f0e780 Update ParseUrl::getSiteinfo type recognition 
- Added obsolete twitter card type provision
 2018-09-02 17:50:27 -04:00
Hypolite Petovan 8bcc3c6860 Fix formatting in Util/ParseUrl 
- Remove commented out code
- Replace double quotes with simple quotes
- Remove parentheses for language construct
- Add spaces around operators
- Rename variables
 2018-09-02 17:46:28 -04:00
Hypolite Petovan 69e7c7feca Fix photo attachment display 
- Remove double image display
- Add domain link display to all attachments
 2018-09-02 17:26:05 -04:00
Hypolite Petovan 475d3f8f3a Fix formatting in mod/parse_url 2018-09-02 17:24:56 -04:00
Hypolite Petovan f9177e827e
Merge pull request #5714 from annando/removed-postupdate 
Removed obsolete post update that sometimes never finishes
 2018-09-02 16:54:56 -04:00
Michael 5250552fe2 Removed obsolete post update that sometimes never finishes 2018-09-02 17:48:25 +00:00
Michael 58148905f1 Changed documention 2018-09-02 17:48:07 +00:00
Tobias Diekershoff d5a3b0bd5e
Merge pull request #5710 from annando/fix-api 
Fix for timeout issues when posting to the API
 2018-09-02 14:52:09 +02:00
Tobias Diekershoff deca48e39d
Merge pull request #5711 from annando/and-again 
The days are getting shorter, like the list of removed notices ...
 2018-09-02 14:48:47 +02:00
Tobias Diekershoff 3ea9b0680a
Merge pull request #5712 from annando/more-notices 
More notices ...
 2018-09-02 14:46:15 +02:00
Michael 703c668a37 More notices ... 2018-09-02 08:01:13 +00:00
Michael fd7e45042a The days are getting shorter, like the list of removed notices ... 2018-09-02 07:47:48 +00:00
Michael 394526db74 Typo corrected / use the thread table instead 2018-09-02 07:35:12 +00:00
Michael 4bb45f611f Fix for timeout issues when posting to the API 2018-09-02 07:20:04 +00:00
Hypolite Petovan 61168ccb65
Merge pull request #5709 from annando/issue-5262 
Issue 5262: Comments to a forum post aren't distributed via push
 2018-09-01 00:14:05 -04:00
Michael 4fcae18289 Issue 5262: Comments to a forum post aren't distributed via push 2018-09-01 03:23:12 +00:00
Michael Vogel 196ef0111c
Merge pull request #5704 from MrPetovan/bug/fix-unfollow 
Fix unfollow sharing-only contacts (except connector protocols)
 2018-08-31 15:40:51 +00:00
Benjamin Lorteau 76b40cf05e Use User::getOwnerDataById in mod/unfollow 2018-08-31 11:22:51 -04:00
Hypolite Petovan 7459a998e4
Merge pull request #5706 from annando/width-notice 
Invalid pictures could lead to notices, this is removed now
 2018-08-31 05:01:54 -04:00
Michael 38fd21019b Invalid pictures could lead to notices, this is removed now 2018-08-31 07:48:44 +00:00
Tobias Diekershoff cad5c1b69e
Merge pull request #5705 from annando/still-notices 
Still there had been notices - must have a good camouflage
 2018-08-31 07:56:01 +02:00
Michael 380eeaab88 Still there had been notices - must have a good camouflage 2018-08-31 05:08:22 +00:00
Hypolite Petovan e25c579c76 Add Protocol::NATIVE_SUPPORT constant usage to mod/contacts 2018-08-30 21:03:57 -04:00
Hypolite Petovan 92c4ca0911 Prevent unfollowing contacts from networks not supported natively 2018-08-30 17:53:23 -04:00
Hypolite Petovan 804cfa0320 Reorganize Protocol constants 
- Add ActivityPub protocol constant
- Add Protocol::NATIVE_SUPPORT
- Sort/group constant names
 2018-08-30 17:47:48 -04:00
Hypolite Petovan 55c676d8b0 Source cleaning mod/unfollow.php 
- Normalize quotes
- Remove unneeded EOL
- Use DBA method where tasteful
 2018-08-30 08:54:12 -04:00
Hypolite Petovan b81eaec885 Enable unfollowing contacts from all networks (but Statusnet) 2018-08-30 08:52:15 -04:00
Hypolite Petovan e480da788e Fix unfollow for sharing-only contacts 
- Add removal when unfollowing sharing-only contacts
 2018-08-30 08:28:10 -04:00