Franz Liedke
8b157346df
Fix comment
2017-12-28 22:47:13 +01:00
Toby Zerner
aee72d712b
Merge branch 'next-back'
2017-12-28 12:19:56 +10:30
Toby Zerner
cc9f0dcdb1
Merge pull request #1308 from flarum/next-back
...
Next back > master
2017-12-28 12:13:40 +10:30
Toby Zerner
fa1e557e0a
Remove unused method
2017-12-27 16:17:35 +10:30
Toby Zerner
f846d5c5e4
Fix some class names, clean up imports
2017-12-27 16:17:25 +10:30
Toby Zerner
f19e24a377
Fix class names, view namespace
2017-12-27 16:15:21 +10:30
Toby Zerner
53b793845a
Fix class name
2017-12-27 16:09:35 +10:30
Toby Zerner
89ec1d77df
Fix class names
2017-12-27 16:09:20 +10:30
Toby Zerner
3934f12b48
Fix docblock
2017-12-27 16:07:25 +10:30
Toby Zerner
d96cff6332
Fix class names
2017-12-27 16:07:21 +10:30
Toby Zerner
21f99335bf
Fix a stray class name
2017-12-27 16:06:37 +10:30
Toby Zerner
cd2d56fd99
lists → pluck for Laravel 5.5
2017-12-27 16:06:27 +10:30
Toby Zerner
a1fe93f355
Update namespaces for beta 8
2017-12-27 09:52:45 +10:30
Toby Zerner
b8d73a9ade
lists → pluck for Laravel 5.5
2017-12-27 07:32:39 +10:30
Toby Zerner
b4bc534028
Upgrade to Laravel 5.5
2017-12-27 07:32:21 +10:30
Toby Zerner
8b843a9eb3
Fix class names
2017-12-27 07:31:26 +10:30
Toby Zerner
ccd1aff156
Merge branch 'master' into next-back
2017-12-27 07:09:40 +10:30
Toby Zerner
b5809d1b7f
Merge branch 'master' into next-back
2017-12-27 07:06:09 +10:30
Toby Zerner
57c730af29
Merge branch 'master' into next-back
...
# Conflicts:
# src/Listener/PinStickiedDiscussionsToTop.php
2017-12-26 20:38:55 +10:30
Toby Zerner
ac0a9e0567
Fix order of array_first arguments
...
As per https://laravel.com/docs/5.3/upgrade (under "Arrays")
2017-12-26 20:38:15 +10:30
Toby Zerner
4548522ad7
Merge branch 'master' into next-back
2017-12-26 20:23:13 +10:30
Toby Zerner
2d9839ee66
Fix relationship method arguments
...
As per https://laravel.com/docs/5.5/upgrade (under "Eloquent")
2017-12-26 20:21:47 +10:30
Toby Zerner
c145121516
Merge branch 'master' into next-back
...
# Conflicts:
# src/Listener/AddPostMentionedByRelationship.php
# src/Listener/FormatPostMentions.php
# src/Listener/FormatUserMentions.php
# src/Listener/UpdatePostMentionsMetadata.php
# src/Listener/UpdateUserMentionsMetadata.php
2017-12-26 20:20:31 +10:30
Toby Zerner
f38103e077
Fix likes relationship method arguments
...
As per https://laravel.com/docs/5.5/upgrade (under "Eloquent")
2017-12-26 20:09:44 +10:30
Toby Zerner
1c7855b646
Merge branch 'master' into next-back
...
# Conflicts:
# src/Listener/SendNotificationWhenPostIsLiked.php
2017-12-26 19:59:27 +10:30
Toby Zerner
92017e5a40
Merge branch 'master' into next-back
2017-12-26 19:50:48 +10:30
Toby Zerner
a822ab8310
Fix class name
2017-12-26 19:47:42 +10:30
Toby Zerner
15039737b8
Don't over-cache the disallowed tags
2017-12-26 19:44:53 +10:30
Toby Zerner
6f07aef206
Performance: Reuse list of disallowed tags
2017-12-26 19:44:53 +10:30
Franz Liedke
2936b894d4
Move garbage collection into middleware
...
This prevents garbage collection to randomly break the installer:
before installation, the models that are being accessed have no
database connection.
Now, the middleware is only mounted into the forum's middleware
stack. I want API requests to have stable performance, and the
forum middleware stack is only mounted when Flarum is installed.
2017-12-21 12:23:34 +01:00
Franz Liedke
b9f68921b7
Fix more incompatibilities with Laravel 5.5
2017-12-20 00:20:23 +01:00
Franz Liedke
54ecd48b72
Disable HandleErrors middleware during installation
...
Temporary measure until we have a real fix in place.
2017-12-20 00:00:23 +01:00
Franz Liedke
e779b89bfb
Fix previous commit
...
Prevent `flarum.config` from being bound in the container when the
software has not been installed yet.
2017-12-19 23:48:38 +01:00
Franz Liedke
d8035374be
DRY up loading of config
2017-12-19 23:16:06 +01:00
Toby Zerner
1ea421482a
Remove Listener namespace
...
We may reverse this in the future, but for now just going for
consistency between domains (the majority do not use a Listener
namespace)
2017-12-19 18:59:14 +10:30
Toby Zerner
604f70c02a
Merge pull request #1313 from flarum/analysis-qB0gYV
...
Apply fixes from StyleCI
2017-12-19 18:54:47 +10:30
Toby Zerner
58ead0e16b
Apply fixes from StyleCI
...
[ci skip] [skip ci]
2017-12-19 08:24:06 +00:00
Toby Zerner
37f7e7fa67
Fix usage of UrlGenerator in notifications
2017-12-19 18:52:27 +10:30
Toby Zerner
1ba7ba0ad7
Pick up config when setting a new base path
2017-12-19 18:38:00 +10:30
Toby Zerner
88228df6f2
Clean up some variable/method names
2017-12-19 08:57:55 +10:30
Toby Zerner
d827fd36fe
Prevent statistics from being loaded outside of admin
...
closes flarum/core#1311
2017-12-19 08:52:13 +10:30
Daniel Klabbers
29ab5b83b1
the admin service provider also has to use the new HandleError logic
2017-12-15 09:35:02 +01:00
Daniel Klabbers
033961844d
- FilesystemInterface no longer needed in User related handlers
...
- FilesystemInterface conditional ioc binding moved to AvatarUploader
- User::getAvatarAtribute failed to use the UrlGenerator properly
2017-12-15 09:29:20 +01:00
Daniel Klabbers
3f7b51cf24
fixed the BasicFoo vs FooBasic serializer definition issue, prevented for future using ::class
2017-12-15 08:29:07 +01:00
Daniel Klabbers
be8aa6369a
and another..
2017-12-15 08:15:08 +01:00
Daniel Klabbers
b0974d72f5
satisfying sci isnt enough for it, lets please it further
2017-12-15 08:14:15 +01:00
Daniel Klabbers
e9bb7b14f4
- satisfying styleci
...
- cleared the merge conflict in the phpdoc
- changed some string class names to use ::class
2017-12-15 08:10:32 +01:00
Franz Liedke
5efe267acb
Apply suggestions from StyleCI
2017-12-14 22:18:12 +01:00
Daniël Klabbers
2f97da972c
merges 5.5 and master into next-back
2017-12-14 01:00:16 +01:00
Franz Liedke
4941ad7cf1
Apply suggestions from StyleCI
2017-12-13 23:08:35 +01:00
