hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3,224 commits 5 branches 0 tags 34 MiB
Commit graph

1,832 commits

Author SHA1 Message Date
Brenden Bice
85457fc917 fetch reblogged users 2019-04-11 23:26:12 -04:00
Brenden Bice
2d339cd3b8 fetch favorited users 2019-04-11 23:26:12 -04:00
taehoon
ab7a418d80 maintain conversationsObject storage 2019-04-11 12:46:06 -04:00
taehoon
fa16d66c52 remove unused importing 2019-04-11 07:56:26 -04:00
taehoon
724602bdc1 get statuses in a conversation from the global repository instead of local state 2019-04-11 07:56:26 -04: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
66680e5471 Merge remote-tracking branch 'upstream/develop' into shigusegubu 
* upstream/develop:
  #486 - remove expand button on conversation page
  fix small bug
  Add await to login befor redirect to friends timeline
  Prevent repeated fetching
  Add space
  Separate timeline and notification
  Remove useless codes
  Fix notification bugs
 2019-04-09 22:00:35 +03:00
Henry Jameson
317b658413 Merge remote-tracking branch 'Dave/issue-436-mastoapi-notifications' into shigusegubu 
* Dave/issue-436-mastoapi-notifications:
  remove debug message
  #436 - revert stripe html for notification
  #436 - notification html to text content
  #436 - revert notification silience config
  #469 - update text copy
  #469 - update behavior of safe_dm
  #469 - clean up
  #469 - DM warning text should vary based on BE setting
  Added moderation menu
  remove window width copypasta
  Fix login handling
  Add Promise.all to send requests when loading
  #471 - fix timeline fetch with since_id
  Update Polish translation
  Update oc.json for !611 and !691
 2019-04-09 22:00:08 +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
jasper
a1275be4c0 Separate timeline and notification 2019-04-04 09:03:56 -07:00
jasper
ea27483f27 Fix notification bugs 2019-04-03 09:04:46 -07:00
dave
67258571c5 #469 - update behavior of safe_dm 2019-04-02 11:19:45 -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
46de457f50 Merge branch 'develop' into feature/mobile-improvements-3 2019-04-01 22:42:06 +03:00
HJ
3c2931529e Merge branch 'minimal-scopes-mode' into 'develop' 
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode

See merge request pleroma/pleroma-fe!633
 2019-04-01 19:32:37 +00:00
Henry Jameson
ea9adb3c16 Merge remote-tracking branch 'upstream/feature/mobile-improvements-3' into shigusegubu 
* upstream/feature/mobile-improvements-3:
  add gesture to close notifications drawer
  make notifications close on navigation
  make mobile notifs drawer more like an actual drawer, make mobile nav buttons bigger to press, fix alert dot
  remove notifications from sidebar, make notifications appear on login only
  make nav bar slide, move mobile post status to mobile nav
  more work with notifications drawer
  start working on one tap notifications
 2019-04-01 22:14:35 +03:00
Henry Jameson
e990090bbf Merge remote-tracking branch 'Dave/issue-436-mastoapi-notifications' into shigusegubu 
* Dave/issue-436-mastoapi-notifications:
  #436 - sync notification & timeline users
 2019-04-01 21:51:51 +03:00
Henry Jameson
95fc9a0116 Merge remote-tracking branch 'upstream/develop' into shigusegubu 
* upstream/develop:
  #470 - update button text capitalization
  #470 - handle cases without subject
  #470 - update i18n
  #470 - fix subject and content toggle issue
  Remove useless comma
  Fix user card in notification
 2019-04-01 21:50:52 +03:00
jared
487a194f6d #470 - handle cases without subject 2019-04-01 13:01:28 -04:00
jared
6847e70a49 #470 - update i18n 2019-04-01 12:58:23 -04:00
jared
748b1ed167 #470 - fix subject and content toggle issue 2019-04-01 12:54:34 -04:00
dave
6482201dc9 #436 - sync notification & timeline users 2019-04-01 12:22:49 -04:00
dave
0af2f8e4fd #436 - merge develop & resolve conflict 2019-04-01 12:13:11 -04:00
jasper
80277e5571 Remove useless comma 2019-04-01 07:27:12 -07:00
jasper
4a2f676f2e Fix user card in notification 2019-04-01 07:26:13 -07:00
Henry Jameson
93755d4858 Merge branch 'issue-436-mastoapi-notifications' into shigusegubu 
* issue-436-mastoapi-notifications:
  #436 - apply patch and clean up
  #436 - update notification
  #436 - apply patch
  #436 - keep original naming
  #436 - keep original naming
  #436: sync notification with timeline
  #436: implement is_seen logic
  #436: clean up based on comment
  #436: update test
  #436: add is_local for statuses
  #436: remove clear & dismiss UI updates
  #436: update unit testing
  #436: fix notification order, follow type link issue, duplicate key
  #436: update is_local
  #436: update entity_normalizer
  #436: add dismiss button, disable is_seen part
  #436: integrate mastoAPI notifications
 2019-04-01 09:39:44 +03:00
dave
21ea5adc8b #436 - apply patch and clean up 2019-03-31 21:59:18 -04:00
dave
06fd3a9c5f #436 - apply patch 2019-03-31 14:50:34 -04:00
dave
ecacc933e7 #436 - keep original naming 2019-03-31 13:47:23 -04:00
dave
0db66e2905 #436 - keep original naming 2019-03-31 13:41:22 -04:00
Henry Jameson
10c0758d58 Merge branch 'minimal-scopes-mode' into shigusegubu 
* minimal-scopes-mode:
  final touches
  aaaaggghh
 2019-03-30 12:44:49 +02:00
Henry Jameson
0792732822 final touches 2019-03-30 12:42:42 +02:00
Henry Jameson
4dc64438e9 aaaaggghh 2019-03-30 12:41:42 +02:00
Henry Jameson
8baf0ce9ec Merge branch 'minimal-scopes-mode' into shigusegubu 
* minimal-scopes-mode:
  fix lint
  fix formatting
  fix formatting
  Review
 2019-03-30 12:37:55 +02:00
Henry Jameson
995daf70b7 fix lint 2019-03-30 12:34:13 +02:00
Henry Jameson
9f4a9bff46 Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode 
* upstream/develop: (173 commits)
  Fix: Change condition
  fix typo
  update store according to retweeted status
  #433 - update sort by for conversation
  display replies_count right after reply icon
  expose replies_count from mastodon api
  Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
  make side drawer use gesture service and fix its animations
  review/remove error hiding
  errata
  review
  #433 - sort conversation for retweets and clean up
  Revert "Merge branch 'revert-987b5162' into 'develop'"
  Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
  Add await to login action'
  Remove console log
  Fix warnings in user profile routing
  Add tests for gesture service, fix bug with perpendicular directions
  #255 - clean up autocomplete form
  #255 - clean up user settings page with self-closing html tags
  ...
 2019-03-30 12:31:50 +02:00
Henry Jameson
bf927122df Review 2019-03-30 12:25:23 +02:00
Henry Jameson
554ebd38bb fix 2019-03-30 12:05:12 +02:00