Skip to content
Snippets Groups Projects

serverside-frontend-configuration-2

Merged serverside-frontend-configuration-2
hakabahitoyo/pleroma-fe:serverside-frontend-configuration-2 into develop
2 unresolved threads
Merged Hakaba Hitoyo requested to merge hakabahitoyo/pleroma-fe:serverside-frontend-configuration-2 into develop
2 unresolved threads

Updated version of !302 (closed)

Edited by Hakaba Hitoyo

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
src/main.js
129 { name: 'registration', path: '/registration', component: Registration },
130 { name: 'registration', path: '/registration/:token', component: Registration },
131 { name: 'friend-requests', path: '/friend-requests', component: FollowRequests },
132 { name: 'user-settings', path: '/user-settings', component: UserSettings }
133 ]
134
135 const router = new VueRouter({
136 mode: 'history',
137 routes,
138 scrollBehavior: (to, from, savedPosition) => {
139 if (to.matched.some(m => m.meta.dontScroll)) {
140 return false
141 }
142 return savedPosition || { x: 0, y: 0 }
99 var apiStatusnetConfigSitePleromafe = data.site.pleromafe
100 window.fetch('/static/sonfig.json')
  • kaniini
    kaniini @kaniini started a thread on an old version of the diff
    • src/main.js
    128 { name: 'settings', path: '/settings', component: Settings },
    129 { name: 'registration', path: '/registration', component: Registration },
    130 { name: 'registration', path: '/registration/:token', component: Registration },
    131 { name: 'friend-requests', path: '/friend-requests', component: FollowRequests },
    132 { name: 'user-settings', path: '/user-settings', component: UserSettings }
    133 ]
    134
    135 const router = new VueRouter({
    136 mode: 'history',
    137 routes,
    138 scrollBehavior: (to, from, savedPosition) => {
    139 if (to.matched.some(m => m.meta.dontScroll)) {
    140 return false
    141 }
    142 return savedPosition || { x: 0, y: 0 }
    99 var apiStatusnetConfigSitePleromafe = data.site.pleromafe
  • kaniini
    kaniini @kaniini
    Contributor

    a couple of minor tweaks needed and then we can get this merged

  • Hakaba Hitoyo
    Hakaba Hitoyo @hakabahitoyo
    Author Contributor

    Now I am on no computer trip. Please wait for a few days.

  • Hakaba Hitoyo marked as a Work In Progress

    marked as a Work In Progress

  • Hakaba Hitoyo added 4 commits

    added 4 commits

    • a81c3b13 - fix typo
    • a3cc7811 - rename apiStatusnetConfigSitePleromafe to apiConfig
    • 8b9e973a - save /api/statusnet/config.json connection
    • c6913e39 - correct /static/config.json decoding

    Compare with previous version

    Toggle commit list
  • Hakaba Hitoyo unmarked as a Work In Progress

    unmarked as a Work In Progress

  • kaniini merged

    merged

  • kaniini mentioned in commit bc4f09b7

    mentioned in commit bc4f09b7

    • Please register or sign in to reply