hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1,625 commits 5 branches 0 tags 56 MiB
Commit graph

854 commits

Author SHA1 Message Date
Henry Jameson
1ee7dd7739 Merge branch 'fixAutocomplete' into shigusegubu 
* fixAutocomplete:
  fixed autocomplete
 2018-09-12 11:48:08 +03:00
Henry Jameson
89f9b3a468 fixed autocomplete 2018-09-12 11:46:02 +03:00
Henry Jameson
095278f6dd Merge branch 'betterStorage' into shigusegubu 
* betterStorage:
  more missing stuff
 2018-09-09 22:31:52 +03:00
Henry Jameson
c09dcd9c05 more missing stuff 2018-09-09 22:31:34 +03:00
Henry Jameson
cbe81fbd86 Merge branch 'betterStorage' into shigusegubu 
* betterStorage:
  translations
  Added more stuff that's actually being added to instanceConfig, simplified the whitelist.
  more refactoring
  some recategorization of options...
  Initial version
  seems to be working
 2018-09-09 21:58:21 +03:00
Henry Jameson
033b8fef4b Merge remote-tracking branch 'upstream/develop' into shigusegubu 
* upstream/develop:
  fix lint
  use prime number step for Who to follow panel
  fix
  Revert "Revert "Update messages.js""
  Revert "Update messages.js"
  Update messages.js Update the Occitan language - Fixed Linting
  Remove outdated settings
  Simplified image sensitivity label
  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 21:58:11 +03:00
Henry Jameson
8c0b7583cd translations 2018-09-09 21:57:17 +03:00
Henry Jameson
c152fc501f more refactoring 2018-09-09 21:21:23 +03:00
Henry Jameson
ce36e8383a Merge remote-tracking branch 'upstream/develop' into betterStorage 
* upstream/develop: (23 commits)
  fix lint
  use prime number step for Who to follow panel
  fix
  Revert "Revert "Update messages.js""
  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
  Simplified image sensitivity label
  show features panel only if not login
  update
  debug
  update
  debug
  mock features panel
  i18n/messages.js: changed Folgende back to Follower
  updated german translation
  updated german translation
  ...
 2018-09-09 19:36:41 +03:00
Henry Jameson
b3cb429a97 some recategorization of options... 2018-09-09 19:36:13 +03:00
Hakaba Hitoyo
207c188c16 Debug 2018-09-09 15:22:55 +00: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
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
Hakaba Hitoyo
3a17252929 use prime number step for Who to follow panel 2018-09-09 14:34:51 +09:00
Henry Jameson
6ce547aa67 Merge branch 'post-polish-fixes' into betterStorage 
* post-polish-fixes:
  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.
 2018-09-07 18:17:32 +03:00
Henry Jameson
ae19eaf8f9 Initial version 2018-09-07 18:17:17 +03:00
Henry Jameson
16a0e91fc4 Merge branch 'feature/features-panel' of git.pleroma.social:hakabahitoyo/pleroma-fe into shigusegubu 
* 'feature/features-panel' of git.pleroma.social:hakabahitoyo/pleroma-fe:
  remove formatting options
  features panel i18n
  features panes supports chat & gopher
  show features panel only if not login
  update
  debug
  update
  debug
  mock features panel
 2018-09-04 13:44:09 +03:00
hakabahitoyo
8b94ea28ec remove formatting options 2018-09-04 14:50:02 +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
scarlett
145929207e Revert "Don't only include whitespace conditionally, to fix the fade." 
This reverts commit 8dc85b057e.
 2018-09-04 02:00:12 +01:00
scarlett
8dc85b057e Don't only include whitespace conditionally, to fix the fade. 2018-09-04 01:19:59 +01:00
scarlett
5a59eb4efa Don't hide the bio. 2018-09-04 01:10:22 +01:00
scarlett
bdcbd110e4 Add option for hiding post statistics (e.g. repeats, favs) 2018-09-04 00:41:52 +01:00
scarlett
dcb7e1ecf4 Add option for disabling counts (followers, statuses) in user profiles. 2018-09-04 00:32:25 +01:00
Henry Jameson
53a2e8594f Merge branch 'post-polish-fixes' into shigusegubu 
* post-polish-fixes:
  fix collapse link being too small
 2018-09-03 23:30:22 +03:00
Henry Jameson
dc0b47e8bd fix collapse link being too small 2018-09-03 23:30:07 +03:00
Henry Jameson
9ceed2f898 Merge branch 'post-polish-fixes' into shigusegubu 
* post-polish-fixes:
  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.
 2018-09-03 23:01:07 +03:00
Henry Jameson
4b186fb475 Merge branch 'develop' into shigusegubu 
* develop:
  small fix
  Made showing format selection optional and default to false
  Fix mistakes
  Change styles a bit, make pre-formatted blocks not overflow but scroll
  Add styles for h1/2/3/4/5 tags in status html
  post status form: styling fixes for content-type selector, align icons with selector
  Pass user id to fetchFriends
  i18n: make "plain text" translatable
  add the ability to select a post's content type
  fix
  Add titles to source/expand buttons
  Add titles to post visibility icons
 2018-09-03 23:01:01 +03: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
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
hakabahitoyo
38b683b30c update 2018-09-03 15:57:22 +09:00
Hakaba Hitoyo
049e2397b1 update 2018-09-03 15:23:09 +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
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
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
kaniini
e71b0411aa Merge branch 'post-button-labels' into 'develop' 
Add labels to post buttons

See merge request pleroma/pleroma-fe!323
 2018-08-31 04:04:44 +00:00
William Pitcock
cabcb5c81b i18n: make "plain text" translatable 2018-08-31 03:42:12 +00:00
William Pitcock
9a43ba73e6 add the ability to select a post's content type 2018-08-31 03:42:11 +00:00
Henry Jameson
8c07e63f77 fix 2018-08-31 04:39:07 +03:00
Henry Jameson
76df311899 Revert "add the ability to select a post's content type" 
This reverts commit 38e3c2493d.
 2018-08-31 04:31:59 +03:00