bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity
18750 commits 3 branches 61 tags 178 MiB
Commit graph

18750 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexandre Alapetite e860cdf6a8 Swap if / elseif 
https://github.com/friendica/friendica/pull/4782#discussion_r179947984
 2018-04-08 16:02:25 +02:00
Alexandre Alapetite 82f1f2f00e Remove SQL column legacy_password 2018-04-08 14:53:12 +02:00
Alexandre Alapetite cb26cd6d5d Remove legacy_password test 2018-04-08 14:42:18 +02:00
Alexandre Alapetite 129f6806f6 Fix update password rehash 
Fixes https://github.com/friendica/friendica/issues/4743
The logic for updating password was wrong:
b0a764b14c (diff-1466bb1a0a37fe9f7cf52eda8f3b431aR150)
 2018-04-08 12:40:35 +02:00
Hypolite Petovan 232d1009e5
Merge pull request #4767 from tobiasd/20180407-de 
Update of the DE translations
 2018-04-07 02:44:33 -04:00
Tobias Diekershoff 575ddc83e2 DE translations 2018-04-07 08:36:48 +02:00
Michael Vogel 5af9fa0be1
Merge pull request #4764 from MrPetovan/bug/4755-use-sender-header-invite 
Use Sender: header for invite emails
 2018-04-07 08:31:14 +02:00
Hypolite Petovan 9220025b12 Exchange Sender: and From: headers in mod/invite 2018-04-07 02:26:33 -04:00
Michael Vogel 8cabfdde76
Merge pull request #4766 from MrPetovan/task/4721-group-button-color 
[frio] Add color to group membership action buttons
 2018-04-07 08:25:16 +02:00
Michael Vogel 29d18a7ed7
Merge pull request #4765 from MrPetovan/bug/4730-fix-profile-list 
Fix contact profile visibility list
 2018-04-07 08:23:32 +02:00
Michael Vogel 7c9bd69e22
Merge pull request #4763 from MrPetovan/bug/4760-fix-event-typo 
Fix event id typo in Model\Event
 2018-04-07 08:22:45 +02:00
Hypolite Petovan 60f3a6aac0 [frio] Add color to group membership action buttons 2018-04-06 23:55:29 -04:00
Hypolite Petovan 37505f8f28 Fix variable name typo in ContactSelector::profileAssign 2018-04-06 21:54:53 -04:00
Hypolite Petovan 7413dc62f0 Remove trailing whitespaces in Content\ContactSelector 2018-04-06 21:54:22 -04:00
Hypolite Petovan 0f02d1a449 Use App->getSenderEmailAddress in mod/invite 
- Use "Sender: " header
- Rename confusing variables
 2018-04-06 21:48:37 -04:00
Hypolite Petovan 32ca95a1b0 Use App->getSenderEmailAddress in include/enotify 2018-04-06 21:47:42 -04:00
Hypolite Petovan a86d1806ae Add App->getSenderEmailAddress method 2018-04-06 21:47:16 -04:00
Hypolite Petovan 8b5341b84c Fix event id typo in Model\Event 2018-04-06 20:58:09 -04:00
Hypolite Petovan 59d42e9681
Merge pull request #4762 from annando/frio-accessibility 
Some more accessibility for "Frio"
 2018-04-06 17:07:25 -04:00
Michael ed316b38ee Some more accessibility for "Frio" 2018-04-06 20:42:38 +00:00
Hypolite Petovan e4ebf8263c
Merge pull request #4759 from annando/update-render-cache 
Update the cached rendered html when it changed
 2018-04-06 14:22:12 -04:00
Hypolite Petovan b2068bd2f5
Merge pull request #4761 from tobiasd/20180406-recoverstrings 
regenerated master messages.po file
 2018-04-06 12:57:56 -04:00
