Commit graph

1431 commits

Author SHA1 Message Date
Henry Jameson
b0af6b572c Merge branch 'betterStorage' into shigusegubu
* betterStorage:
  Fixed "user.id is undefined" or something error more sane by properly handling HTTP errors
  undo rename because it makes less sense now.
  proxying nodeinfo
  made FE work even without either api or static config
  Removed warning. Added support for working without static/config.json
  more missing stuff
  fix some missing stuff
  translations
  Added more stuff that's actually being added to instanceConfig, simplified the whitelist.
  more refactoring
  some recategorization of options...
  Initial version
2018-09-17 19:08:41 +03:00
Henry Jameson
3fe199ac0e Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Update Hebrew translation
  Debug
2018-09-17 19:02:18 +03:00
Henry Jameson
03f28d3fa6 Fixed "user.id is undefined" or something error more sane by properly handling
HTTP errors
2018-09-17 18:55:11 +03:00
Henry Jameson
e53f238278 undo rename because it makes less sense now. 2018-09-17 18:54:48 +03:00
Henry Jameson
347c2c02df proxying nodeinfo 2018-09-17 18:54:34 +03:00
Henry Jameson
9467462ef0 made FE work even without either api or static config 2018-09-17 18:54:08 +03:00
Henry Jameson
40a175389a Removed warning. Added support for working without static/config.json 2018-09-17 18:00:56 +03:00
Henry Jameson
394153380d more missing stuff 2018-09-17 17:51:39 +03:00
Henry Jameson
136add8a2f fix some missing stuff 2018-09-17 17:51:39 +03:00
Henry Jameson
1245d7917f translations 2018-09-17 17:51:39 +03:00
Henry Jameson
580aae1b54 Added more stuff that's actually being added to instanceConfig, simplified the whitelist. 2018-09-17 17:51:39 +03:00
Henry Jameson
82fa5d08c4 more refactoring 2018-09-17 17:51:39 +03:00
Henry Jameson
2db991fc7f some recategorization of options... 2018-09-17 17:51:39 +03:00
Henry Jameson
f1c16327b6 Initial version 2018-09-17 17:51:39 +03:00
kaniini
7887e42fca Merge branch 'fixAutocomplete' into 'develop'
Fixes broken autocomplete for users

See merge request pleroma/pleroma-fe!344
2018-09-13 19:30:28 +00:00
Henry
9989ad29df Merge branch 'patch-1' into 'develop'
Update Hebrew translation

See merge request pleroma/pleroma-fe!345
2018-09-12 16:43:19 +00:00
Artik Banana
9b95c4c7b5 Update Hebrew translation 2018-09-12 16:16:55 +00:00
Henry
c94b9796ae Merge branch 'debug-who-to-follow-panel' into 'develop'
Small debug for Who to follow panel

See merge request pleroma/pleroma-fe!342
2018-09-12 08:53:13 +00:00
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
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
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
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