Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-16 12:53:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
26638 commits 3 branches 64 tags 247 MiB
Commit graph

26638 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan
da0c99a78a
Merge pull request #7477 from tobiasd/20190805-lng 
DE, PL translation updates
 2019-08-05 13:25:09 -04:00
Michael
cbee91a61b Avoid a notice 2019-08-05 16:48:58 +00:00
Michael Vogel
7795fafdbf
Merge pull request #7478 from tobiasd/20190805-typo 
Typo in setting description
 2019-08-05 18:33:24 +02:00
Michael
bdc07b4213 Added support for image descriptions and multiple image posts to external services 2019-08-05 16:27:45 +00:00
Tobias Diekershoff
3053cde210 Typo in setting description 2019-08-05 18:07:43 +02:00
Tobias Diekershoff
02d0bb24b3 DE translation update THX hoergen 2019-08-05 18:03:46 +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
03e97db0fc PL translation update THX waldis 2019-08-05 17:35:23 +02:00
Tobias Diekershoff
035528c2be [frio] remove basepath form field from admin panel site page 2019-08-05 17:24:30 +02:00
Philipp Holzer
2e65b96cb4
Revert ProfilerTest 2019-08-05 09:22:06 +02:00
Philipp Holzer
9682cc440c
Using method-chaining for DICE 2019-08-05 09:03:12 +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
Philipp Holzer
a66580444f
Fixing sort of BaseURL usage for App & Cache usage 2019-08-04 20:01:15 +02:00
Philipp Holzer
fba0574ec0
Switched to Classes for ApiTest 2019-08-04 18:50:24 +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
Philipp Holzer
3834d5e129
Renamed __toString() to getName() 2019-08-04 16:14:19 +02: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
Philipp Holzer
d2211bd6dd
Removed some leftovers 2019-08-04 15:58:53 +02:00
Philipp Holzer
7cdcad9f6c
Remove unused class variable 2019-08-04 15:54:37 +02:00
Philipp Holzer
19777baa79
- Move constants to the "Cache" class (more transparent than inside the interface) 2019-08-04 15:53:28 +02:00
Philipp Holzer
34e4968c06
Adding possibility to use a different cache-backend for locking and caching 
- Renaming *LockDriver to *Lock since it isn't a "driver" anymore
 2019-08-04 15:42:39 +02: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
Philipp Holzer
86bf2ee45a
Rename *CacheDriver to *Cache because they don't act as driver anymore 2019-08-04 10:26:53 +02: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
Philipp Holzer
d56bd28a07
Refactor Cache/Lock to DICE 
- Refactor Cache classes
- Refactor Lock classes
- Improved test speed (removed some seperate class annotations)
 2019-08-03 20:51:58 +02: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