friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
27,459 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

27459 Commits

Author SHA1 Message Date
Hypolite Petovan f68652d61c Revert "Move share content conversion before link handling in Text\BBCode::convert" 
This reverts commit 010ec99b35.
 2020-06-04 11:11:44 -04:00
Tobias Diekershoff b76e6f4429
Merge pull request #8723 from MrPetovan/bug/8722-oembed-share 
Move share content conversion before link handling in Text\BBCode::convert
 2020-06-04 06:40:44 +02:00
Hypolite Petovan 010ec99b35 Move share content conversion before link handling in Text\BBCode::convert 2020-06-03 22:02:01 -04:00
Hypolite Petovan 297e721ecc
Merge pull request #8720 from annando/issue-8714 
Issue 8714: Make redirects more secure
 2020-06-03 09:12:43 -04:00
Michael 117d0e7362 Removed unused parts 2020-06-03 10:33:54 +00:00
Michael b36fb80eb9 File ending, Error Message 2020-06-03 09:40:43 +00:00
Michael f2acce6bb2 Merge remote-tracking branch 'upstream/develop' into issue-8714 2020-06-03 09:27:02 +00:00
Hypolite Petovan ce0f67f10f
Merge pull request #8721 from annando/fatal 
Fix fatal errors because of mixed data types
 2020-06-03 04:09:49 -04:00
Michael ad2f45d1d8 Fix fatal errors because of mixed data types 2020-06-03 06:57:51 +00:00
Michael 1ca804b638 Issue 8714: Make redirects more secure 2020-06-03 05:14:45 +00:00
Michael Vogel 5630c9f132
Merge pull request #8719 from MrPetovan/task/8717-help-console-globalcommunitysilence 
Improve language of console globalcommunitysilence help line
 2020-06-03 06:14:56 +02:00
Michael Vogel b1b4e98bd9
Merge pull request #8718 from MrPetovan/bug/fatal-errors 
Use expected return variable type in Network\Probe::detect
 2020-06-03 06:13:48 +02:00
Hypolite Petovan 779099a491 Improve language of console globalcommunitysilence help line 2020-06-03 00:03:58 -04:00
Hypolite Petovan a2de7d25ec Use expected return variable type in Network\Probe::detect 2020-06-02 23:41:10 -04:00
Hypolite Petovan 07aee06a02
Merge pull request #8716 from annando/notice 
Let "subscribe" be filled at every time to avoid a notice
 2020-06-02 21:35:39 -04:00
Michael 50e5bd6703 Let "subscribe" be filled at every time to avoid a notice 2020-06-02 19:11:37 +00:00
Hypolite Petovan e5eaf0e0ec
Merge pull request #8713 from annando/issue-8675 
Issue 8675: reduce requests of foreign pages
 2020-06-02 09:08:14 -04:00
Michael 736f69c33a Changed logging 2020-06-02 06:47:44 +00:00
Michael e379698227 Issue 8675: reduce requests of foreign pages 2020-06-01 21:52:31 +00:00
Tobias Diekershoff 4a363b50b4
Merge pull request #8712 from annando/changed-log 
Changed deprecated log calls
 2020-06-01 18:28:37 +02:00
Michael e374e5752a Changed deprecated log calls 2020-06-01 13:51:58 +00:00
Hypolite Petovan 011bbacf43
Merge pull request #8710 from annando/fix-vid 
Handling situations where "vid" is empty
 2020-05-31 18:06:52 -04:00
Michael 7ac4a08e1b Additional "is null" check in post update / create the "vid" if needed 2020-05-31 15:48:31 +00:00
Michael 20b93306ad Handling situations where "vid" is empty 2020-05-31 14:38:00 +00:00
Hypolite Petovan 6abe7692e5
Merge pull request #8708 from annando/foreign-key-constraint 
Fix foreign key constraint with "post-tag" table
 2020-05-30 15:37:57 -04:00
