melnary/akkoma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Pull requests Activity
1477 commits 12 branches 30 tags 21 MiB
Commit graph

1477 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henry Jameson
28a26ceab7 Merge remote-tracking branch 'upstream/develop' into translations-separation 
* upstream/develop:
  fix lint
  Revert "Revert "Update messages.js""
  i18n/messages.js: changed Folgende back to Follower
  updated german translation
  updated german translation
  cleaning up some translations that broke the building
  fix trailing comma
  Update and fix messages.js (pt, eo)
 2018-09-09 18:44:03 +03:00
Henry
4bff6f12ed Merge branch 'feature/update-de-translation' into 'develop' 
updated german translation

See merge request pleroma/pleroma-fe!293
 2018-09-09 15:41:24 +00:00
Hakaba Hitoyo
207c188c16 Debug 2018-09-09 15:22:55 +00:00
Henry
dda0effd65 Merge branch 'pizzaiolo/pleroma-fe-patch-1' into 'develop' 
Update and fix messages.js (pt, eo)

See merge request pleroma/pleroma-fe!341
 2018-09-09 13:27:19 +00:00
Henry Jameson
aea00310c6 fix lint 2018-09-09 16:01:44 +03:00
Henry
8455936cd6 Merge branch 'develop' into 'develop' 
Update the Occitan language - Fixed Linting

See merge request pleroma/pleroma-fe!339
 2018-09-09 12:58:09 +00:00
Henry Jameson
0656e0ef32 Merge remote-tracking branch 'upstream/develop' into translations-separation 
* upstream/develop: (21 commits)
  use prime number step for Who to follow panel
  fix
  Revert "Update messages.js"
  Update messages.js Update the Occitan language - Fixed Linting
  remove formatting options
  Remove outdated settings
  features panel i18n
  features panes supports chat & gopher
  fix collapse link being too small
  small fix for non-square gif avatars
  Fixed collapseMessageWithSubjectLocal always using instance-provided config.
  Fix last place with usercard having wrong width
  Fixed non-masked image looking weird in chrome.
  Kinda went back to using align-items: stretch. Fixed error message floating.
  Simplified image sensitivity label
  show features panel only if not login
  update
  debug
  update
  debug
  ...
 2018-09-09 15:55:43 +03:00
kaniini
ed6abeacad Merge branch 'post-polish-fixes' into 'develop' 
Post polish fixes

See merge request pleroma/pleroma-fe!333
 2018-09-09 11:59:49 +00:00
kaniini
369fd648f6 Merge branch 'remove-outdated-settings' into 'develop' 
Remove outdated settings

See merge request pleroma/pleroma-fe!335
 2018-09-09 11:56:34 +00:00
kaniini
eb93034a40 Merge branch 'simplify-sensitivity-label' into 'develop' 
Simplified image sensitivity label

See merge request pleroma/pleroma-fe!334
 2018-09-09 11:55:49 +00:00
kaniini
3f72b611c1 Merge branch 'prime-number-step-for-who-to-follow-panel' into 'develop' 
Prime number step for Who to follow panel

See merge request pleroma/pleroma-fe!340
 2018-09-09 11:55:25 +00:00
Hakaba Hitoyo
3a17252929 use prime number step for Who to follow panel 2018-09-09 14:34:51 +09:00
Henry Jameson
5726be6830 fix 2018-09-08 05:16:25 +03:00
Artik Banana
78e12bc812 Revert "Revert "Update messages.js"" 
This reverts commit 385484566a
 2018-09-07 16:51:25 +00:00
Henry
2eab0cb115 Merge branch 'feature/features-panel' into 'develop' 
Features panel

See merge request pleroma/pleroma-fe!331
 2018-09-07 16:37:24 +00:00
Henry
385484566a Revert "Update messages.js" 
This reverts commit 5e1f0d9416
 2018-09-07 16:22:59 +00:00
Artik Banana
5e1f0d9416 Update messages.js 
Update the Occitan language - Fixed Linting
 2018-09-07 16:18:01 +00:00
