Commit graph

240 commits

Author SHA1 Message Date
lain
3e1816fcd5 update frontend 2018-12-17 21:13:04 +01:00
lain
72945b5b32 update frontend 2018-12-13 21:04:39 +01:00
lain
8682be29a5 update frontend 2018-12-10 20:46:10 +01:00
lambda
94d8f1ab30 Merge branch '394_user_tags' into 'develop'
[#394] User tags

Closes #394

See merge request pleroma/pleroma!508
2018-12-07 18:25:38 +00:00
Ivan Tashkinov
7b19487389 [#394] Added users.tags and admin routes to tag and untag users. Added tests. 2018-12-06 20:06:50 +03:00
Egor Kislitsyn
4944498133 Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex
2018-12-06 20:15:16 +07:00
Egor Kislitsyn
8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock
2018-12-06 19:55:58 +07:00
hakabahitoyo
a7b1a66be3 update-pleroma-frontend 2018-12-03 13:24:25 +09:00
lain
4996fb07d8 Genereate uuids for existing info fields. 2018-12-01 12:00:33 +01:00
William Pitcock
db8f269cd3 update pleroma frontend 2018-11-18 17:27:48 +00:00
William Pitcock
2a75de84e1 update pleroma frontend 2018-11-14 16:08:22 +00:00
Haelwenn (lanodan) Monnier
934125695d
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld 2018-11-08 20:21:45 +01:00
Haelwenn (lanodan) Monnier
705bfe39e9
priv/static/litepub-1.0.jsonld: Local copy of https://litepub.github.io/litepub/context.jsonld 2018-11-08 19:35:23 +01:00
hakabahitoyo
72a880431f update pleroma frontend 2018-10-26 23:35:06 +09:00
scarlett
7cb227dc62 update pleroma-fe 2018-10-23 12:16:49 +01:00
scarlett
f6dda65dda update pleroma-fe 2018-10-23 12:15:48 +01:00
hakabahitoyo
be7bb90bef update-pleroma-frontend 2018-10-07 09:58:08 +09:00
William Pitcock
bb213a85c5 update pleroma frontend 2018-09-22 05:08:15 +00:00
Martin Kühl
d94ee5cd50 Mastodon API: Support push subscription CRUD 2018-09-22 07:04:01 +02:00
William Pitcock
c9f6eb9a41 user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task) 2018-09-20 23:50:56 +00:00
Haelwenn (lanodan) Monnier
83e3afac2c Update mastodon frontend 2018-09-20 16:13:13 +00:00
hakabahitoyo
f829b18273 update-pleroma-frontend 2018-09-14 10:47:10 +09:00
William Pitcock
e5546c282f update pleroma frontend 2018-09-09 12:14:34 +00:00
kaniini
76c67a41c1 Merge branch 'develop' into 'feature/staff-discovery-api'
# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2018-09-03 14:55:42 +00:00
kaniini
1c9e539b47 Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
Add/Fix Mastodon endpoints for 2.4.3 compatibility

See merge request pleroma/pleroma!266
2018-09-03 12:33:36 +00:00
William Pitcock
cf5d1302aa migrations: add is_moderator index for users table 2018-09-03 11:55:12 +00:00
William Pitcock
2b4b4888a9 update pleroma frontend 2018-08-31 04:35:18 +00:00
William Pitcock
1a70d41f8e migrations: add index creation migration and recipients_to/cc removal migration 2018-08-29 18:41:02 +00:00
William Pitcock
038139d641 migrations: drop filler migration 2018-08-29 18:41:02 +00:00
William Pitcock
40ea07cd2f migrations: add migration to fill in recipients_to/recipients_cc fields 2018-08-29 08:43:24 +00:00
William Pitcock
81673b8136 activity: add recipients_to and recipients_cc fields 2018-08-29 08:42:33 +00:00
Haelwenn (lanodan) Monnier
6e030129fb
[MastodonAPI] Add filters 2018-08-27 15:09:05 +02:00
William Pitcock
5ffaa2bf69 Revert "enable scope options and such"
This reverts commit e5642d7566.
2018-08-27 10:49:12 +00:00
William Pitcock
e5642d7566 enable scope options and such 2018-08-27 10:46:01 +00:00
hakabahitoyo
ce8c7e77a1 update pleroma frontend 2018-08-26 21:08:03 +09:00
William Pitcock
47661ce44b update pleroma frontend 2018-08-24 21:59:57 +00:00
William Pitcock
d8fb340565 update pleroma frontend 2018-08-20 18:10:29 +00:00
William Pitcock
7a11ea1ceb update pleroma frontend 2018-08-20 04:45:34 +00:00
William Pitcock
d8bb27970b update pleroma frontend 2018-08-18 18:19:11 +00:00
lain
701f5df45c update frontend 2018-08-12 18:16:19 +02:00
lain
4a612b8c1b Update Mastofe. 2018-08-12 18:02:43 +02:00
lambda
13440a80e1 Merge branch 'feature/invites' into 'develop'
Invites

Closes #108

See merge request pleroma/pleroma!208
2018-08-12 12:04:15 +00:00
William Pitcock
4f589998ee activitypub: support filtering activities by whether or not they are a reply (closes #109) 2018-06-18 03:21:32 +00:00
lain
ddc654d587 update frontend 2018-06-12 19:38:25 +02:00
Artik Banana
991b8a6b9d Replace avi.png with the Pleroma logo 2018-06-12 11:55:38 +00:00
Henry Jameson
f42ffbe9a8 Initial invites support + tests. 2018-06-12 14:55:16 +03:00
lambda
564c73ab24 Merge branch 'feature/list-streaming' into 'develop'
MastoAPI: Add streaming for lists.

See merge request pleroma/pleroma!183
2018-06-12 07:19:45 +00:00
eal
29c9c8d93b Extract host from ap_id, add index 2018-06-06 21:13:40 +03:00
lain
9d054d30bc Revert "Update Mastofe."
This reverts commit 726b131b0a.

Some things broke (threads).
2018-06-02 19:45:23 +02:00
lain
726b131b0a Update Mastofe. 2018-06-02 16:11:38 +02:00
eal
5d3fdbc082 MastoAPI: Add streaming for lists. 2018-05-30 16:48:59 +03:00
lambda
f3a71f2986 Merge branch 'feature/lists' into 'develop'
Mastodon List API

See merge request pleroma/pleroma!138
2018-05-24 20:22:43 +00:00
lain
6b9a683833 update frontend 2018-05-24 19:25:44 +02:00
eal
a8369db4f2 MastoAPI: add lists. 2018-05-24 13:18:39 +03:00
lain
dde5ad9e37 update frontend 2018-05-20 18:29:12 +02:00
lain
bdfe0991d2 update frontend 2018-05-20 13:24:16 +02:00
lain
1d4bbec6b3 Fix User search.
Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185.
2018-05-16 17:55:20 +02:00
lain
2e9aa16b86 update frontend 2018-05-16 13:02:53 +02:00
lain
94c1f28ba4 Modify sort index for activities.
This prevents a problem that made the local timeline very slow when
there were few posts.
2018-05-13 12:54:08 +02:00
lain
12f0ad1392 update frontend 2018-05-04 23:15:33 +02:00
lain
5b6d6d7f2d update frontend 2018-04-29 16:56:13 +02:00
lain
3bad2b827a Resurrect instance specific panel. 2018-04-26 07:06:32 +02:00
lain
fc6f5bcad3 update frontend 2018-04-23 19:23:45 +02:00
lain
661fd3c93e update frontend 2018-04-23 19:09:24 +02:00
90ad55b8ff formatting 2018-04-20 19:21:48 +02:00
b0671be283 enable instance panel by default, added some content 2018-04-20 19:04:57 +02:00
lain
e153b364a7 update frontend 2018-04-17 11:09:19 +02:00
lain
5612716c25 update frontend 2018-04-11 22:03:28 +02:00
lain
a8dddd9279 update frontend 2018-04-11 21:55:38 +02:00
Morgan Bazalgette
fc13a3ff24 Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec 2018-04-09 22:00:42 +02:00
Morgan Bazalgette
676f2ca479
Bring mastofe up to date
Commit 5edce20302

summary:

```
*   5edce203 - (4 minutes ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette (HEAD -> master, origin/master, origin/HEAD)
|\
| * 2c51bc0c - (4 hours ago)  Add missing rejection handling for Promises (#7008) - unarist (upstream/master)
| * e7a17167 - (5 hours ago) Implement the ability for an Administrator or Moderator to remove an account avatar (#6998) - Emelia Smith
| * 4fd71acc - (5 hours ago) Fix issues with sending direct messages from user profile (#6999) - Emelia Smith
| * 3f51c6ef - (5 hours ago) Weblate translations (2018-04-02) (#7007) - Yamagishi Kazutoshi
| * b04f73ce - (6 hours ago) Russian language updated (#7005) - Evgeny Petrov
| * 24611d8d - (6 hours ago) i18n: update zh-HK translation (#7004) - luzi82
| * f890d2a7 - (16 hours ago) Support all ActivityPub actor types (#6997) - Eugen Rochko
| * 33513753 - (16 hours ago) Fix unpermitted parameters warning when generating pagination URLs (#6995) - Eugen Rochko
| * 123a343d - (19 hours ago) [WIP] Enable custom emoji on account pages and in the sidebar (#6124) - David Underwood
| * f464f98f - (19 hours ago) Update Ruby to version 2.4.4 (#6964) - Yamagishi Kazutoshi
| * 6a895e1a - (20 hours ago) Fix: Prevent submission using same logic as submit button disabling. (#6993) - Emelia Smith
* | 011eda08 - (7 minutes ago) Properly cache requests using service workers - Morgan Bazalgette
* | 8dd77f17 - (5 hours ago) Fix build - Morgan Bazalgette
* | 99373236 - (19 hours ago) Add build status - Morgan Bazalgette
* | b448a3a5 - (19 hours ago) Update README - Morgan Bazalgette
* | 68fd7ee6 - (20 hours ago) Fix statuses embedded in like/boost notifs being white - Morgan Bazalgette
* | 7a9212df - (21 hours ago) Temporary workaround to only show related statuses - Morgan Bazalgette
* |   00bd10fa - (26 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette
|\ \
| |/
| * 993ce0e5 - (28 hours ago) improve zh-HK localization by referring zh-TW and zh-CN (#6988) - luzi82
* |   05832497 - (30 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette
 \ \
  |/
  * 929f58f1 - (32 hours ago) i18n: Update Polish translation (#6985) - Marcin Mikołajczak
```
2018-04-02 18:31:57 +02:00
Morgan Bazalgette
6d20410314
update mastofe 2018-04-01 11:36:53 +02:00
Morgan Bazalgette
ce1f66aa2d
Update with mastofe repo 2018-03-31 19:14:05 +02:00
Morgan Bazalgette
10773888ad
Bring Mastodon frontend up-to-date
with my fork of it, @ https://git.pleroma.social/howl/mastofe .
2018-03-31 18:15:28 +02:00
lain
5cc1cfcfd7 update frontend 2018-03-31 12:52:34 +02:00
lain
0abd8a6bad Fix migration. 2018-03-27 19:59:54 +02:00
lain
b56bb88c02 Drop index for 'local', it confuses the query planner. 2018-03-27 19:48:01 +02:00
lain
bd4926288e Speed up follower query. 2018-03-26 10:31:22 +02:00
lain
1d1271ca1e Add index for user follower address. 2018-03-26 09:53:47 +02:00
Morgan Bazalgette
ed22105e72
mastofe: remove excess accent colours; fix the always-starred bug 2018-03-23 21:33:25 +01:00
Mark Felder
3a7ba5dbb1 Set max characters for the compose field to 5000 to match pleroma default
Of course you can't tell what the change is because the entire file is
written on one line, so the nearly impossible to read.

It's nice to be able to use 5000 chars from my computer and have access
to CW feature as well.
2018-03-15 14:46:28 +00:00
lain
2b2fa94e94 Move stuff around. 2018-03-13 14:58:49 +01:00
Wim Vanderbauwhede
36f615135f A small patch to show the instance name and favicon in the browser title
bar.
2018-03-13 09:37:55 +00:00
lain
b0d242cd92 update frontend 2018-03-08 19:50:51 +01:00
lain
f48bc5c3e1 Make User.following a postgres array. 2018-02-21 22:20:29 +01:00
lain
b331cb449a Merge branch 'develop' into feature/activitypub 2018-02-12 10:24:15 +01:00
lain
e946f300ae update frontend 2018-02-11 20:58:08 +01:00
lain
dfc23e717f update frontend 2018-02-11 20:55:02 +01:00
Hakaba Hitoyo
9cf293c84b Merge remote-tracking branch 'hakabahitoyo/feature/instance-specific-panel' into feature/instance-specific-panel 2018-02-11 18:08:27 +09:00
Roger Braun
52200998c9 Merge branch 'develop' into feature/activitypub 2018-02-11 09:50:55 +01:00
Roger Braun
0e2ca77eec update frontend 2018-02-09 17:14:11 +01:00
Roger Braun
103eca482c update frontend 2018-02-07 13:44:52 +01:00
Hakaba Hitoyo
a2fac9b0e8 adjust panel.html 2018-02-04 00:31:46 +09:00
Hakaba Hitoyo
bffc78f2a8 add backend default for instance specific panel 2018-02-03 23:09:26 +09:00
lambda
61c16193de Merge branch 'move-backend-images' into 'develop'
Move avi.png & banner.png from /priv/static/static to /priv/static/images

See merge request pleroma/pleroma!60
2018-02-03 13:05:20 +00:00
Hakaba Hitoyo
ea6d1b2b17 move avi.png & banner.png from /priv/static/static to /priv/static/images 2018-02-03 20:43:14 +09:00
Roger Braun
9a9766d648 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-02-02 17:14:58 +01:00
Roger Braun
2203fa2fdb Update frontend. 2018-02-02 17:14:23 +01:00
Hakaba Hitoyo
e47f60c053 provide instance thumbnail at /api/v1/instance (debug) 2018-01-31 23:04:34 +09:00
Hakaba Hitoyo
10753178ea provide instance thumbnail at /api/v1/instance (debug) 2018-01-31 22:57:43 +09:00