Commit graph

19738 commits

Author SHA1 Message Date
641ca5c08e
Merge pull request #5217 from MrPetovan/bug/5191-fix-registration-email
Fix corrupt registration emails
2018-06-15 06:33:22 +02:00
Hypolite Petovan
7469de29f1 Fix corrupt registration emails
- Use double quotes for line break-containing translation string
- Simplify HTML/plaintext email body conversion
2018-06-14 23:42:08 -04:00
Hypolite Petovan
6191fab4d7
Merge pull request #5216 from abanink/2337
solves 2337 Smiley Pack 1.04: some smiley keywords aren't replaced correctly
2018-06-14 15:36:21 -04:00
Pascal Deklerck
ce4b793acf solves 2337 Smiley Pack 1.04: some smiley keywords aren't replaced correctly 2018-06-14 21:09:55 +02:00
Hypolite Petovan
f0c2b77157
Merge pull request #5215 from rabuzarus/20180614_-_frio_contact_suggestion_template
Frio: provide a template for received contact suggestions
2018-06-14 13:56:30 -04:00
rabuzarus
02344ce78c Frio: background color for fsuggest module 2018-06-14 18:57:30 +02:00
rabuzarus
aaeb85c944 Frio: scroll to the contact request in notifications module 2018-06-14 18:49:53 +02:00
rabuzarus
b8186ba98b Frio: provide a template for received contact suggestions 2018-06-14 17:05:23 +02:00
Hypolite Petovan
0134fa31d1
Merge pull request #5214 from abanink/5118
Added PHP part of JavaScript hooks to Addons.md doc
2018-06-14 10:32:02 -04:00
Pascal Deklerck
ff0a4a3124 Added PHP part of JavaScript hooks to Addons.md doc 2018-06-14 15:31:38 +02:00
Hypolite Petovan
ecd8bb166c
Merge pull request #5213 from fabrixxm/smallfix
Create config keys if they not exists on set (bis)
2018-06-14 08:43:57 -04:00
Hypolite Petovan
9500c1b663
Merge pull request #5210 from rabuzarus/20180613_-_frio_fix_autocompletion
Frio: fix contact filtering on contacts page
2018-06-14 08:43:06 -04:00
fabrixxm
574bfecdfd Create config keys if they not exists on set. 2018-06-14 13:18:01 +02:00
rabuzarus
0db6002e3c Frio: fix contact filtering on contacts page 2018-06-13 23:04:07 +02:00
Hypolite Petovan
a1455489bf
Merge pull request #5207 from annando/multiple-delete
Don't allow deletion of public posts
2018-06-13 15:49:57 -04:00
Hypolite Petovan
97e95473a1
Merge pull request #5179 from abanink/5118
5118 Create Javascript hook mechanism
2018-06-13 15:35:13 -04:00
Pascal Deklerck
0eace1ffa4 Add JavaScript addon hook documentation in doc/Addons.md 2018-06-13 21:34:19 +02:00
Hypolite Petovan
5b7fdacf17
Merge pull request #5206 from miqrogroove/patch-1
Patch for #5202
2018-06-13 15:25:32 -04:00
77c423ec04 Don't allow deletion of public posts 2018-06-13 19:19:17 +00:00
miqrogroove
5f822051d9
Quotes Altered 2018-06-13 15:07:27 -04:00
Pascal Deklerck
ba4ddb1d8d Test if addon_hooks is an array before using it 2018-06-13 21:05:54 +02:00
Pascal Deklerck
b54d1b708a Code standards updates 2018-06-13 21:03:19 +02:00
miqrogroove
6365cf955c
Patch for #5202
Add quotes to an erroneously unquoted callback so that PHP doesn’t treat it as a global constant.
2018-06-13 14:41:45 -04:00
Hypolite Petovan
5d2fce417d
Merge pull request #5203 from annando/more-abstraction
More abstraction for the item access
2018-06-13 08:57:24 -04:00
0bdd133ebb Tabs instead of spaces 2018-06-13 12:53:56 +00:00
Pascal Deklerck
a11103a3a7 Code organisation and documentation of JS hook code 2018-06-13 09:31:08 +02:00
Michael Vogel
60be4ef706
Merge pull request #5204 from tobiasd/20180613-enus
EN US translation update THX miqrogroove
2018-06-13 07:54:55 +02:00
138355838f EN US translation update THX miqrogroove 2018-06-13 07:43:49 +02:00
c8aebaa3eb
Merge pull request #5198 from MrPetovan/bug/5099-content-filter-hide-attachments
Wrap content filter around entire post including attachments
2018-06-13 07:24:06 +02:00
Michael Vogel
e574c87d48
Merge pull request #5199 from MrPetovan/bug/4971-fix-php72-notice-portablecontact
Fix PHP 7.2 sizeof notice messages in Protocol\PortableContact
2018-06-13 07:16:58 +02:00
Hypolite Petovan
0bcf7b7c39 Fix PHP 7.2 sizeof notice messages in Protocol\PortableContact 2018-06-12 22:01:50 -04:00
Hypolite Petovan
d46cac7905 Wrap content filter around entire post including attachments 2018-06-12 21:54:36 -04:00
Hypolite Petovan
c548109279
Merge pull request #5196 from tobiasd/20180612-cs
update CS translation THX Aditoo
2018-06-12 10:32:21 -04:00
3895c87e75 update CS translation THX Aditoo 2018-06-12 15:58:35 +02:00
a4607f8d1c More abstraction for the item access 2018-06-12 09:05:36 +00:00
d602da024f
Merge pull request #5192 from annando/quit-on-error
Reconnect or quit on lost database connection
2018-06-12 10:51:54 +02:00
Hypolite Petovan
d71281e45b
Merge pull request #5193 from annando/dbstructure
Fix: Avoid endlessly dbstructure changes
2018-06-11 09:53:03 -04:00
b9811f1bef Fix: Avoid endlessly dbstructure changes 2018-06-11 13:22:08 +00:00
738644a006 Quit if database connection was lost during "e" 2018-06-11 03:56:19 +00:00
8584e09e12 Store the database credentials for reconnect 2018-06-11 03:45:45 +00:00
b02cdc8a7f Merge remote-tracking branch 'upstream/develop' into quit-on-error 2018-06-11 03:15:59 +00:00
Hypolite Petovan
6eb70e4415
Merge pull request #5189 from annando/daemon-db
Force a database reconnection in the daemon to prevent lost connections
2018-06-10 19:17:38 -04:00
aa3f8ec09d Force a database reconnection in the daemon to prevent lost connections 2018-06-10 22:04:09 +00:00
Hypolite Petovan
1355798584
Merge pull request #5184 from annando/fetch-item
Central function to retrieve item or thread data
2018-06-10 15:48:08 -04:00
060997feda (Partly) reworked notes 2018-06-10 19:29:34 +00:00
5bfd424fd2 Clean up tag claud (remove "item_condition()" call) 2018-06-10 15:19:52 +00:00
c1d9c29eea Search is now changed as well. 2018-06-10 14:36:22 +00:00
4d4cce4867 The new function is now used here as well. 2018-06-10 10:14:53 +00:00
8375d4ac4c Notes again 2018-06-10 08:58:03 +00:00
b26c5e7f73 And now the notes 2018-06-10 08:30:27 +00:00