|
|
a8d3a4d218
|
Add missing L10n::popLang calls
|
2018-10-20 09:02:10 -04:00 |
|
Ralf Thees
|
0b6f43113f
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-20 14:33:03 +02:00 |
|
|
|
ec9f1563f9
|
Merge pull request #5974 from annando/ap-receiver
AP: Transmitting and receiving with non AP contacts
|
2018-10-20 07:42:54 -04:00 |
|
Ralf Thees
|
a29073f006
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-20 10:50:36 +02:00 |
|
Michael Vogel
|
7a79ac912c
|
Merge pull request #5973 from friendica/bug/5946-remove-last-include-security
Update Addon documentation about location of logged_in hook
|
2018-10-20 10:10:56 +02:00 |
|
|
|
fea48fa85e
|
AP: Transmitting and receiving with non AP contacts
|
2018-10-20 07:53:45 +00:00 |
|
Ralf Thees
|
2f7f9ffdd8
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-20 04:40:48 +02:00 |
|
|
|
0f44e03a9e
|
Updated german addons doc with new location for logged_in hook
|
2018-10-19 15:18:10 -04:00 |
|
|
|
6b1f490a2a
|
Updated documentation for logged_in hook location
|
2018-10-19 15:15:24 -04:00 |
|
Michael Vogel
|
97c181a391
|
Merge pull request #5972 from friendica/bug/5946-remove-last-include-security
Remove last references to include/security.php
|
2018-10-19 21:14:10 +02:00 |
|
|
|
ed52b5d0a9
|
Remove reference to deleted include/security in mod/pubsub
|
2018-10-19 15:12:53 -04:00 |
|
|
|
a2666b0d02
|
Remove reference to deleted include/security.php
|
2018-10-19 15:11:51 -04:00 |
|
Michael Vogel
|
d6864311e3
|
Merge pull request #5971 from MrPetovan/bug/5970-use-temppath-passwordexposed
Use system.temppath for PasswordExposedChecker cache
|
2018-10-19 19:00:00 +02:00 |
|
Michael Vogel
|
bb3efd97ad
|
Merge pull request #5969 from friendica/bug/5968-add-click-through-image-caption
[frio] Enable click through image caption in file browser
|
2018-10-19 18:58:57 +02:00 |
|
Benjamin Lorteau
|
7795643134
|
Add system.temppath description to config/settings.ini.php
|
2018-10-19 11:27:11 -04:00 |
|
Benjamin Lorteau
|
d9209b9c7a
|
Use local temporary directory for PasswordExposedChecker cache
|
2018-10-19 11:26:48 -04:00 |
|
|
|
afeb6df225
|
[frio] Enable click through image caption in file browser
|
2018-10-19 10:46:09 -04:00 |
|
|
|
f104817967
|
Merge pull request #5967 from annando/ap-nick
Fix function naming
|
2018-10-19 10:38:51 -04:00 |
|
|
|
bedab33e0b
|
Fix function naming
|
2018-10-19 13:08:46 +00:00 |
|
|
|
ec0d3a6eac
|
Merge pull request #5946 from JonnyTischbein/move_include_security
Move and Split include/security
|
2018-10-19 08:55:08 -04:00 |
|
|
|
6e164ed09f
|
Merge pull request #5965 from annando/ap-nick
Use nickname based mentions for AP
|
2018-10-19 08:51:38 -04:00 |
|
Jonny Tischbein
|
cafd5ca781
|
update function names in logger and comments
|
2018-10-19 10:03:52 +02:00 |
|
Jeroen De Meerleer
|
bad7d1a9dc
|
updated to match coding styles
|
2018-10-19 09:45:00 +02:00 |
|
Jeroen De Meerleer
|
65f2fc39e2
|
fixed view of active embedded videos
|
2018-10-19 09:37:15 +02:00 |
|
|
|
cdeb4682ef
|
Use nickname based mentions for AP
|
2018-10-19 05:27:54 +00:00 |
|
|
|
ee5f86d836
|
Merge pull request #5964 from annando/item-thread
Use item class instead of direct call
|
2018-10-18 23:52:40 -04:00 |
|
Michael Vogel
|
8cecc9fb97
|
Merge pull request #5962 from friendica/bug/5960-fix-register-email-translation-params
Remove superfluous L10n::t() parameter in Model\user
|
2018-10-19 05:34:24 +02:00 |
|
Michael Vogel
|
45156652cc
|
Merge pull request #5963 from MrPetovan/bug/5956-catch-more-diaspora-magic-links
Diaspora: Widen the magic link regular expression
|
2018-10-19 05:30:52 +02:00 |
|
|
|
4ae37c6196
|
Merge remote-tracking branch 'upstream/develop' into item-thread
|
2018-10-19 03:19:34 +00:00 |
|
|
|
d0681075bf
|
Add itemsource module
|
2018-10-18 22:49:25 -04:00 |
|
|
|
eb714f0487
|
Diaspora: Widen the magic link regular expression
|
2018-10-18 22:39:06 -04:00 |
|
|
|
8315940c39
|
Merge pull request #5961 from annando/simpler-item
The handling with item-content and item-activity had been simplified
|
2018-10-18 18:24:09 -04:00 |
|
|
|
18763e32af
|
Remove superfluous L10n::t() parameter in Model\user
|
2018-10-18 18:22:48 -04:00 |
|
|
|
0628b44f8e
|
The handling with item-content and item-activity had been simplified
|
2018-10-18 21:35:48 +00:00 |
|
|
|
2b663ed2b6
|
Fix broken credits box
Otherwise the content is exceeding the box, both on desktop and mobile.
|
2018-10-18 22:49:03 +02:00 |
|
Ralf Thees
|
fc4d01c088
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-18 21:22:13 +02:00 |
|
Michael Vogel
|
ca86a9e1d6
|
Merge pull request #5957 from friendica/bug/5955-restore-preshare
Restore preshare prepending in BBCode::convertShare
|
2018-10-18 19:34:29 +02:00 |
|
|
|
ee32cf6b92
|
Restore preshare prepending in BBCode::convertShare
Fixes #5955
Follow-up to #5942
|
2018-10-18 11:23:48 -04:00 |
|
|
|
a1919992b9
|
Merge pull request #5954 from annando/fix-null-receiver
AP: Fix "null" receiver
|
2018-10-18 10:05:05 -04:00 |
|
Michael Vogel
|
2a3d5da8d6
|
Merge pull request #5953 from MrPetovan/task/5891-contacts-follow-up
Replace remaining instances of "contacts/"
|
2018-10-18 16:02:02 +02:00 |
|
|
|
688174e6c0
|
AP: Fix "null" receiver
|
2018-10-18 12:25:57 +00:00 |
|
|
|
6d5b2c484d
|
Replace remaining instances of "contacts/"
|
2018-10-18 07:48:34 -04:00 |
|
Ralf Thees
|
fdac992b6b
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-18 10:42:10 +02:00 |
|
|
|
e2f005f68c
|
Merge pull request #5952 from annando/ap-fixes
AP: Fix a notice / avoid an error when fetched content hadn't been an array
|
2018-10-18 08:02:27 +02:00 |
|
|
|
8035bad8e2
|
AP: Fix a notice / avoid an error when fetched content hadn't been an array
|
2018-10-18 05:54:44 +00:00 |
|
|
|
da2a17495d
|
Merge pull request #5951 from annando/endless-contact
Avoid endless loop when trying to fetch contact id
|
2018-10-18 00:44:07 -04:00 |
|
|
|
6d420dfe9e
|
Merge pull request #5950 from annando/no-polling
For test purposes we can now deactivate polling
|
2018-10-18 00:43:35 -04:00 |
|
|
|
92816dc725
|
Improved loop detection
|
2018-10-18 03:33:08 +00:00 |
|
|
|
35da40c2cb
|
Avoid endless loop when trying to fetch contact id
|
2018-10-18 03:01:34 +00:00 |
|
|
|
d307aa1484
|
For test purposes we can now deactivate polling
|
2018-10-18 02:46:02 +00:00 |
|
