strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
25303 commits 2 branches 55 tags 148 MiB
Commit graph

25303 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan 91491dd798
Merge pull request #7846 from annando/notes-warnings 
Fix further notes and warnings
 2019-11-19 07:03:34 -05:00
Michael Vogel 100dfea524 Fix further notes and warnings 2019-11-19 11:02:35 +01:00
Hypolite Petovan d62cd5defc
Merge pull request #7845 from annando/diaspora-title 
Show title for posts with attached pages
 2019-11-18 13:54:58 -05:00
Michael Vogel 287c55722e Show title for posts with attached pages 2019-11-18 19:52:00 +01:00
Hypolite Petovan 1964ca6a4a
Merge pull request #7844 from annando/warnings 
Fix warnings
 2019-11-18 13:47:52 -05:00
Michael Vogel 80917018e9 Fix warnings 2019-11-18 19:09:21 +01:00
Hypolite Petovan 6d53036a9f
Merge pull request #7843 from annando/ap-attachments 
Improve the look of fetched feeds and the BBCode processing of attachments
 2019-11-18 08:16:13 -05:00
Michael Vogel 0733ae6aae Improve the look of fetched feeds and the BBCode processing of attachments 2019-11-18 13:29:27 +01:00
Philipp db65601828
Merge pull request #7842 from annando/fix-fatal 
Fix fatal errors, caused by an empty "verb"
 2019-11-18 08:38:32 +01:00
Michael Vogel bd6774bd9b Fix fatal errors, caused by an empty "verb" 2019-11-18 07:39:56 +01:00
Hypolite Petovan 3ba9aa0e8e
Merge pull request #7841 from annando/ap-link 
AP: Remove the link description from the "rich html" and adds it to the attachment
 2019-11-17 14:55:51 -05:00
Michael 8644d300d0 Readded empty line 2019-11-17 18:12:20 +00:00
Michael 28ca0d6fab AP: Remove the link description from the "rich html" and adds it to the attachment 2019-11-17 18:10:12 +00:00
Hypolite Petovan 19bbae21de
Merge pull request #7839 from annando/siteinfo 
Don't guess the site info / restrict the description length
 2019-11-15 09:52:41 -05:00
Michael Vogel a3b7f08f78 Don't guess the site info / restrict the description length 2019-11-15 14:28:42 +01:00
Tobias Diekershoff 94cd5b8b07
Merge pull request #7837 from casperrutten/develop 
Update vagrant_provision.sh
 2019-11-15 08:20:39 +01:00
Casper 91ba4bb2ab
Merge pull request #1 from friendica/develop 
Update from friendica/friendica
 2019-11-14 22:36:36 +00:00
Casper c1a1f1ce26
Update vagrant_provision.sh 
Line 20-27 -> add slash at the end of every entry and removed empty entries.
Caused error in creating .csr file
PS. the virtualbox-guest-x11 is not in the given debian repository. Better take an Ubuntu repository
Also inserted:
sudo apt-get install -y ubuntu-desktop
sudo systemctl set-default graphical.target
to install a desktop environment
 2019-11-14 21:36:29 +00:00
Hypolite Petovan a8fa7e5187
Merge pull request #7833 from annando/read-source 
AP: Read different content types for the source and the content
 2019-11-13 11:29:22 -05:00
Michael fa57fead2e AP: Read different content types for the source and the content 2019-11-13 16:22:20 +00:00
Philipp ff1e70a7ec
Merge pull request #7832 from annando/ap-rich-mention 
Fix: Mentions in the HTML part of the "contentMap" now are links
 2019-11-13 08:09:07 +01:00
Michael 85b3c880ef Fix: Mentions in the HTML part of the "contentMap" now are links 2019-11-13 06:43:36 +00:00
Hypolite Petovan a8ace6522c
Merge pull request #7831 from annando/contentmap 
ActivityPub: Use the contentMap to transmit additional content encodings
 2019-11-12 16:30:36 -05:00
