moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,112 Commits 70 Branches 19 Tags 22 MiB
Commit Graph

3112 Commits

Author SHA1 Message Date
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 6c7cf7d9b5 some initial documentation about configuration 2019-03-31 15:32:11 +03: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
Shpuld Shpludson c829b1a5f4 Merge branch 'feat/gesture-service' into 'develop' 
Add a gesture service for easier touch gestures

See merge request pleroma/pleroma-fe!714
 2019-03-28 20:20:16 +00:00
shpuld 1e2c304f76 fix typo 2019-03-28 22:11:05 +02:00
Shpuld Shpludson ee9aa40001 Merge branch 'issues/#466' into 'develop' 
show replies count right after reply icon

Closes #466

See merge request pleroma/pleroma-fe!716
 2019-03-28 20:09:59 +00:00
Shpuld Shpludson 7e8c2acc98 Merge branch 'issue-433-status-reply-form' into 'develop' 
Issue 433 status reply form

Closes #433

See merge request pleroma/pleroma-fe!674
 2019-03-28 20:08:40 +00:00
Brenden Bice 8e4ddcb843 update store according to retweeted status 2019-03-28 13:20:09 -04:00
dave a39fc49e84 #433 - update sort by for conversation 2019-03-28 10:02:33 -04:00
dave e24145e233 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form 2019-03-28 09:54:55 -04:00
Brenden Bice 6b5a84e2b3 display replies_count right after reply icon 2019-03-28 03:47:00 -04:00
Brenden Bice 95639fbd63 expose replies_count from mastodon api 2019-03-28 03:46:41 -04:00
HJ e2e3a65c44 Merge branch 'fix/convos-masto' into 'develop' 
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...

Closes #460

See merge request pleroma/pleroma-fe!715
 2019-03-27 20:55:24 +00:00
Henry Jameson 31a71ee3ee Apparently, MastoAPI gives status in ancestors if you try opening a repeat... 2019-03-27 22:50:19 +02:00
HJ 86696167b7 Merge branch 'issue-457-mastodon-tag-timeline' into 'develop' 
#457 - update tag timeline endpoint to MastoAPI

Closes #457

See merge request pleroma/pleroma-fe!707
 2019-03-27 20:44:58 +00:00
shpuld 0eff4bd0ac make side drawer use gesture service and fix its animations 2019-03-27 22:44:25 +02:00
dave 30084a1204 merge develop and resolve conflict 2019-03-27 16:41:05 -04:00
HJ aed0943678 Merge branch 'mastoapi/actions' into 'develop' 
transition to MastoAPI: Basic user/statuses manipulation

See merge request pleroma/pleroma-fe!669
 2019-03-27 20:28:55 +00:00
Henry Jameson 66ab131bd4 Merge remote-tracking branch 'upstream/develop' into mastoapi/actions 
* upstream/develop:
  errata
  review
  Revert "Merge branch 'revert-987b5162' into 'develop'"
  Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
  Add await to login action'
  correctly paginate on MastoAPI
  #442 - update placeholder linebreak
  #442 - clean up Bio placeholder text
  wip support for follower/following, a bit broken and with regression
  switch direct messages to mastoapi
  switch public and TWKN to MastoAPI
  undo this change since BE returns empty object for relationship, add in a separate MR
  updates normalizer for proper user handling and adds support for friends tl via mastoapi
 2019-03-27 22:24:38 +02:00
HJ 4d66b9cf45 Merge branch 'mastoapi/followers' into 'develop' 
MastoAPI support for followers/friends(following)

See merge request pleroma/pleroma-fe!667
 2019-03-27 20:18:44 +00:00
Henry Jameson c2c7e12aad review/remove error hiding 2019-03-27 22:18:43 +02:00
Henry Jameson a5e71d1dd1 Merge remote-tracking branch 'upstream/develop' into mastoapi/followers 
* upstream/develop:
  Revert "Merge branch 'revert-987b5162' into 'develop'"
  Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
  Add await to login action'
  switch direct messages to mastoapi
  switch public and TWKN to MastoAPI
 2019-03-27 22:14:26 +02:00
Henry Jameson ff18e339cf Merge remote-tracking branch 'upstream/develop' into mastoapi/followers 
* upstream/develop:
  #442 - update placeholder linebreak
  #442 - clean up Bio placeholder text
  undo this change since BE returns empty object for relationship, add in a separate MR
  updates normalizer for proper user handling and adds support for friends tl via mastoapi
 2019-03-27 22:12:51 +02:00
Henry Jameson 0a031aae20 errata 2019-03-27 22:04:59 +02:00
Henry Jameson fb2aca06de review 2019-03-27 22:02:46 +02:00
dave 43e97e590c #433 - sort conversation for retweets and clean up 2019-03-27 16:00:54 -04:00
HJ f6e779a084 Merge branch 'masto-api/direct' into 'develop' 
switch direct messages to mastoapi

See merge request pleroma/pleroma-fe!649
 2019-03-27 19:53:56 +00:00
HJ ea50f55148 Merge branch 'develop' into 'masto-api/direct' 
# Conflicts:
#   src/services/api/api.service.js
 2019-03-27 19:48:41 +00:00
HJ 3870adf51f Merge branch 'mastoapi/friends-tl' into 'develop' 
Mastoapi/friends tl

See merge request pleroma/pleroma-fe!711
 2019-03-27 19:40:51 +00:00
Exilat e1e0b8b254 Update oc.json for !611 and !691 2019-03-27 18:46:40 +00:00
dave 0e2931e7de Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form 2019-03-27 13:50:51 -04:00
Shpuld Shpludson 85e9e52090 Merge branch 'fix/add-await-to-login-request' into 'develop' 
!701 Add await to login action in after_store

See merge request pleroma/pleroma-fe!709
 2019-03-27 16:22:31 +00:00
jared 37b33fc615 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into 255-emoji-input 2019-03-27 11:13:06 -04:00