Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
pleroma-fe
Merge requests
!903
Bookmarks
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Bookmarks
eugenijm/pleroma-fe:bookmarks
into
develop
Overview
33
Commits
5
Pipelines
34
Changes
20
Merged
Eugenij
requested to merge
eugenijm/pleroma-fe:bookmarks
into
develop
5 years ago
Overview
33
Commits
5
Pipelines
34
Changes
20
Expand
Revives
the bookmarks MR
(Closes
#472 (closed)
).
pagination needs to be updated to be compatible with the current BE implementation, which stores bookmarks in a separate table in the DB (ref:
#667 (closed)
).
Edited
5 years ago
by
Eugenij
0
0
1
Merge request reports
Compare
develop
version 33
e31ff9b5
4 years ago
version 32
8c4be5d1
4 years ago
version 31
84c19dd3
4 years ago
version 30
7f02208e
4 years ago
version 29
e95960b7
4 years ago
version 28
48270cb3
4 years ago
version 27
0f0eb05a
4 years ago
version 26
b81652f9
4 years ago
version 25
2ac9095f
4 years ago
version 24
9a30d1a4
4 years ago
version 23
17f1826c
4 years ago
version 22
18681326
4 years ago
version 21
ac91981b
5 years ago
version 20
845cd6ad
5 years ago
version 19
38165d99
5 years ago
version 18
8b85218f
5 years ago
version 17
de986d64
5 years ago
version 16
1d8c2c74
5 years ago
version 15
65b48aaa
5 years ago
version 14
3ede5130
5 years ago
version 13
6ae4a304
5 years ago
version 12
add2b35f
5 years ago
version 11
2d924d12
5 years ago
version 10
e00d94f9
5 years ago
version 9
e45ce387
5 years ago
version 8
4b4c8b0e
5 years ago
version 7
cc5618d7
5 years ago
version 6
2636b291
5 years ago
version 5
f1bc1a87
5 years ago
version 4
dda95992
5 years ago
version 3
b2da80a9
5 years ago
version 2
deb96cff
5 years ago
version 1
29378e78
5 years ago
develop (base)
and
latest version
latest version
4af6e610
5 commits,
4 years ago
version 33
e31ff9b5
4 commits,
4 years ago
version 32
8c4be5d1
3 commits,
4 years ago
version 31
84c19dd3
3 commits,
4 years ago
version 30
7f02208e
3 commits,
4 years ago
version 29
e95960b7
2 commits,
4 years ago
version 28
48270cb3
1 commit,
4 years ago
version 27
0f0eb05a
1 commit,
4 years ago
version 26
b81652f9
1 commit,
4 years ago
version 25
2ac9095f
2 commits,
4 years ago
version 24
9a30d1a4
2 commits,
4 years ago
version 23
17f1826c
2 commits,
4 years ago
version 22
18681326
2 commits,
4 years ago
version 21
ac91981b
2 commits,
5 years ago
version 20
845cd6ad
2 commits,
5 years ago
version 19
38165d99
2 commits,
5 years ago
version 18
8b85218f
2 commits,
5 years ago
version 17
de986d64
2 commits,
5 years ago
version 16
1d8c2c74
2 commits,
5 years ago
version 15
65b48aaa
2 commits,
5 years ago
version 14
3ede5130
2 commits,
5 years ago
version 13
6ae4a304
2 commits,
5 years ago
version 12
add2b35f
2 commits,
5 years ago
version 11
2d924d12
2 commits,
5 years ago
version 10
e00d94f9
2 commits,
5 years ago
version 9
e45ce387
2 commits,
5 years ago
version 8
4b4c8b0e
2 commits,
5 years ago
version 7
cc5618d7
2 commits,
5 years ago
version 6
2636b291
2 commits,
5 years ago
version 5
f1bc1a87
2 commits,
5 years ago
version 4
dda95992
2 commits,
5 years ago
version 3
b2da80a9
2 commits,
5 years ago
version 2
deb96cff
2 commits,
5 years ago
version 1
29378e78
1 commit,
5 years ago
20 files
+
213
−
24
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
20
Search (e.g. *.vue) (Ctrl+P)
src/boot/routes.js
+
2
−
0
Options
@@ -2,6 +2,7 @@ import PublicTimeline from 'components/public_timeline/public_timeline.vue'
import
PublicAndExternalTimeline
from
'
components/public_and_external_timeline/public_and_external_timeline.vue
'
import
FriendsTimeline
from
'
components/friends_timeline/friends_timeline.vue
'
import
TagTimeline
from
'
components/tag_timeline/tag_timeline.vue
'
import
BookmarkTimeline
from
'
components/bookmark_timeline/bookmark_timeline.vue
'
import
ConversationPage
from
'
components/conversation-page/conversation-page.vue
'
import
Interactions
from
'
components/interactions/interactions.vue
'
import
DMs
from
'
components/dm_timeline/dm_timeline.vue
'
@@ -40,6 +41,7 @@ export default (store) => {
{
name
:
'
public-timeline
'
,
path
:
'
/main/public
'
,
component
:
PublicTimeline
},
{
name
:
'
friends
'
,
path
:
'
/main/friends
'
,
component
:
FriendsTimeline
,
beforeEnter
:
validateAuthenticatedRoute
},
{
name
:
'
tag-timeline
'
,
path
:
'
/tag/:tag
'
,
component
:
TagTimeline
},
{
name
:
'
bookmarks
'
,
path
:
'
/bookmarks
'
,
component
:
BookmarkTimeline
},
{
name
:
'
conversation
'
,
path
:
'
/notice/:id
'
,
component
:
ConversationPage
,
meta
:
{
dontScroll
:
true
}
},
{
name
:
'
remote-user-profile-acct
'
,
path
:
'
/remote-users/(@?):username([^/@]+)@:hostname([^/@]+)
'
,
Loading