dave
|
76cd01e99b
|
#436 - remove yarn.lock
|
2019-04-10 13:22:54 -04:00 |
|
dave
|
40e9eebf91
|
#436 - merge develop
|
2019-04-10 12:54:33 -04:00 |
|
HJ
|
d94a7b6318
|
Merge branch 'fix-local' into 'develop'
Fix wrong property read in pleroma object
See merge request pleroma/pleroma-fe!747
|
2019-04-10 12:06:35 +00:00 |
|
Henry Jameson
|
18cb97a2bd
|
Fix wrong local
|
2019-04-10 15:02:14 +03:00 |
|
Shpuld Shpludson
|
ed3aceff5c
|
Merge branch 'mastoapi/update-extension-support' into 'develop'
Update entity normalizer to include more pleroma-specific fields
See merge request pleroma/pleroma-fe!745
|
2019-04-10 03:14:58 +00:00 |
|
Shpuld Shpludson
|
25601c6873
|
Merge branch 'fix-emoji-picker' into 'develop'
support new custom emoji format
Closes #484
See merge request pleroma/pleroma-fe!746
|
2019-04-10 03:14:51 +00:00 |
|
Henry Jameson
|
a25aabfa10
|
support new custom emoji format
|
2019-04-09 22:54:14 +03:00 |
|
dave
|
d498a26af5
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
|
2019-04-09 15:42:05 -04:00 |
|
Henry Jameson
|
dfd89b0bbc
|
revert, it's still missing
|
2019-04-09 22:28:36 +03:00 |
|
Henry Jameson
|
d95fc02810
|
add support for pleroma-specific fields
|
2019-04-09 22:26:57 +03:00 |
|
Shpuld Shpludson
|
d7cf841dfe
|
Merge branch '486-expand-button' into 'develop'
#486 - remove expand button on conversation page
Closes #486
See merge request pleroma/pleroma-fe!742
|
2019-04-09 18:52:18 +00:00 |
|
jared
|
5df049ca31
|
#486 - remove expand button on conversation page
|
2019-04-09 14:10:51 -04:00 |
|
Shpuld Shpludson
|
b3ace226fb
|
Merge branch 'fix/prevent-repeated-fetching' into 'develop'
#485 Prevent repeated fetching
Closes #485
See merge request pleroma/pleroma-fe!738
|
2019-04-09 18:05:46 +00:00 |
|
jasper
|
011f04c196
|
fix small bug
|
2019-04-09 09:19:48 -07:00 |
|
jasper
|
b7d7c21617
|
Add await to login befor redirect to friends timeline
|
2019-04-09 08:57:41 -07:00 |
|
jasper
|
1570e779b1
|
Prevent repeated fetching
|
2019-04-09 08:38:13 -07:00 |
|
Shpuld Shpludson
|
1e9ddcb0da
|
Merge branch 'fix/notification-bugs' into 'develop'
#474 Fix notification bugs
Closes #474
See merge request pleroma/pleroma-fe!728
|
2019-04-09 15:24:33 +00:00 |
|
dave
|
d3218807b4
|
#436 - merge develop
|
2019-04-08 21:04:59 -04:00 |
|
Shpuld Shpludson
|
546ced43d9
|
Merge branch 'moderation-menu' into 'develop'
Moderation menu #310
See merge request pleroma/pleroma-fe!595
|
2019-04-08 19:01:40 +00:00 |
|
dave
|
b0da32fea2
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
|
2019-04-08 14:29:12 -04:00 |
|
jared
|
7f6f025792
|
#101 - remove unused code
|
2019-04-08 13:32:39 -04:00 |
|
Shpuld Shpludson
|
2f725c570b
|
Merge branch 'debug_message' into 'develop'
remove debug message
See merge request pleroma/pleroma-fe!735
|
2019-04-08 16:49:52 +00:00 |
|
Maksim
|
7259e02a10
|
remove debug message
|
2019-04-08 16:49:51 +00:00 |
|
jared
|
885f4c9924
|
#101 - bind outside click, add emoji to post status form
|
2019-04-08 12:02:50 -04:00 |
|
jared
|
2ab915b486
|
#101 - click outside of emoji implementation
|
2019-04-08 11:50:12 -04:00 |
|
jared
|
820a6543c7
|
#101 - update caret pos after emoji's inserted
|
2019-04-08 11:10:26 -04:00 |
|
Henry Jameson
|
6471bec0d9
|
update node
|
2019-04-07 20:54:55 +03:00 |
|
Henry Jameson
|
5d2177a048
|
fix obvious bug
|
2019-04-07 20:36:55 +03:00 |
|
Henry Jameson
|
9108737d55
|
Webpack 4, ESLint with Vue, Node-sass, updated dependencies overall. New linting.
|
2019-04-07 20:33:11 +03:00 |
|
jared
|
b4e53576f2
|
#101 - bind scroll event, highlight relevent section by tabs
|
2019-04-05 14:51:25 -04:00 |
|
jared
|
093f0b23f7
|
#101 - merge develop
|
2019-04-05 14:08:13 -04:00 |
|
Shpuld Shpludson
|
8c7f765dff
|
Merge branch 'issue-469-safe-dm-from-BE' into 'develop'
Issue 469 safe dm from be
Closes #469
See merge request pleroma/pleroma-fe!726
|
2019-04-04 19:38:03 +00:00 |
|
jasper
|
1c04cd2036
|
Add space
|
2019-04-04 09:06:53 -07:00 |
|
jasper
|
a1275be4c0
|
Separate timeline and notification
|
2019-04-04 09:03:56 -07:00 |
|
jasper
|
7c2b65e9a3
|
Remove useless codes
|
2019-04-03 09:08:23 -07:00 |
|
jasper
|
ea27483f27
|
Fix notification bugs
|
2019-04-03 09:04:46 -07:00 |
|
dave
|
fe756fe30d
|
#436 - revert stripe html for notification
|
2019-04-03 11:17:23 -04:00 |
|
dave
|
6ed26ce65d
|
#436 - notification html to text content
|
2019-04-03 10:58:39 -04:00 |
|
dave
|
6fa014505c
|
#436 - revert notification silience config
|
2019-04-03 10:53:11 -04:00 |
|
jared
|
3b78c9c755
|
#101 - update hard-coded server url
|
2019-04-02 13:38:07 -04:00 |
|
dave
|
70071b870f
|
#469 - update text copy
|
2019-04-02 12:46:22 -04:00 |
|
dave
|
67258571c5
|
#469 - update behavior of safe_dm
|
2019-04-02 11:19:45 -04:00 |
|
jared
|
79efe0646c
|
merge develop
|
2019-04-02 10:53:33 -04:00 |
|
dave
|
9d5ed04147
|
#469 - clean up
|
2019-04-02 10:28:38 -04:00 |
|
dave
|
c9a9b3122d
|
#469 - DM warning text should vary based on BE setting
|
2019-04-02 10:26:14 -04:00 |
|
dave
|
8b3f037f87
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
|
2019-04-02 10:07:36 -04:00 |
|
eugenijm
|
6b6878bde0
|
Added moderation menu
|
2019-04-01 23:30:06 +03:00 |
|
Shpuld Shpludson
|
ac28e8c2f9
|
Merge branch 'feature/mobile-improvements-3' into 'develop'
Mobile notifications in nav bar, separate mobile navbar to its own component
See merge request pleroma/pleroma-fe!703
|
2019-04-01 19:57:31 +00:00 |
|
Shpuld Shpludson
|
a595febcb8
|
Merge branch 'develop' into 'develop'
[i18n] Update oc.json for !611 and !691
See merge request pleroma/pleroma-fe!712
|
2019-04-01 19:49:16 +00:00 |
|
shpuld
|
89c9448532
|
fix conflict
|
2019-04-01 22:47:37 +03:00 |
|