Daniël Klabbers
db6f4f2c77
Merge branch 'master' into 1236-database-changes
2018-06-27 21:23:52 +02:00
Daniël Klabbers
36608b31be
Revert "migrating user preferences obviously works on empty table"
...
This reverts commit a3c6833b54
2018-06-27 21:22:28 +02:00
flarum-bot
40d5633662
Bundled output for commit ebbbd63bce [skip ci]
2018-06-27 19:17:31 +00:00
Franz Liedke
ebbbd63bce
Merge pull request #1456 from sijad/prevent-undefined
...
check class string before concat
2018-06-27 21:10:40 +02:00
Daniël Klabbers
7b23e46250
not dropping bio due to not having a replacement
2018-06-27 21:09:32 +02:00
Sajjad Hashemian
16060aef09
check class string before concat
2018-06-25 09:40:06 +04:30
AFR
45761e5651
Separate edit and delete posts translation ( #129 )
2018-06-24 23:49:35 +02:00
Miles Cellar
8d3e10ce5e
Fix alpha_dash ( #130 )
...
Fix from 7ff917aa20 (diff-9c04f727a922ad4f105b9ad764ec221d)
2018-06-23 21:38:25 +09:30
Daniël Klabbers
0fb5572f20
we need to leave the preferences column for now
2018-06-22 23:43:37 +02:00
Daniël Klabbers
75d3349699
Merge branch '1236-database-changes' of github.com:flarum/core into 1236-database-changes
2018-06-22 23:42:46 +02:00
Toby Zerner
4c2fc9d414
Simplify the bootstrap file ( #128 )
2018-06-22 11:49:23 +02:00
Toby Zerner
a825a7d115
Allow a single extender to be returned ( #1469 )
...
Casting an object to an array does not have the intended effect of
wrapping the object in an array. Instead we need to explicitly check
if the returned value is an array or not.
2018-06-22 18:10:54 +09:30
Daniel Klabbers
1815389731
Merge branch 'master' into 1236-database-changes
2018-06-22 07:48:21 +02:00
Toby Zerner
d6823f4242
Merge branch 'tz/formatter-extender'
2018-06-22 12:24:53 +09:30
flarum-bot
3bcfdd83d3
Bundled output for commit d7dd4bf8a0 [skip ci]
2018-06-22 01:24:44 +00:00
Toby Zerner
d7dd4bf8a0
[WIP] JS Extender API foundation ( #1468 )
...
* Run extenders exported by extensions
* Add some basic extenders
* Patch Mithril as the very first thing so extension code can run safely
* Load the payload into the app before booting extensions
* Setup default routes before booting extensions
2018-06-22 10:49:46 +09:30
Franz Liedke
e12386d6ec
Merge pull request #1465 from flarum/tz/formatter-extender
...
Rename and improve FormatterConfiguration extender
2018-06-21 10:11:35 +02:00
Toby Zerner
ca28f0ca45
Merge event listener registration
2018-06-20 23:37:27 +02:00
Toby Zerner
22c911476b
Rename and improve FormatterConfiguration extender
...
In the future we may have multiple Formatters, so by moving the config
callback to its own instance method we can leave the constructor
available to specify which formatter (like Assets and Routes). This
format also allows for other methods to be added.
Additionally, this adds logic to automatically flush the Formatter cache
whenever the extension is enabled or disabled.
2018-06-20 23:37:27 +02:00
flarum-bot
1132bf653c
Bundled output for commit 5e28acaf8b [skip ci]
2018-06-20 05:26:47 +00:00
flarum-bot
602a7190f9
Bundled output for commit de0861aa19 [skip ci]
2018-06-20 05:26:36 +00:00
flarum-bot
681c51880d
Bundled output for commit ee74133ef6 [skip ci]
2018-06-20 05:26:18 +00:00
flarum-bot
25e7e2aa4c
Bundled output for commit 19d5bf498f [skip ci]
2018-06-20 05:25:31 +00:00
flarum-bot
e17d0386b0
Bundled output for commit eb56c9230f [skip ci]
2018-06-20 05:25:00 +00:00
flarum-bot
522bae8f30
Bundled output for commit d81f7509b4 [skip ci]
2018-06-20 05:24:52 +00:00
flarum-bot
06f22972a7
Bundled output for commit 26938d774e [skip ci]
2018-06-20 05:24:50 +00:00
flarum-bot
067df578c9
Bundled output for commit c89b4f79f7 [skip ci]
2018-06-20 05:23:22 +00:00
flarum-bot
99a4d91bdd
Bundled output for commit 0fdf5e6c55 [skip ci]
2018-06-20 05:23:13 +00:00
flarum-bot
1af5d351c4
Bundled output for commit f973ebf4ea [skip ci]
2018-06-20 05:22:06 +00:00
flarum-bot
8583c3a6b6
Bundled output for commit ecacd76ace [skip ci]
2018-06-20 05:21:57 +00:00
flarum-bot
8214638cb5
Bundled output for commit 20ddf72ec9 [skip ci]
2018-06-20 05:19:54 +00:00
Toby Zerner
52d0b5f11e
Checkout the branch before committing
2018-06-20 14:47:37 +09:30
Toby Zerner
58b09bc7ef
git config before commit [skip ci]
2018-06-20 14:42:18 +09:30
Toby Zerner
ecacd76ace
Fix Travis' deploy key
2018-06-20 14:34:17 +09:30
Toby Zerner
f973ebf4ea
Fix Travis' deploy key
2018-06-20 14:33:56 +09:30
Toby Zerner
de0861aa19
Fix Travis' deploy key
2018-06-20 14:32:25 +09:30
Toby Zerner
5e28acaf8b
Fix Travis' deploy key
2018-06-20 14:31:52 +09:30
Toby Zerner
ee74133ef6
Fix Travis' deploy key
2018-06-20 14:31:32 +09:30
Toby Zerner
19d5bf498f
Fix Travis' deploy key
2018-06-20 14:31:12 +09:30
Toby Zerner
20ddf72ec9
Fix Travis' deploy key
2018-06-20 14:30:24 +09:30
Toby Zerner
eb56c9230f
Fix Travis' deploy key
2018-06-20 14:29:28 +09:30
Toby Zerner
d81f7509b4
Fix Travis' deploy key
2018-06-20 14:27:52 +09:30
Toby Zerner
c89b4f79f7
Fix Travis' deploy key
2018-06-20 14:27:18 +09:30
Toby Zerner
26938d774e
Fix Travis' deploy key
2018-06-20 14:19:22 +09:30
Toby Zerner
ad22ac4289
Remove progress flag
2018-06-20 13:57:31 +09:30
Toby Zerner
0fdf5e6c55
Remove progress flag
2018-06-20 13:54:01 +09:30
Toby Zerner
6d1e57fd56
Remove progress flag
2018-06-20 13:54:01 +09:30
Toby Zerner
eb1a6a79c3
Remove progress flag
2018-06-20 13:54:01 +09:30
Toby Zerner
76cc195c55
Remove progress flag
2018-06-20 13:54:01 +09:30
Toby Zerner
3a4fa7754a
Remove progress flag
2018-06-20 13:54:01 +09:30