Michael 46e2423af9 Fix wrong variable names 2020-05-30 17:06:59 +00:00
Michael 2eb371dcaf Fix foreign key constraint with "post-tag" table 2020-05-30 16:36:09 +00:00
Hypolite Petovan 955213f598
Merge pull request #8706 from annando/notice 
Fix "gravity" notice
 2020-05-29 21:35:49 -04:00
Michael 9328eee550 Missing gravity 2020-05-29 22:19:59 +00:00
Michael b837c487c5 Fix "gravity" notice 2020-05-29 21:41:10 +00:00
Michael Vogel 235f4eaa89
Merge pull request #8697 from MrPetovan/task/8691-like-links-one-way 
Make like links one way
 2020-05-29 15:33:24 +02:00
Hypolite Petovan f0b6f025d2 Appease VSCode inferior static analysis in Model\Item 2020-05-29 09:01:37 -04:00
Hypolite Petovan 0efd3dedeb
Merge pull request #8705 from annando/thread-uri-id 
Add "uri-id" to the "thread" table
 2020-05-28 23:59:44 -04:00
Michael Vogel c6aa42dd4e
Merge pull request #8696 from MrPetovan/bug/8694-event-network-unkn 
Assign default protocol to new events
 2020-05-29 05:05:35 +02:00
Michael 19f2a998d2 Added new field to the test data 2020-05-29 02:25:17 +00:00
Michael 64f3dd419c Updated database description 2020-05-29 02:19:58 +00:00
Hypolite Petovan 43eb7480b5
Merge pull request #8704 from annando/parent-2 
"parent = id" is replaced with gravity check
 2020-05-28 17:48:57 -04:00
Michael 3258216e8d Add "uri-id" to the "thread" table 2020-05-28 21:44:55 +00:00
Michael 0acb5d4558 "parent = id" is replaced with gravity check 2020-05-28 16:02:36 +00:00
Hypolite Petovan f694d1e4fc
Merge pull request #8703 from annando/fix-8702 
Fix 8702
 2020-05-28 09:17:45 -04:00
Michael bdfe47dcfd Add the space at a different place 2020-05-28 06:08:03 +00:00
Michael 51e9b25700 Fixing #8702 2020-05-27 22:16:33 +00:00
Michael d3ff749749 Merge branch 'develop' of github.com:annando/friendica into develop 2020-05-27 21:29:43 +00:00
Hypolite Petovan 9fef3b231d
Merge pull request #8701 from annando/issue-8700 
Issue 8700: Resolvable activities
 2020-05-27 15:30:04 -04:00
Michael db907c2ff8 Issue 8700: Resolvable activities 2020-05-27 19:05:33 +00:00
Michael 1f316d0dec Issue 8700: Resolvable activities 2020-05-27 19:04:40 +00:00
Hypolite Petovan c7367b5902
Merge pull request #8698 from MrPetovan/bug/8685-frio-compose-disable-asynchronous 
[frio] Move variable assignment where it belongs in asynchronous comment form submission callback
 2020-05-27 09:09:10 -04:00
Hypolite Petovan 6b87494e73
Merge pull request #8695 from annando/no-parent 
Replace "id = parent" checks with "gravity" checks
 2020-05-27 09:07:33 -04:00
Hypolite Petovan ed39618da2 [frio] Move variable assignment where it belongs in asynchronous comment form submission callback 2020-05-27 09:05:46 -04:00
Hypolite Petovan df1c74bd33 Make "like" links one way 
- Updated dolike() function to accept a "un-" switch
- [frio] Updated doLikeAction() function to call dolike() instead of having duplicated code
- Added boolean logic (with explanatory truth table) to smartly delete existing activities in Model\Item::performActivity
- Moved verb/activity parameter handling closer to their use in Model\Item::performActivity
- Updated all references to dolike() and doLikeAction() to include the "un-" switch
 2020-05-27 08:41:13 -04:00