itepechi/akkoma-fe
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity
5578 commits 3 branches 31 tags 23 MiB
Commit graph

387 commits

Author SHA1 Message Date
sadposter
feb7090cde Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2021-08-05 12:59:18 +01:00
sadposter
d49434a799 add stuff 2021-07-01 16:06:59 +01:00
sadposter
214d85189c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2021-06-25 10:07:29 +01:00
eris
b2ebfc1fd6 Merge branch 'develop' into 'editProfile' 
# Conflicts:
#   CHANGELOG.md
 2021-06-17 19:35:09 +00:00
Eris
e1361a1cae Add edit profile button 2021-06-17 19:29:58 +00:00
Eris
d7a53aec61 Use proper setting name 2021-06-15 18:09:00 +00:00
Eris
5047663c51 Make locale language cleaner 2021-06-15 00:25:09 +00:00
Eris
0c10145242 New option: Hide shoutbox 2021-06-14 19:42:56 +00:00
HJ
dc611dffdb Merge branch 'flash-support' into 'develop' 
Flash support

See merge request pleroma/pleroma-fe!1380
 2021-05-31 11:00:53 +00:00
Henry Jameson
245addb530 remove "leak ur cookiz" 2021-05-31 13:55:28 +03:00
eris
7341b8a551 Implement right sidebar option as user option 2021-05-26 22:22:55 +00:00
sadposter
28ac9d83c1 Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma-fe into develop 2021-05-21 11:42:10 +01:00
FloatingGhost
6d47156297 Merge branch 'develop' of https://git.ihatebeinga.live/IHBAGang/pleroma-fe into develop 2021-05-21 11:37:33 +01:00
FloatingGhost
cda1819d81 Add domain block components 2021-05-21 11:35:50 +01:00
sadposter
dd6fb78913 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2021-05-12 16:16:18 +01:00
sadposter
350d0b0888 things 2021-05-12 16:16:13 +01:00
Henry Jameson
09ef284af7 better label, better error handling 2021-04-13 00:08:17 +03:00
Henry Jameson
adafae977a Play-on-click, layout improvements. 2021-04-12 00:00:23 +03:00
HJ
8b96ea9377 Merge branch 'settings-import-export' into 'develop' 
Settings backup/restore + small fixes

See merge request pleroma/pleroma-fe!1372
 2021-04-07 17:40:07 +00:00
sadposter
c7c4e2e03e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2021-03-23 23:01:44 +00:00
Shpuld Shpludson
d57ee274de Merge branch 'feat/notification-quick-filters' into 'develop' 
Add quick filters for notifications

See merge request pleroma/pleroma-fe!1364
 2021-03-17 08:17:23 +00:00
Shpuld Shpludson
d262f208dc Merge branch 'feat/do-not-capitalize-every-word' into 'develop' 
Do not capitalize every word in random strings

See merge request pleroma/pleroma-fe!1376
 2021-03-15 12:33:44 +00:00
rinpatch
feb40ec5ff Do not capitalize every word in random strings 
Capitalization like that is only ever used in article/book titles, I
have not seen another website use it in interface elements.
 2021-03-15 13:49:03 +03:00
rinpatch
47719571e4 Use more specific button titles instead of general.submit 
- "Post" for post submission (we already had the button title be "Posting"
when the post was being sent, so there was a weird inconsistency)
- "Register" for registration submission
- "Save changes" for usages in settings
 2021-03-15 13:28:33 +03:00
Shpuld Shpludson
a00212a3bb Merge branch 'websocket-fixes' into 'develop' 
Various websocket fixes

See merge request pleroma/pleroma-fe!1326
 2021-03-15 09:45:38 +00:00
Shpuld Shpuldson
19fc7dda9e merge conflict, use v-slot:trigger, fix popover svg dimensions bug 2021-03-15 11:02:16 +02:00
Shpuld Shpludson
184364c7e0 Merge branch 'feat/timeline-menu-in-navpanel' into 'develop' 
Add timeline menu toggle to nav panel

See merge request pleroma/pleroma-fe!1352
 2021-03-15 07:03:22 +00:00
