itepechi/akkoma-fe
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity
2942 commits 3 branches 31 tags 23 MiB
Commit graph

2942 commits

This branch
This branch
All branches
Author SHA1 Message Date
dave
6fa014505c #436 - revert notification silience config 2019-04-03 10:53:11 -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
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
Shpuld Shpludson
ae3b92ce85 Merge branch 'fix/sending-requests-when-loading' into 'develop' 
#463 Add Promise.all to send requests when loading

Closes #463

See merge request pleroma/pleroma-fe!723
 2019-04-01 19:45:08 +00:00
Shpuld Shpludson
3b38e1b8a7 Merge branch 'patch-2' into 'develop' 
Update Polish translation

See merge request pleroma/pleroma-fe!719
 2019-04-01 19:44:11 +00:00
shpuld
46de457f50 Merge branch 'develop' into feature/mobile-improvements-3 2019-04-01 22:42:06 +03:00
shpuld
2879495b8a remove window width copypasta 2019-04-01 22:41:34 +03:00
Shpuld Shpludson
df366a586d Merge branch '471-timeline-since-id' into 'develop' 
#471 - fix timeline fetch with since_id

Closes #471

See merge request pleroma/pleroma-fe!722
 2019-04-01 19:33:45 +00: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
jasper
90939f198b Fix login handling 2019-04-01 12:32:13 -07:00
HJ
c17de4b638 Merge branch '470-toggle-subject-content' into 'develop' 
Resolve "Handling subjects/spoiler_text/cw not working properly"

Closes #470

See merge request pleroma/pleroma-fe!721
 2019-04-01 18:45:24 +00:00
jasper
8fc10dc177 Add Promise.all to send requests when loading 2019-04-01 10:46:30 -07:00
jared
d856c2745c #471 - fix timeline fetch with since_id 2019-04-01 13:25:48 -04:00
jared
dee9ab7bda #470 - update button text capitalization 2019-04-01 13:04:40 -04: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
Shpuld Shpludson
6c24ae9b0b Merge branch 'fix/user-card-buttons' into 'develop' 
#467 Fix/Muted and Blocked not "pressed" on User Card

Closes #467

See merge request pleroma/pleroma-fe!720
 2019-04-01 15:38:14 +00: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
dave
21ea5adc8b #436 - apply patch and clean up 2019-03-31 21:59:18 -04:00
dave
b909796683 #436 - update notification 2019-03-31 15:15:16 -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
dave
8efcfc69e8 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-03-31 11:03:43 -04:00
Marcin Mikołajczak
6828c7d74c Update Polish translation 2019-03-31 13:50:51 +00: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
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
e89a622005 fix formatting 2019-03-30 12:29:28 +02:00
Henry Jameson
beaf4fcf8a fix formatting 2019-03-30 12:26:53 +02:00
Henry Jameson
bf927122df Review 2019-03-30 12:25:23 +02:00
Shpuld Shpludson
0117f6af9f Merge branch 'issues/#465' into 'develop' 
update store according to retweeted status

Closes #465

See merge request pleroma/pleroma-fe!713
 2019-03-29 15:33:16 +00:00
Shpuld Shpludson
e329a362e0 Merge branch 'fix/warnings-in-user-profile' into 'develop' 
#461 Fix warnings about user-profile

Closes #461

See merge request pleroma/pleroma-fe!708
 2019-03-29 15:32:40 +00:00
dave
783cc00dd0 merge develop & resolve conflict 2019-03-29 10:11:28 -04:00
jasper
e6f9b1517b Fix: Change condition 2019-03-28 18:43:03 -07:00
Shpuld Shpludson
25370083b6 Merge branch '255-emoji-input' into 'develop' 
#255 - add emoji input component

Closes #255

See merge request pleroma/pleroma-fe!706
 2019-03-28 21:09:48 +00:00
shpuld
c06bcf3303 add gesture to close notifications drawer 2019-03-28 22:54:45 +02:00
shpuld
31010779f6 Merge branch 'develop' into feature/mobile-improvements-3 2019-03-28 22:25:40 +02:00