`master` refresh with `develop`
It's been a while since we sync'd master
with develop
.
As far as I can tell, we bundle PleromaFE develop
with BE, not master
. Maybe we should switch to bundling master
instead to ensure stability, or is bundling "edge" version of PleromaFE intentional?
Merge request reports
Activity
develop is stable enough since MRs in general are more closely inspected and tested and overall have higher quality standards because it's a user-facing application and impressions matter.
not to mention FE is nearly stateless so rolling it back or updating it is much much easier than BE, and for most problems there are workaround and alternative FEs to use in case of absolute emergency.
so i don't really see the need for
master
to even exist all that much and i don't really care about that, i'm not good with release management, better ask @shpuld
added 2 commits
added 2 commits
added 12 commits
- 1af536d6 - upgrade Babel core to v7
- 4f9aba1a - upgrade babel preset
- a5cce10a - update babelrc presets config
- d79dfb94 - upgrade babel-plugin-transform-vue-jsx
- c141c7a7 - babel-plugin-add-module-exports is not necessary for babel v7
- 773fa454 - upgrade babel-plugin-lodash
- 424e7889 - upgrade babel-plugin-transform-runtime
- e6d5b9c0 - update babelrc
- cb92865d - upgrade babel-register
- d7bc1aff - fix babelrc plugin config
- b973ee59 - must use h in higher babel-plugin-transform-vue-jsx
- 766a674a - Merge branch 'upgrade-babel' into 'develop'
Toggle commit listadded 16 commits
- 621ac0bd - docs: document FE interaction with the BE private setting
- 99fd096d - boot: track whether private mode is enabled or not
- 21f1637e - nav panel: refactor to use vuex mapState
- 1f967435 - nav panel: disable TWKN if federation disabled, disable Public and TWKN if privateMode is enabled
- cb5f7314 - app: search API is not available in private mode so disable it
- 43d4d17b - side drawer: same treatment
- 821a2bcc - Merge branch 'develop' into feature/lockdown-timelines-private-mode
- 3eeb3dc5 - Lint
- 211d25cd - More lint
- afe5b3a8 - More lint
- 7ddd5af0 - Finally trust eslint
- 2514dc18 - Logic should be to hide TWKN if not federating OR if instance is not public
- 0743fbb2 - The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
- 8d14036a - Add fallback in case BE does not report federating status in nodeinfo
- d899d069 - Use a centralized fallback for missing values and use instance.federating instead of
- 0b49e798 - Merge branch 'feature/lockdown-timelines-private-mode' into 'develop'
Toggle commit listadded 2 commits
added 13 commits
- ddb6fb92 - Backend Interactor service overhaul, removed the need for copypasting
- 319bb4ac - initial streaming work
- 172ebaf4 - improved initial notifications fetching
- ff95d865 - Updated streaming and improved error-handling, some more refactoring to api
- 1b1620a7 - Merge remote-tracking branch 'upstream/develop' into streaming
- 505fb260 - better wrapper for websocket
- 6acd8895 - Option to enable streaming
- 63a5f50e - fix deletes causing errors
- 585702b1 - fix desktop notifications not working with streaming
- b6194775 - Merge remote-tracking branch 'upstream/develop' into streaming
- 43197c42 - Some error handling
- bd07e5de - unify showimmideately
- b8f4b18a - Merge branch 'streaming' into 'develop'
Toggle commit listadded 2 commits
added 8 commits
- 2bc63720 - fix parse for move type notifications
- 6af870cd - Add view for moves notifications
- 31aa177e - Fix target account link
- e8333fff - change the expression of `move`
- b4acbf53 - Add user migrates filter to interactions
- c3e7806a - remove unused fallback
- 215662af - Merge branch 'develop' into 'fix-move-type-notification'
- ad97e03b - Merge branch 'fix-move-type-notification' into 'develop'
Toggle commit listadded 2 commits