Henry Jameson
90afcd3420 WIP some work on making errors less spammy 2021-03-08 22:24:39 +02:00
Henry Jameson
2e7bd99444 Merge remote-tracking branch 'origin/develop' into websocket-fixes 
* origin/develop: (119 commits)
  Apply 1 suggestion(s) to 1 file(s)
  Make it possible to localize user highlight options
  remove shoutbox test hacks
  fix shoutbox header, use custom scroll-to-bottom system, remove vue-chat-scroll, temporarily add chat test hack
  update changelog with 2.3.0
  change icons around
  Translated using Weblate (Japanese)
  Update timeline_quick_settings.js
  add screen_name_ui to tests
  separate screen_name and screen_name_ui with decoded punycode
  Update CHANGELOG.md
  add basic validation for statusless status notifications
  changelog mention
  fix chat unread badge
  update shelljs to get rid of warnings on build
  save a few characters
  focus input in emoji picker and react picker
  fix vue warnings
  add only to wording
  basic loggedin check for reply filtering
  ...
 2021-03-08 22:01:28 +02:00
Henry Jameson
395e12cbc6 better error/warnings 2021-03-08 21:00:43 +02:00
Henry Jameson
dda95543e8 implemented import/export for themes 2021-03-08 19:53:30 +02:00
rinpatch
b4f5df9ce5 Make it possible to localize user highlight options 2021-03-04 22:24:17 +03:00
sadposter
d1bffd7659 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2021-03-03 13:51:57 +00:00
Shpuld Shpuldson
ae159f6ad8 ui never refers to them as likes 2021-03-01 16:30:10 +02:00
Shpuld Shpludson
91f93d4a55 Merge branch 'develop' into 'feat/timeline-quick-settings' 
# Conflicts:
#   CHANGELOG.md
 2021-02-28 15:37:39 +00:00
Shpuld Shpuldson
096747a5dc add only to wording 2021-02-25 11:12:51 +02:00
Shpuld Shpuldson
51a78e8b8a add a quick settings menu for timeline headers 2021-02-25 10:56:16 +02:00
Shpuld Shpuldson
3f23aecd10 add sensitive by default option 2021-02-23 10:00:23 +02:00
Shpuld Shpuldson
485f4b899c changelog conflict 2021-02-22 18:11:27 +02:00
Shpuld Shpuldson
98cb9abac7 Add timeline menu toggle to nav panel 2021-02-22 16:24:04 +02:00
sadposter
7ed1fe70d1 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2021-02-20 15:29:27 +00:00
Shpuld Shpuldson
a636e53404 add reason field when approval is required 2021-02-15 11:10:09 +02:00
rinpatch
6acf812101 User card: use general.role instead of card-specific roles 
Also removes admin_menu.roles from some localizations since it is not
used anywhere
 2021-02-13 16:34:43 +03:00
Shpuld Shpludson
7f3fd9ca21 Merge branch 'multi-choice-poll-wording' into 'develop' 
Display 'people voted' instead of 'votes' for multi-answers polls

Closes #993

See merge request pleroma/pleroma-fe!1341
 2021-02-12 19:15:42 +00:00
eugenijm
01275fbac0 Ensure poll.voters_count doesn't fallback to poll.votes when it's 0 2021-02-12 19:43:57 +03:00
rinpatch
da807a12fb Make bot label localizable 2021-02-12 13:48:39 +03:00
Shpuld Shpludson
8b7c367b04 Merge branch 'staff-grouping' into 'develop' 
Group staff by role in the About page

Closes #737

See merge request pleroma/pleroma-fe!1309
 2021-02-12 08:05:55 +00:00
eugenijm
1506b97e35 Display 'people voted' instead of 'votes' for multi-choice polls 2021-02-09 16:36:45 +03:00
Henry Jameson
8958f386be Merge remote-tracking branch 'origin/develop' into settings-changed 
* origin/develop: (306 commits)
  fallback if shadows aren't defined
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Italian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Italian)
  Translated using Weblate (Russian)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Russian)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  ...
 2021-02-01 19:39:57 +02:00
sadposter
87ae0eaa15 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2021-01-23 22:45:25 +00:00