Michael 0ccb29c4df Only compare the HTML when we forcefully ignore the cache 2018-04-06 16:52:01 +00:00
Tobias Diekershoff 0a47f73685 regenerated master messages.po file 2018-04-06 16:59:56 +02:00
Michael 297784880e Update the cached rendered html when it changed 2018-04-06 14:01:52 +00:00
Tobias Diekershoff f0590145b9
Merge pull request #4758 from annando/fix-regexp 
Fixes warning "missing terminating ] for character class"
 2018-04-06 11:13:42 +02:00
Michael 8d68e865c1 Fixes warning "missing terminating ] for character class" 2018-04-06 09:11:10 +00:00
Michael Vogel 2d9719f9ff
Merge pull request #4757 from tobiasd/20180406-lng 
core translations
 2018-04-06 10:02:05 +02:00
Tobias Diekershoff a787f80bbd added FI translation as core translation is now over 50% THX Kris 2018-04-06 09:27:39 +02:00
Tobias Diekershoff 13470cbd75 update to the NL translation THX Karel 2018-04-06 09:25:21 +02:00
Michael Vogel 05cff59f70
Merge pull request #4722 from MrPetovan/task/add-content_filter-hook 
Add content_filter hook
 2018-04-06 06:42:52 +02:00
Hypolite Petovan 738f780dda
Merge pull request #4754 from annando/frio-accessibility 
Improved accessibility for "Frio"
 2018-04-05 17:57:01 -04:00
Michael 3792012723 Improved accessibility for "Frio" 2018-04-05 21:50:34 +00:00
Hypolite Petovan 4d0fb02226
Merge pull request #4747 from annando/img-alt-text 
Bugfix: The rendering with images with width and height was broken
 2018-04-05 08:06:20 -04:00
Hypolite Petovan 972d610bdf
Merge pull request #4751 from friendica/revert-4750-revert-4746-img-alt-text 
Revert "Revert "Added support of alt texts in images""
 2018-04-05 08:05:25 -04:00
Hypolite Petovan 6301b83d7f
Revert "Revert "Added support of alt texts in images"" 2018-04-05 08:05:09 -04:00
Hypolite Petovan 00d158350a
Merge pull request #4750 from friendica/revert-4746-img-alt-text 
Revert "Added support of alt texts in images"
 2018-04-05 08:00:47 -04:00
Hypolite Petovan 4997ccd3df
Revert "Added support of alt texts in images" 2018-04-05 07:59:57 -04:00
Michael Vogel f65023a9f3
Merge pull request #4748 from tobiasd/220180405-de 
update for DE translation THX Andreas
 2018-04-05 09:07:32 +02:00
Tobias Diekershoff 909d542c4a update for DE translation THX Andreas 2018-04-05 08:36:16 +02:00
Michael 4a909fcfcf Bugfix: The rendering with images with width and height was broken 2018-04-05 06:01:36 +00:00
Hypolite Petovan a88e5e3742 Updated messages.po 2018-04-04 23:11:17 -04:00
Hypolite Petovan 9403e614aa Update system.disable_cw help text 2018-04-04 23:08:48 -04:00
Hypolite Petovan 34fd442821 Rename social.disable_cw pconfig to system.disable_cw 2018-04-04 23:08:48 -04:00
Hypolite Petovan 41db5f0912 Display content warning as title if collapsing is deactivated 2018-04-04 23:08:48 -04:00
Hypolite Petovan 296f561878 Rename hook to "prepare_body_content_filter" 2018-04-04 23:08:48 -04:00
Hypolite Petovan d38b86dabf Fix disabled content filter for own posts 2018-04-04 23:08:48 -04:00
Hypolite Petovan f26c99d17b Disable content filter for preview and own posts 2018-04-04 23:08:48 -04:00
Hypolite Petovan d603bf062d Add CSS classes to content-filter wrapper 2018-04-04 23:08:48 -04:00
Hypolite Petovan 2d1942a1fa Update hook documentation 2018-04-04 23:08:48 -04:00