92874b6902
Fxing conflicts
2019-02-08 13:13:11 -08:00
70c05a0c08
Fix showFeaturesPanel option as instance
2019-02-08 12:17:14 -08:00
460976c6e5
#301 - add an option for default formatting
2019-02-06 14:26:46 -05:00
a8c6b3f538
Change video playing default without bothering making it an instance configurable
2019-01-31 21:19:41 +02:00
676acdbf82
Add default config for new options, fix firefox inline playing
2019-01-26 17:59:59 +02:00
ac64e90898
fix custom nsfwCensorImage not working
2019-01-23 00:15:24 +03:00
a974d2ab85
Merge branch 'scope-copy-default' into 'develop'
...
scopeCopy → true by default
See merge request pleroma/pleroma-fe!439
2018-12-30 15:12:03 +00:00
1555a5fef3
Merge branch 'restore-routes' into 'develop'
...
Restore old routes, enable user route as fallback.
See merge request pleroma/pleroma-fe!440
2018-12-29 13:27:59 +00:00
85c487b933
Make "noAttachmentLinks" configurable
2018-12-27 13:25:11 +03:00
f2f7e2e766
scopeCopy → true by default
2018-12-25 17:44:05 +00:00
24eba26c5b
Restore old routes, enable user route as fallback.
2018-12-25 18:43:52 +01:00
d0b47488fb
default webPush to false, because having it at true leads to some problems with
...
local dev mode. Instances can re-enable it, and BE can default it to true in config.exs
2018-12-20 09:17:51 +03:00
ae8f0f36d8
Use "~" as a route namespace symbol
2018-12-10 01:21:52 +03:00
7d5794b9fa
Fix redirect paths
2018-12-06 22:10:46 +03:00
b34097a5c1
Added option to auto-hide subject field when it's empty.
2018-12-03 06:47:35 +03:00
e06717fd0d
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
...
* upstream/develop:
DM timeline: stream new statuses
update-japanese-translation
Add actual user search.
incorporate most translation changes from MR 368
update french translation
Always show dm panel.
Add direct message tab.
api service url
On logout switch to public timeline.
Put oauth text into description.
Display OAuth login on login form button.
Add login form back in.
Linting.
Re-activate registration, use oauth password flow to fetch token.
Fix typo.
Remove gonsole.logg :DD
Fix linting.
Move login to oauth.
2018-11-26 04:38:44 +03:00
0ca42bd3d6
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
...
* upstream/develop: (36 commits)
remove deploy stage
remove deploy stage
updated and completed German translation
minor modification of Chinese translation
update Chinese translation
Add Chinese language
Fix posting.
Count spoiler text in the character count. Fixes #135 .
Added Irish (Gaeilge) Language
Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan.
simplify code
adapt to destructive change of api
Adds Occitan locale
Updated italian translation
Update oc.json
Update oc.json
Update of the oc.json file Actualizacion del fichièr oc.json
Sort messages object by language code so that it's easier from the UI to browse them.
explicitly set collapseMessageWithSubject to undefined
Fall back to instance settings consistently
...
2018-11-26 04:33:41 +03:00
50264410f5
Add login form back in.
2018-11-07 16:56:12 +01:00
455cd0d028
settings for scope/subject
2018-09-25 14:47:02 +03:00
699ee0891d
Changeable defaults for hideUserStats and hidePostStats
2018-09-04 00:48:14 +01:00
17f30190e0
Made showing format selection optional and default to false
2018-08-31 17:00:41 +03:00
e99534ef71
added option for logo in navbar to follow color scheme of the rest of the site
...
also fixed potential mess-up between api/static configs
2018-08-31 04:06:00 +03:00
7fc4506d29
remove-unused-settings
2018-08-26 17:32:58 +09:00
3ec8e43a97
Rename expandCW to collapseMessageWithSubject.
...
Add option to config.json, disabled by default.
2018-08-20 03:41:40 +01:00
17f6eb18e7
Revert "Merge branch 'cw-clickthrough' into 'develop'"
...
This reverts merge request !291
2018-07-12 07:20:39 +00:00
b0cf050797
Add configuration option to enable click-through content warnings
2018-06-28 23:39:55 -07:00
d64293506c
Make scope options optional, refactoring.
2018-06-08 15:25:48 +02:00
2471b71aab
osa-compatible who to follow provider
2018-05-05 00:53:40 +09:00
2ade177d5a
configurable who to follow panel
2018-05-05 00:20:19 +09:00
77ffa89464
Merge remote-tracking branch 'origin/feature/who-to-follow-panel-2' into feature/who-to-follow-panel-configurable
2018-05-04 23:50:14 +09:00
df486e18c2
add redirectRootNoLogin and redirectRootLogin configuration
2018-04-29 17:31:47 +09:00
033170212f
merge
2018-04-22 00:48:06 +09:00
fb3b7ffd39
Use less busy default background.
2018-03-31 12:50:51 +02:00
b32573138b
Add who-to-follow-panel
2018-02-24 23:04:44 +09:00
ebd8300e36
slove conflict
2018-02-10 10:17:58 +09:00
e2248bcf4f
Use `name` and `closed` from the backend
2018-02-09 16:02:26 +03:00
95cba854f3
add instance specific panel
2018-02-04 00:27:33 +09:00
612fb18367
Add option for disabling chat.
2017-12-07 18:20:44 +02:00
2691579ab7
Make default path configurable.
2017-11-22 16:28:05 +01:00
21b31cf599
Move custom theming from settings to style-switcher, remove usage of custom .css files, use styles.json instead.
2017-11-17 17:24:42 +02:00
1a5ee95ee4
Add a config.json option for enabling registration, don't link and redirect away from register page when it's disabled.
2017-06-20 10:37:51 +03:00
446de1c623
Potential new default dark and light themes added (base16-pleroma-dark, base16-pleroma-light). The new dark one set as the default.
2017-04-13 02:05:31 +03:00
ce5b3d4c92
Add logo.
2017-02-16 17:44:36 +01:00
a3b2be09b3
Add /cyb/ background by sonyam.
2017-02-16 16:59:06 +01:00
1d64b76211
Add basic configuration module, make it work for title and theme.
2017-02-14 22:21:23 +01:00
jasper
Xiaofeng An
shpuld
Henry Jameson
HJ
lambda
Maxim Filippov
scarlett
Lambda
Roger Braun
hakabahitoyo
ensra
Vivian Lim
Hakaba Hitoyo
dtluna
eal
Roger Braun
Shpuld Shpuldson