Commit graph

1410 commits

Author SHA1 Message Date
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
094956bf08 Merge branch 'betterStorage' into shigusegubu
* betterStorage:
  fix some missing stuff
2018-09-09 22:02:44 +03:00
Henry Jameson
88a51bed46 fix some missing stuff 2018-09-09 22:02:22 +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
795cb83fbd Added more stuff that's actually being added to instanceConfig, simplified the whitelist. 2018-09-09 21:51:40 +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
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
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
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
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
9f84f4ea05 seems to be working 2018-09-06 19:39:56 +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
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
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
fe9bb83664 Merge branch 'develop' into shigusegubu
* develop:
2018-09-03 23:24:16 +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
e31f67f82e Merge branch 'patch-1' of git.pleroma.social:dingdreher/pleroma-fe into shigusegubu
* 'patch-1' of git.pleroma.social:dingdreher/pleroma-fe:
  Update users.js
2018-09-03 23:02:17 +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
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