Henry Jameson
e6adddbba6 added usage 2018-09-06 22:10:41 +03:00
Henry Jameson
dbd010abd4 a tool to check what's missing from a language 2018-09-06 21:59:20 +03:00
Henry Jameson
b4a5fddea8 all other languages which do not have MRs related to them separated 2018-09-06 21:29:39 +03:00
Henry Jameson
9f84f4ea05 seems to be working 2018-09-06 19:39:56 +03:00
hakabahitoyo
8b94ea28ec remove formatting options 2018-09-04 14:50:02 +09:00
hakabahitoyo
dbf24e1fbf Remove outdated settings 2018-09-04 11:15:00 +09:00
Hakaba Hitoyo
49ab19c342 features panel i18n 2018-09-04 10:59:02 +09:00
Hakaba Hitoyo
65115bfc7f features panes supports chat & gopher 2018-09-04 10:44:25 +09:00
Henry Jameson
dc0b47e8bd fix collapse link being too small 2018-09-03 23:30:07 +03:00
Henry
c348a3ec11 Merge branch 'patch-1' into 'develop' 
Fix friends query

See merge request pleroma/pleroma-fe!332
 2018-09-03 20:07:11 +00:00
Henry Jameson
f9eb9e0b70 small fix for non-square gif avatars 2018-09-03 22:49:46 +03:00
Henry Jameson
6e64324d37 Fixed collapseMessageWithSubjectLocal always using instance-provided config. 2018-09-03 22:40:45 +03:00
Henry Jameson
d4f9d21857 Fix last place with usercard having wrong width 2018-09-03 22:23:53 +03:00
Henry Jameson
08b044c365 Fixed non-masked image looking weird in chrome. 2018-09-03 22:18:59 +03:00
Henry Jameson
a6047e0ad5 Kinda went back to using align-items: stretch. Fixed error message floating. 2018-09-03 22:12:18 +03:00
Henry Jameson
36101abc22 Simplified image sensitivity label 2018-09-03 18:52:07 +03:00
Dingdreher
900aaefb98 Update users.js 2018-09-03 12:01:05 +00:00
hakabahitoyo
fa477dd41f show features panel only if not login 2018-09-03 16:02:06 +09:00
hakabahitoyo
38b683b30c update 2018-09-03 15:57:22 +09:00
Hakaba Hitoyo
a99869146f debug 2018-09-03 15:24:49 +09:00
Hakaba Hitoyo
049e2397b1 update 2018-09-03 15:23:09 +09:00
hakabahitoyo
07ef43c7b5 debug 2018-09-03 14:55:40 +09:00
Hakaba Hitoyo
52fe01e4d8 mock features panel 2018-09-03 14:43:10 +09:00
Shpuld Shpludson
20b0ffc0b9 Merge branch 'imvomitingasicodethisshit' into 'develop' 
Made showing format selection optional and default to false

See merge request pleroma/pleroma-fe!329
 2018-09-01 05:57:58 +00:00
Shpuld Shpludson
a8ae2a5b11 Merge branch 'fix/put-sense-into-rich-text-styles' into 'develop' 
Add styles for h1/2/3/4/5 tags in status html for rich text

See merge request pleroma/pleroma-fe!328
 2018-09-01 05:54:47 +00:00
Henry Jameson
d6240c25cf small fix 2018-08-31 17:24:46 +03:00
Henry Jameson
17f30190e0 Made showing format selection optional and default to false 2018-08-31 17:00:41 +03:00
shpuld
77e8933b2e Fix mistakes 2018-08-31 16:13:43 +03:00
shpuld
384c80e238 Change styles a bit, make pre-formatted blocks not overflow but scroll 2018-08-31 16:04:52 +03:00
shpuld
f07e6b271c Add styles for h1/2/3/4/5 tags in status html 2018-08-31 15:11:27 +03:00
kaniini
33b13d3775 Merge branch 'fixup/post-status-styling' into 'develop' 
post status form: styling fixes for content-type selector, align icons with selector

See merge request pleroma/pleroma-fe!327
 2018-08-31 04:24:53 +00:00
William Pitcock
f9bfe2ea37 post status form: styling fixes for content-type selector, align icons with selector 2018-08-31 04:23:06 +00:00
kaniini
958acbab8d Merge branch 'polish' into 'develop' 
Another one of those MR that fixes many many small-to-medium things

Closes #92, #75, #122, #52, #72, and #87

See merge request pleroma/pleroma-fe!324
 2018-08-31 04:10:17 +00:00