smitten/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
4949 commits 15 branches 84 tags 293 MiB
Commit graph

306 commits

Author SHA1 Message Date
feld
c953ae8c3d Initial bundle of basic AdminFE 
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
 2019-05-11 01:34:17 +00:00
lambda
238dd72fad Merge branch 'conversations_three' into 'develop' 
Conversations once more.

See merge request pleroma/pleroma!1119
 2019-05-07 14:43:21 +00:00
Maksim
1040caf096 fix format 
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
 2019-05-06 17:51:03 +00:00
lain
0e37fddd5a Search: Add fts index on objects table. 2019-05-03 19:21:09 +02:00
lain
45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three 2019-05-01 18:40:41 +02:00
rinpatch
f8f6af4cc1 Fix MigrateOldBookmarks migration crashing on deleted activities 2019-04-29 21:25:30 +03:00
William Pitcock
52bdfced32 update pleroma frontend 2019-04-27 07:34:59 +00:00
Alex S
229ce6abbc migration without using old field name 
removing old field from db, after bookmarks migration
 2019-04-25 13:42:10 +07:00
Alex S
58711a79d0 removing useless transaction 2019-04-25 13:40:12 +07:00
Alex S
6322c1e123 migration optimization 
changelog wording
 2019-04-25 13:40:12 +07:00
Alex S
324c9c8ab5 migrate user.bookmarks to separate table 2019-04-25 13:38:24 +07:00
Alex S
73d01857e3 bookmarks in separate table 2019-04-25 13:38:24 +07:00
Ekaterina Vaartis
c26724cc55 Remove finmoji and add a way to download emojis in packs 
These packs are stored in a git repo on pleroma gitlab
 2019-04-20 11:17:17 +03:00
Haelwenn (lanodan) Monnier
51c97d71af
Update Mastodon Frontend to 2019-04-11 bundle 
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11

[ci skip]
 2019-04-11 07:29:03 +02:00
lain
de57094fca Participations: Add sort index. 2019-04-10 17:30:25 +02:00
lain
280172f6f6 Conversations: Create or bump on inserting a dm. 2019-04-10 16:33:45 +02:00
lain
d1da6b155a Conversation: Add Conversations and Participations. 2019-04-10 15:01:42 +02:00
lambda
e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop' 
Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032
 2019-04-10 10:10:08 +00:00
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
Ivan Tashkinov
bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
 2019-04-08 12:20:26 +03:00
Alex S
012bb5dcc9 renaming expire_at -> expires_at 
keyword style change
 2019-04-08 16:01:28 +07:00
eugenijm
fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03:00
eugenijm
7bf622ce73 Add scheduled activities 2019-04-06 23:55:58 +03:00
Alex S
47b07cec49 token -> invite renaming 2019-04-06 20:24:22 +07:00
Alex S
0484f3a8b1 generating tokens with mix 2019-04-06 16:58:22 +07:00
Sadposter
ffac2593ea
Add index on subscribers 2019-04-05 17:30:54 +01:00
Ivan Tashkinov
45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	mix.exs
 2019-04-04 23:43:08 +03:00
Alex S
86f90c0a54 adding indexes to oauth_tokens table 2019-04-03 20:51:09 +07:00
lambda
bd961a3bad Merge branch 'features/pleroma-tan' into 'develop' 
priv/static/images: Add pleroma-tan

See merge request pleroma/pleroma!913
 2019-04-02 11:54:04 +00:00
Haelwenn (lanodan) Monnier
b2f3a40e53
Revert awfully long migration from 568e34858 2019-03-29 01:57:02 +01:00
Ivan Tashkinov
642075b1a9 [#923] Enabled binding of multiple OAuth provider accounts to single user. 2019-03-27 16:20:50 +03:00
Ivan Tashkinov
20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth 2019-03-27 15:41:40 +03:00
lambda
21ff78cd40 Merge branch 'replies-count' into 'develop' 
Increment replies_count (MastoAPI)

Closes #756

See merge request pleroma/pleroma!974
 2019-03-26 14:49:09 +00:00
eugenijm
568e348588 Increment replies_count on replies (MastoAPI) 2019-03-26 15:27:04 +03:00
rinpatch
9725c93cea Add an id index to notifications 2019-03-25 21:59:52 +03:00
rinpatch
b92a16aa00 Merge branch 'ecto-3-migration' into 'develop' 
Ecto 3.0.7 (ecto_sql 3.0.5) migration

See merge request pleroma/pleroma!957
 2019-03-21 16:24:57 +00:00
kaniini
b68fb3dc17 Merge branch 'imageoptim' into 'develop' 
used imageOptim to reduce size of image files

See merge request pleroma/pleroma!944
 2019-03-21 00:59:24 +00:00
rinpatch
e59cfa7cac modify the migrations to use naive_datetime_usec 2019-03-20 16:16:29 +03:00
rinpatch
cbc4a76b43 Fix filter migration 2019-03-20 16:13:23 +03:00
lain
41511d1926 Update frontend 2019-03-20 08:58:25 +01:00
Ivan Tashkinov
e17a9a1f66 [#923] Nickname & email selection for external registrations, option to connect to existing account. 2019-03-20 10:35:31 +03:00
optikfluffel
a907522690 used imageOptim to reduce size of image files 2019-03-19 10:10:48 +01:00
Ivan Tashkinov
40e9a04c31 [#923] Registration validations & unique index on [:user_id, :provider]. 2019-03-18 20:31:24 +03:00
Ivan Tashkinov
26b6354095 [#923] Support for multiple (external) registrations per user via Registration. 2019-03-18 17:23:38 +03:00
Ivan Tashkinov
2739057442 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 2019-03-15 17:11:00 +03:00
Ivan Tashkinov
aacbf0f570 [#923] OAuth: prototype of sign in / sign up with Twitter. 2019-03-15 17:08:03 +03:00
William Pearson
3dadaa4432 robots.txt 
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
 2019-03-15 02:28:18 +00:00
Haelwenn (lanodan) Monnier
bae96206d0
priv/static/images: Add pleroma-tan 
Source: https://shitposter.club/objects/9be7c3f4-5a29-45a9-ac40-301312578a02

pleroma-fox-tan-smol.png is pleroma-fox-tan.png but the width
got divided by two in The GIMP.
All the pleroma*.png got optimised with mat2 and optipng/pngcrush,
depending on their best results.

[ci skip]
 2019-03-08 07:51:05 +01:00
Haelwenn (lanodan) Monnier
05cad042ba
Update Mastodon Frontend to 2019-03-07 bundle 
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-03-07

[ci skip]
 2019-03-08 00:28:40 +01:00
William Pitcock
3a097bd770 update pleroma frontend 2019-03-07 13:31:03 +00:00