diff options
Diffstat (limited to 'priv')
31 files changed, 31 insertions, 0 deletions
diff --git a/priv/repo/migrations/20190412052952_add_user_info_fields.exs b/priv/repo/migrations/20190412052952_add_user_info_fields.exs new file mode 100644 index 000000000..646c91f32 --- /dev/null +++ b/priv/repo/migrations/20190412052952_add_user_info_fields.exs @@ -0,0 +1,20 @@ +defmodule Pleroma.Repo.Migrations.AddEmailNotificationsToUserInfo do + use Ecto.Migration + + def up do + execute(" + UPDATE users + SET info = info || '{ + \"email_notifications\": { + \"digest\": false + } + }'") + end + + def down do + execute(" + UPDATE users + SET info = info - 'email_notifications' + ") + end +end diff --git a/priv/repo/migrations/20190413085040_add_signin_and_last_digest_dates_to_user.exs b/priv/repo/migrations/20190413085040_add_signin_and_last_digest_dates_to_user.exs new file mode 100644 index 000000000..4312b171f --- /dev/null +++ b/priv/repo/migrations/20190413085040_add_signin_and_last_digest_dates_to_user.exs @@ -0,0 +1,9 @@ +defmodule Pleroma.Repo.Migrations.AddSigninAndLastDigestDatesToUser do + use Ecto.Migration + + def change do + alter table(:users) do + add(:last_digest_emailed_at, :naive_datetime, default: fragment("now()")) + end + end +end diff --git a/priv/static/emoji/f_00b.png b/priv/static/emoji/f_00b.png Binary files differdeleted file mode 100644 index 3d00b89b0..000000000 --- a/priv/static/emoji/f_00b.png +++ /dev/null diff --git a/priv/static/emoji/f_00b11b.png b/priv/static/emoji/f_00b11b.png Binary files differdeleted file mode 100644 index 3e99ce464..000000000 --- a/priv/static/emoji/f_00b11b.png +++ /dev/null diff --git a/priv/static/emoji/f_00b33b.png b/priv/static/emoji/f_00b33b.png Binary files differdeleted file mode 100644 index 8f4929297..000000000 --- a/priv/static/emoji/f_00b33b.png +++ /dev/null diff --git a/priv/static/emoji/f_00h.png b/priv/static/emoji/f_00h.png Binary files differdeleted file mode 100644 index ba3da57c6..000000000 --- a/priv/static/emoji/f_00h.png +++ /dev/null diff --git a/priv/static/emoji/f_00t.png b/priv/static/emoji/f_00t.png Binary files differdeleted file mode 100644 index 31d98b433..000000000 --- a/priv/static/emoji/f_00t.png +++ /dev/null diff --git a/priv/static/emoji/f_01b.png b/priv/static/emoji/f_01b.png Binary files differdeleted file mode 100644 index 7bd2582c5..000000000 --- a/priv/static/emoji/f_01b.png +++ /dev/null diff --git a/priv/static/emoji/f_03b.png b/priv/static/emoji/f_03b.png Binary files differdeleted file mode 100644 index 9e4ff1bf7..000000000 --- a/priv/static/emoji/f_03b.png +++ /dev/null diff --git a/priv/static/emoji/f_10b.png b/priv/static/emoji/f_10b.png Binary files differdeleted file mode 100644 index 67c6493fc..000000000 --- a/priv/static/emoji/f_10b.png +++ /dev/null diff --git a/priv/static/emoji/f_11b.png b/priv/static/emoji/f_11b.png Binary files differdeleted file mode 100644 index b53328ba9..000000000 --- a/priv/static/emoji/f_11b.png +++ /dev/null diff --git a/priv/static/emoji/f_11b00b.png b/priv/static/emoji/f_11b00b.png Binary files differdeleted file mode 100644 index c4c30e11f..000000000 --- a/priv/static/emoji/f_11b00b.png +++ /dev/null diff --git a/priv/static/emoji/f_11b22b.png b/priv/static/emoji/f_11b22b.png Binary files differdeleted file mode 100644 index 47425e06e..000000000 --- a/priv/static/emoji/f_11b22b.png +++ /dev/null diff --git a/priv/static/emoji/f_11h.png b/priv/static/emoji/f_11h.png Binary files differdeleted file mode 100644 index 28342363a..000000000 --- a/priv/static/emoji/f_11h.png +++ /dev/null diff --git a/priv/static/emoji/f_11t.png b/priv/static/emoji/f_11t.png Binary files differdeleted file mode 100644 index dca67dc70..000000000 --- a/priv/static/emoji/f_11t.png +++ /dev/null diff --git a/priv/static/emoji/f_12b.png b/priv/static/emoji/f_12b.png Binary files differdeleted file mode 100644 index 9925adb7c..000000000 --- a/priv/static/emoji/f_12b.png +++ /dev/null diff --git a/priv/static/emoji/f_21b.png b/priv/static/emoji/f_21b.png Binary files differdeleted file mode 100644 index aa56d2cb2..000000000 --- a/priv/static/emoji/f_21b.png +++ /dev/null diff --git a/priv/static/emoji/f_22b.png b/priv/static/emoji/f_22b.png Binary files differdeleted file mode 100644 index 426878986..000000000 --- a/priv/static/emoji/f_22b.png +++ /dev/null diff --git a/priv/static/emoji/f_22b11b.png b/priv/static/emoji/f_22b11b.png Binary files differdeleted file mode 100644 index 4bdfb3107..000000000 --- a/priv/static/emoji/f_22b11b.png +++ /dev/null diff --git a/priv/static/emoji/f_22b33b.png b/priv/static/emoji/f_22b33b.png Binary files differdeleted file mode 100644 index adf94f811..000000000 --- a/priv/static/emoji/f_22b33b.png +++ /dev/null diff --git a/priv/static/emoji/f_22h.png b/priv/static/emoji/f_22h.png Binary files differdeleted file mode 100644 index 3b27e2de8..000000000 --- a/priv/static/emoji/f_22h.png +++ /dev/null diff --git a/priv/static/emoji/f_22t.png b/priv/static/emoji/f_22t.png Binary files differdeleted file mode 100644 index addd9fec7..000000000 --- a/priv/static/emoji/f_22t.png +++ /dev/null diff --git a/priv/static/emoji/f_23b.png b/priv/static/emoji/f_23b.png Binary files differdeleted file mode 100644 index beb69ab36..000000000 --- a/priv/static/emoji/f_23b.png +++ /dev/null diff --git a/priv/static/emoji/f_30b.png b/priv/static/emoji/f_30b.png Binary files differdeleted file mode 100644 index 41dbb2a5d..000000000 --- a/priv/static/emoji/f_30b.png +++ /dev/null diff --git a/priv/static/emoji/f_32b.png b/priv/static/emoji/f_32b.png Binary files differdeleted file mode 100644 index d8261e8a8..000000000 --- a/priv/static/emoji/f_32b.png +++ /dev/null diff --git a/priv/static/emoji/f_33b.png b/priv/static/emoji/f_33b.png Binary files differdeleted file mode 100644 index 71b8b914a..000000000 --- a/priv/static/emoji/f_33b.png +++ /dev/null diff --git a/priv/static/emoji/f_33b00b.png b/priv/static/emoji/f_33b00b.png Binary files differdeleted file mode 100644 index 65b6e24b8..000000000 --- a/priv/static/emoji/f_33b00b.png +++ /dev/null diff --git a/priv/static/emoji/f_33b22b.png b/priv/static/emoji/f_33b22b.png Binary files differdeleted file mode 100644 index d71a8ddd4..000000000 --- a/priv/static/emoji/f_33b22b.png +++ /dev/null diff --git a/priv/static/emoji/f_33h.png b/priv/static/emoji/f_33h.png Binary files differdeleted file mode 100644 index e141c5184..000000000 --- a/priv/static/emoji/f_33h.png +++ /dev/null diff --git a/priv/static/emoji/f_33t.png b/priv/static/emoji/f_33t.png Binary files differdeleted file mode 100644 index d5a23073d..000000000 --- a/priv/static/emoji/f_33t.png +++ /dev/null diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex index ca9c7a2c2..dc75d4008 100644 --- a/priv/templates/sample_config.eex +++ b/priv/templates/sample_config.eex @@ -68,3 +68,5 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>" # For using third-party S3 clones like wasabi, also do: # config :ex_aws, :s3, # host: "s3.wasabisys.com" + +config :joken, default_signer: "<%= jwt_secret %>" |
