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

21001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael 2592c3891c forgotten $ 2018-09-06 21:10:48 +00:00
Michael 1d4a5402ff Picture posts do work again - everything else should work as well 2018-09-06 20:30:16 +00:00
Hypolite Petovan e735a14db9
Merge pull request #5736 from annando/issue-5733 
Issue 5733: Changing relationship values does work now again with DFRN
 2018-09-06 13:19:24 -04:00
Hypolite Petovan d27cf0cb60
Merge pull request #5740 from annando/fix-fatal 
Fix fatal error due to missing "use"
 2018-09-06 11:58:07 -04:00
Hypolite Petovan 68c6895e1a
Merge pull request #5734 from nupplaphil/friendica-5716-followup 
LockDriverFixings
 2018-09-06 11:50:47 -04:00
Michael e9a73e4480 Fix fatal error due to missing "use" 2018-09-06 13:27:03 +00:00
Michael Vogel 9c0b80142d
Merge pull request #5739 from rabuzarus/20180906_-_fix_non_present_element 
Frio - bugfix - don't show new event button if the button isn't available
 2018-09-06 13:23:58 +00:00
rabuzarus 26607d4a27 Frio - bugfix - don't show new event button if the button isn't available 2018-09-06 14:40:34 +02:00
Michael Vogel 39d35025b5
Merge pull request #5735 from Aditoo17/patch-1 
Fix iframe address in QuickStart-groupsandpages
 2018-09-06 09:22:32 +00:00
Michael 6113fdc940 Issue 5733: Changing relationship values does work now again with DFRN 2018-09-06 09:20:45 +00:00
Aditoo17 f84b39be0b
Fix iframe address 2018-09-06 10:43:15 +02:00
Philipp Holzer bd2b3b1ef5
LockDriverFixings 
- release Locks in case of failures
- adding some cache tests
 2018-09-06 08:11:18 +02:00
Michael 04fb885857 Fix: Posts with pictures will now look good again on connector networks 2018-09-06 04:24:34 +00:00
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
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