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

24470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vogel 7795fafdbf
Merge pull request #7478 from tobiasd/20190805-typo 
Typo in setting description
 2019-08-05 18:33:24 +02:00
Tobias Diekershoff 3053cde210 Typo in setting description 2019-08-05 18:07:43 +02:00
Michael Vogel ad74580ad0
Merge pull request #7476 from tobiasd/20180805-issue7471 
[frio] remove basepath form field from admin panel site page
 2019-08-05 17:41:15 +02:00
Tobias Diekershoff 035528c2be [frio] remove basepath form field from admin panel site page 2019-08-05 17:24:30 +02:00
Michael Vogel a507963c7f
Merge pull request #7474 from MrPetovan/bug/7457-html-bbcode-plaintext 
Fix HTML/BBCode::toPlaintext
 2019-08-04 22:08:53 +02:00
Hypolite Petovan 858f210c5a
Merge pull request #7463 from annando/alt-description 
Respecting the "alt" description of images during import from HTML
 2019-08-04 10:34:20 -04:00
Hypolite Petovan 515935b241 Add test case for this bug 
- Fix whitespaces in MarkdownTest
 2019-08-04 10:24:25 -04:00
Hypolite Petovan 4a85de4c19 Add HTML output panel to babel module 2019-08-04 10:22:49 -04:00
Hypolite Petovan c3e3e83a52 Improve BBCode:toPlaintext 
- Fix issue where matching literal square brackets were removed with their content
- Fix issue where content without line feeds between BBCode tags would end up compacted in plain text
- Update extr calls to BBCode::toPlaintext in api
 2019-08-04 10:22:23 -04:00
Hypolite Petovan a0f77e1800 Improve HTML::toPlaintext 
- Ignore empty trimmed text nodes
- Ignore anchor links
- Ignore blank tags and avoids adding a doctype to transitional DOM objects
 2019-08-04 10:11:59 -04:00
Michael d2b551a616 Merge remote-tracking branch 'upstream/develop' into alt-description 2019-08-04 12:07:21 +00:00
Hypolite Petovan d5fc4a268d
Merge pull request #7466 from annando/api-alt 
API: We now transmit the text description there as well
 2019-08-04 07:16:34 -04:00
Michael 1b7f96dac8 Partly reverted, real problem fixed 2019-08-04 04:29:52 +00:00
Michael cb77b1af8c API: We now transmit the text description there as well 2019-08-04 03:45:23 +00:00
Michael 6e8057a1c3 Respecting the "alt" description of images during import from HTML 2019-08-03 11:48:47 +00:00
Hypolite Petovan b95d4f41b9
Merge pull request #7461 from annando/handling-db-error 
Moved several database stuff out of the transaction to avoid error 1205
 2019-08-03 07:10:26 -04:00
Hypolite Petovan 154df8f9d1
Merge pull request #7462 from annando/contact-uid 
The "contact-uid" is now a reliable proof for contacts that we follow
 2019-08-03 07:07:53 -04:00
Michael fc59aa6bc7 The "contact-uid" is now a reliable proof for contacts that we follow 2019-08-03 10:44:16 +00:00
Michael 764c70720c Moved several database stuff out of the transaction to avoid error 1205 2019-08-03 10:36:21 +00:00
Hypolite Petovan e5321ecc7f
Merge pull request #7458 from annando/fix-7449 
Fix issue 7449: Image permissions are now set like before
 2019-08-02 13:26:57 -04:00
Hypolite Petovan 6c4fea5e6c
Merge pull request #7459 from annando/notice 
Fix a notice when setting a picture description via API
 2019-08-02 13:26:47 -04:00
Hypolite Petovan f293d17ec3
Merge pull request #7460 from annando/contact-id-new 
Improved PR 7452: We now respect the "self" contact
 2019-08-02 13:23:06 -04:00
Michael bcadf19289 "contact-id" has to be set, after "author-id" had been set 2019-08-02 17:17:51 +00:00
Michael 7c10807d1d Clarified description 2019-08-02 16:59:26 +00:00
Michael 9819d31591 Merge remote-tracking branch 'upstream/develop' into contact-id-new 2019-08-02 16:52:34 +00:00
Michael 418009ffea Improved PR 7452: We now respect the "self" contact 2019-08-02 16:46:26 +00:00
Michael 5dc74513cc Fix a notice when setting a picture description via API 2019-08-02 16:43:36 +00:00
Michael 01ef630322 Fixed description 2019-08-02 16:42:24 +00:00
Michael d95ef96cca Fix issue 7449: Image permissions are now set like before 2019-08-02 16:38:50 +00:00
Hypolite Petovan 0b976ad193
Merge pull request #7455 from friendica/revert-7452-contact-id 
Revert "Reworked contact-id generation"
 2019-08-01 20:40:08 -04:00
Hypolite Petovan 2e6b72ba62
Revert "Reworked contact-id generation" 2019-08-01 20:39:42 -04:00
Michael Vogel e8459cce34
Merge pull request #7381 from MrPetovan/task/7309-frio-compose 
[frio] New Compose page
 2019-08-01 08:15:02 +02:00
Hypolite Petovan e9f0c4dbfb
Merge pull request #7444 from nupplaphil/task/dice_console 
Use DICE for Console
 2019-07-31 14:07:45 -04:00
Philipp 9e2a556495
Merge pull request #7453 from annando/tag-deliver-delete 
Improved logging when item had been deliberately deleted after creation
 2019-07-31 19:44:58 +02:00
Philipp Holzer 5935e69d33
Adding Configuration dependency 2019-07-31 19:43:00 +02:00
Philipp Holzer a60eb9e33d
Use DICE for Console 
- Use Friendica\Core\Console as Controller for DI-library
- Refactor every console command to use DICE (when possible)
- Adjusting tests
 2019-07-31 19:37:42 +02:00
Michael 88aa777410 Moved user block 2019-07-31 16:09:03 +00:00
Michael c936232575 Added header 2019-07-31 16:07:50 +00:00
Michael cdc44e26de Log level changed 2019-07-31 16:05:28 +00:00
Michael b377906b77 Merge remote-tracking branch 'upstream/develop' into tag-deliver-delete 2019-07-31 14:11:06 +00:00
Michael 0696026380 Improved logging when item had been deliberately deleted after creation 2019-07-31 14:09:27 +00:00
Hypolite Petovan b8a336cc0d
Merge pull request #7452 from annando/contact-id 
Reworked contact-id generation
 2019-07-31 08:12:00 -04:00
Hypolite Petovan 70b9359c38
Merge pull request #7450 from annando/api-alt-description 
We can now set image descriptions via API
 2019-07-30 18:45:06 -04:00
Michael b4c673a620 We now use a central function for fetching the postdata 2019-07-30 22:26:01 +00:00
Michael 8ddcd8417d Reworked contact-id generation 2019-07-30 22:02:32 +00:00
Michael f8b8a5a52b Merge remote-tracking branch 'upstream/develop' into api-alt-description 2019-07-30 13:40:12 +00:00
Hypolite Petovan 10395429a7
Merge pull request #7451 from annando/ap-contact-id 
Fix: The field "contact-id" now contains the correct contact id again
 2019-07-30 09:23:43 -04:00
Michael 7d79d48f6e Fix: The field "contact-id" now contains the correct contact id again 2019-07-30 13:08:14 +00:00
Michael 79bc773d02 Use tabs 2019-07-30 05:38:10 +00:00
Michael cf67b8aa37 Added documentation 2019-07-30 05:36:06 +00:00