 Michael
|
6f9ec690aa
|
Merge remote-tracking branch 'upstream/develop' into no-author-link
|
2018-06-16 15:37:54 +00:00 |
|
|
Michael
|
abef0cd46c
|
Don't use the author-link anymore - just author-id
|
2018-06-16 15:35:30 +00:00 |
|
Hypolite Petovan
|
7d1bb9ecf4
|
Merge pull request #5230 from annando/new-item-uri
New function for generating item URI
|
2018-06-16 10:54:56 -04:00 |
|
|
Hypolite Petovan
|
5fb8c758fd
|
Merge pull request #5229 from rabuzarus/20180616_-_fix_stream_position_ajax_update
fix scroll position in stream while ajax update
|
2018-06-16 09:06:32 -04:00 |
|
|
Hypolite Petovan
|
133cd342d4
|
Merge pull request #5226 from annando/even-more-abstraction
More item calls have been replaced with the new functions
|
2018-06-16 07:57:00 -04:00 |
|
|
Michael
|
a54fea313f
|
More indentions
|
2018-06-16 11:52:28 +00:00 |
|
rabuzarus
|
1a8d3c460e
|
add class "wall-item-body" to all themes
|
2018-06-16 13:50:56 +02:00 |
|
|
rabuzarus
|
d0ea208d04
|
main.js - move some code of liveUpdate() into updateConvItems() for readability
|
2018-06-16 13:38:32 +02:00 |
|
rabuzarus
|
a2fc1be187
|
fix scroll position in stream while ajax update
|
2018-06-16 13:05:33 +02:00 |
|
 Tobias Diekershoff
|
7966c48e75
|
Merge pull request #5228 from annando/fix-5199
Fix for PR 5199: Corrected check for empty object
|
2018-06-16 09:42:36 +02:00 |
|
|
Michael
|
d2da5d63c7
|
Fix for PR 5199: Corrected check for empty object
|
2018-06-16 07:26:09 +00:00 |
|
|
Michael
|
14cb128264
|
New function for generating item URI
|
2018-06-16 06:44:19 +00:00 |
|
|
Michael
|
8592fc435c
|
Fix indenting
|
2018-06-16 06:27:20 +00:00 |
|
|
Tobias Diekershoff
|
b729e8b21c
|
Merge pull request #5227 from MrPetovan/bug/fix-php72-notice-model-contact
Fix PHP 7.2 Warning in Model\Contact
|
2018-06-16 08:02:13 +02:00 |
|
|
Hypolite Petovan
|
c651641856
|
Fix PHP 7.2 Warning in Model\Contact
|
2018-06-15 20:50:31 -04:00 |
|
Michael Vogel
|
a029439686
|
Merge pull request #5224 from rabuzarus/20180615_-_frio_frix_js_error_callAddonHooks
Frio: add addon_hooks to head.tpl
|
2018-06-16 00:39:00 +02:00 |
|
|
Michael
|
bb79b8f4ac
|
More item calls have been replaced with the new functions
|
2018-06-15 22:30:49 +00:00 |
|
rabuzarus
|
2b69571cbf
|
Frio: add addon_hooks to head.tpl
|
2018-06-15 22:55:00 +02:00 |
|
|
Hypolite Petovan
|
41d1f0173a
|
Merge pull request #5223 from annando/fast-daemon
Multiple daemon improvements (foreground, faster spawning)
|
2018-06-15 14:50:23 -04:00 |
|
|
Michael
|
e97a3c25e7
|
Multiple daemon improvements (foreground, faster spawning)
|
2018-06-15 18:18:20 +00:00 |
|
|
Tobias Diekershoff
|
71b017bfad
|
Merge pull request #5219 from annando/abstraction-2
Reworked notifications / use of Item class to fetch data
|
2018-06-15 09:54:50 +02:00 |
|
|
Michael Vogel
|
a1e06c9782
|
Merge pull request #5218 from MrPetovan/bug/fix-feed-reshare
Fix feed blank reshare body
|
2018-06-15 08:06:56 +02:00 |
|
|
Michael
|
02fef0bcf5
|
Reworked notifications ("alt pager" added) / use of Item class to fetch data
|
2018-06-15 05:50:28 +00:00 |
|
|
Tobias Diekershoff
|
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
|
c96b330a72
|
Allow share body output for private = 2 in mod/share
|
2018-06-14 23:53:54 -04: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 |
|
|
Michael
|
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 |
|
|
Michael
|
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 |
|