Michael
|
30a4b0eafb
|
Merge remote-tracking branch 'upstream/develop' into item-notification
|
2020-01-04 22:53:06 +00:00 |
|
Michael Vogel
|
c8a322baf0
|
Merge pull request #8053 from nupplaphil/task/remove_get_app
Remove get_app() in favor of DI::app()
|
2020-01-04 23:41:51 +01:00 |
|
nupplaPhil
|
244f440d97
|
Remove unused killme()
|
2020-01-04 23:43:13 +01:00 |
|
|
nupplaPhil
|
f0eea6f875
|
Remove get_app() in favor of DI::app()
|
2020-01-04 23:42:01 +01:00 |
|
|
Michael Vogel
|
05de0f4a19
|
Merge pull request #8056 from nupplaphil/task/remove_rdirname
Remove rdirname() in favor of native dirname()
|
2020-01-04 23:36:59 +01:00 |
|
|
nupplaPhil
|
07b4ceecd2
|
Remove deprecated rdirname() in favor of native dirname()
|
2020-01-05 00:10:34 +01:00 |
|
Philipp
|
729277529f
|
Merge pull request #8052 from annando/contentmap
AP: Transmit the language in the contentMap
|
2020-01-04 23:07:57 +01:00 |
|
|
Michael
|
b08c9692ca
|
Added parameter type
|
2020-01-04 21:48:26 +00:00 |
|
|
Michael
|
3a1798d1c3
|
First testable version
|
2020-01-04 21:45:20 +00:00 |
|
|
Michael
|
7cf27e9cb0
|
AP: Transmit the language in the contentMap
|
2020-01-04 14:35:14 +00:00 |
|
|
Michael
|
4bfd0abec7
|
New "UserItem" class, new notification type field
|
2020-01-04 12:21:42 +00:00 |
|
|
Michael Vogel
|
5d20cd7e16
|
Merge pull request #8048 from MrPetovan/bug/fix-bbcode-scaleexternalimage
Fix BBCode::scaleExternalImage
|
2020-01-03 17:38:55 +01:00 |
|
Tobias Diekershoff
|
d3f5c9f24c
|
Merge pull request #8050 from MrPetovan/bug/improve-feed-import
Rework Feed::import parameters
|
2020-01-03 17:08:54 +01:00 |
|
Hypolite Petovan
|
4461c16165
|
Remove superfluous comment in BBCode::scaleExternalImage
|
2020-01-03 09:30:35 -05:00 |
|
|
Hypolite Petovan
|
ebaf726744
|
Rework Feed::import parameters
- Remove unused $hub
- Replace $simulate with an implicit condition
|
2020-01-03 09:26:28 -05:00 |
|
|
Hypolite Petovan
|
38fe3b8994
|
Fix formatting in Feed::import
|
2020-01-03 09:12:32 -05:00 |
|
|
Hypolite Petovan
|
52c5b0e0f3
|
Remove unused BBCode::scaleExternalImage parameters
- Remove now obsolete system.no_view_full_size config key
|
2020-01-02 20:44:15 -05:00 |
|
|
Hypolite Petovan
|
542e83137b
|
Remove useless HTML encode on item save
|
2020-01-02 20:38:07 -05:00 |
|
|
Hypolite Petovan
|
0b3cd206c3
|
Remove harmful HTML decode/encode in BBCode::scaleExternalImages
|
2020-01-02 20:35:59 -05:00 |
|
|
Hypolite Petovan
|
7420d07699
|
Merge pull request #8046 from annando/develop
Relocated functions from PortableContact to GServer
|
2020-01-01 18:20:31 -05:00 |
|
|
Michael
|
fb550a0172
|
Relocated functions from PortableContact to GServer
|
2020-01-01 21:29:36 +00:00 |
|
|
Philipp
|
75c74e8562
|
Merge pull request #8044 from annando/contact-adding
Don't add contacts when not needed
|
2020-01-01 20:38:34 +01:00 |
|
|
Michael
|
bd6fb64c16
|
Fixed documentation
|
2020-01-01 18:57:55 +00:00 |
|
|
Michael
|
73b82d1455
|
Don't add contacts when not needed
|
2020-01-01 17:54:36 +00:00 |
|
|
Philipp
|
12ca5748eb
|
Merge pull request #8042 from MrPetovan/bug/fix-remember-me
Add missing constructor parameter to User\Cookie in dependencies.config
|
2020-01-01 18:32:58 +01:00 |
|
|
Hypolite Petovan
|
933085c626
|
Add missing constructor parameter to User\Cookie in dependencies.config
|
2020-01-01 10:56:56 -05:00 |
|
|
Tobias Diekershoff
|
526eada6a8
|
Merge pull request #8041 from AlfredSK/patch-1
Fix missing use statement for DI (fatal error)
|
2020-01-01 12:38:00 +01:00 |
|
Steffen K9
|
b75707f826
|
Fix missing use statement for DI (fatal error)
|
2020-01-01 12:35:44 +01:00 |
|
|
Tobias Diekershoff
|
d3d63523ef
|
Merge pull request #8040 from MrPetovan/bug/notices
Add necessary call to BaseUrl->get() in Module\Objects
|
2019-12-31 19:43:34 +01:00 |
|
|
Tobias Diekershoff
|
20831f3574
|
Merge pull request #8039 from MrPetovan/bug/fatal-errors
Correctly capitalize DI::baseUrl in Module\Tos
|
2019-12-31 19:41:53 +01:00 |
|
|
Hypolite Petovan
|
ab0a3f194a
|
Add necessary call to BaseUrl->get() in Module\Objects
- Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-569959500
|
2019-12-31 12:25:41 -05:00 |
|
|
Hypolite Petovan
|
b6e93c83fc
|
Suppress undefined index nickname notice in Model\Profile::sidebar
|
2019-12-31 12:25:39 -05:00 |
|
|
Hypolite Petovan
|
07f1485df1
|
Correctly capitalize DI::baseUrl in Module\Tos
- Addresses https://github.com/friendica/friendica/issues/7998#issuecomment-569959102
- Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-569959336
|
2019-12-31 12:19:12 -05:00 |
|
|
Philipp
|
b9dba631aa
|
Merge pull request #8037 from MrPetovan/bug/notices
Replace remaining $a->page by DI::page()
|
2019-12-30 23:41:23 +01:00 |
|
|
Hypolite Petovan
|
b852e5842b
|
Merge pull request #8036 from nupplaphil/task/redundant_system_call
Remove redundant System::baseUrl() and System::removedBaseUrl() calls
|
2019-12-30 17:37:25 -05:00 |
|
|
nupplaPhil
|
9bdb4db887
|
Replace comment
|
2019-12-30 23:45:42 +01:00 |
|
|
Hypolite Petovan
|
e84ad15569
|
Replace remaining $a->page by DI::page()
|
2019-12-30 17:35:01 -05:00 |
|
|
nupplaPhil
|
e2dc1d7477
|
Remove deprecated call
|
2019-12-30 23:08:06 +01:00 |
|
|
nupplaPhil
|
a4a7f19df1
|
Move redundant System::removedBaseUrl() to DI::baseUrl()->remove() calls
|
2019-12-30 23:03:56 +01:00 |
|
|
nupplaPhil
|
3f34229752
|
Move redundant System::baseUrl() to DI::baseUrl() calls
|
2019-12-30 23:00:08 +01:00 |
|
|
Hypolite Petovan
|
f2da1c5ab9
|
Merge pull request #8035 from nupplaphil/task/move_page
Replace deprecated $a->page with DI::page()
|
2019-12-30 13:42:40 -05:00 |
|
|
nupplaPhil
|
4d8d4ad958
|
Add parameter to index -> runFrontend()
|
2019-12-30 20:20:41 +01:00 |
|
|
nupplaPhil
|
6d7362da41
|
Replace deprecated $a->page with DI::page()
|
2019-12-30 20:02:09 +01:00 |
|
|
Philipp
|
6c2d13403e
|
Merge pull request #8010 from MrPetovan/task/7968-mastodon-api-account-fields
Task/7968 mastodon api account fields
|
2019-12-30 13:28:15 +01:00 |
|
|
Hypolite Petovan
|
4aa01ee17f
|
Use most recent last item date in Mastodon\Account
|
2019-12-30 06:12:52 -05:00 |
|
|
Hypolite Petovan
|
0dbce6e58b
|
Add user contact data superseding to Mastodon\Account::create
|
2019-12-30 06:12:51 -05:00 |
|
|
Hypolite Petovan
|
c286772fb5
|
Correct value of Mastodon API Account acct field for local users
|
2019-12-30 06:12:51 -05:00 |
|
|
Hypolite Petovan
|
bef16702c7
|
Add missing fields to Mastodon API Account entity
|
2019-12-30 06:12:51 -05:00 |
|
|
Hypolite Petovan
|
cb7875b035
|
Rename Api\Mastodon\Account::createFromContact to just create
- Retrieve public contact in Api\Mastodon\FollowRequests instead of user contact
|
2019-12-30 06:12:50 -05:00 |
|
|
Hypolite Petovan
|
9ed8479b32
|
Rename Api\Mastodon\Account::create contact parameter to publicContact
- Update Mastodon entity documentation link
- Add default value for fields
|
2019-12-30 06:11:48 -05:00 |
|