Michael 1fb485af1c Use the contentMap to transmit additional content encodings 2019-11-12 20:22:35 +00:00
Hypolite Petovan 35ece9924d
Merge pull request #7829 from annando/picture-links 
Fix image links with descriptions in API and AP transmission
 2019-11-12 07:14:27 -05:00
Michael 8997361609 Better function name 2019-11-11 23:13:36 +00:00
Michael 1b5fa55bdc Fix image links with descriptions in API and AP transmission 2019-11-11 22:37:50 +00:00
Hypolite Petovan f2c31ef1c0
Merge pull request #7828 from nupplaphil/task/move_enotify 
Remove unnecessary code in "include/enotify"
 2019-11-09 16:48:26 -05:00
Philipp Holzer dbbe3ec031
Remove deprecated method to find duplicates (issue from 2013) 2019-11-09 22:00:04 +01:00
Philipp Holzer f9e3ff4b55
Remove unnecessary hash function. 
- Was introduced for getting the last inserted ID before "lastInstertID()" was possible
- See b821399f00 (diff-a8e86a3c07531e66a3b0b4c8b4b07879R148)
 2019-11-09 21:50:52 +01:00
Philipp ce4c269980
Merge pull request #7827 from MrPetovan/bug/7821-page-flags-255 
User account page flags is stored as 255
 2019-11-09 21:48:58 +01:00
Hypolite Petovan 31f0fe0992 Use correct variable to store user.hidewall in mod/settings 2019-11-09 09:12:20 -05:00
Hypolite Petovan 28537dbf63 Use correct variable to store user.page-flags in mod/settings 2019-11-09 09:12:10 -05:00
Hypolite Petovan babcd24412
[hotfix] Fix syntax error in Module\Register 
- Prevents registration
- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-552070076
 2019-11-09 01:09:26 -05:00
Hypolite Petovan 5053440da6
Merge pull request #7826 from annando/pin3 
Pinning: Missing file added
 2019-11-09 00:36:56 -05:00
Michael bdacda32ba Pinning: Missing file added 2019-11-09 03:17:18 +00:00
Hypolite Petovan 907414497d
Merge pull request #7824 from annando/pin2 
Pinning now works as expected
 2019-11-08 13:56:20 -05:00
Michael 5d1ced796b Icons do now appear on smoothly and duepuntezero as well 2019-11-08 18:07:54 +00:00
Michael 06a4461fc4 Improved icons 2019-11-08 10:25:50 +00:00
Michael fc94cad5f2 Pinned posts now work for visitors in the intended way 2019-11-08 06:52:44 +00:00
Hypolite Petovan 2200996d44
[hotfix] Prevent fatal error in profile with pinned posts 
- `$a->profile['profile_uid']` may not be set
- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-551255174
 2019-11-07 15:51:05 -05:00
Hypolite Petovan b8f2252a7f
Merge pull request #7823 from annando/pin 
We can now pin posts
 2019-11-07 15:10:03 -05:00
Michael 806e6a230e Added description, removed sorting 2019-11-07 07:41:54 +00:00
Michael 91ad7936f3 Only sort the profile after pinned 2019-11-07 07:39:50 +00:00
Michael 463c9131b6 Pinned items are always at the top 2019-11-07 07:09:46 +00:00
Michael ed58af25a5 show pinned items 2019-11-07 06:53:18 +00:00
Philipp 0258fd17c7
Merge pull request #7822 from MrPetovan/task/router-parameter-content 
Pass Router parameters to module content method
 2019-11-07 07:14:30 +01:00
Michael cf56992444 We can now pin our own posts 2019-11-07 05:39:15 +00:00
Hypolite Petovan 134d6d18f9 Pass Router parameter to module content method 2019-11-06 22:35:28 -05:00
Hypolite Petovan f21edefe15
Merge pull request #7820 from annando/fix-warning 
Fix a notice
 2019-11-06 15:23:33 -05:00