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
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
jasper
90939f198b
Fix login handling
2019-04-01 12:32:13 -07:00
jasper
8fc10dc177
Add Promise.all to send requests when loading
2019-04-01 10:46:30 -07: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
shpuld
31010779f6
Merge branch 'develop' into feature/mobile-improvements-3
2019-03-28 22:25:40 +02:00
jasper
2d05aef24b
Add await to login action'
2019-03-26 14:26:26 -07:00
shpuld
fd12263cac
merge develop in
2019-03-23 22:21:57 +02:00
taehoon
9857002bf5
Add hideMutedPosts setting and wire up to post-returning endpoints
2019-03-21 16:33:02 -04:00
Shpuld Shpludson
57cd6f8018
Merge branch 'feature/version-info' into 'develop'
...
Added new tab to display versions of BE/FE
Closes #397
See merge request pleroma/pleroma-fe!671
2019-03-21 15:25:59 +00:00
lambda
92eb55c7bc
Merge branch 'bugfix/nodeinfo-post-formats' into 'develop'
...
after store: fix setting postFormats field
See merge request pleroma/pleroma-fe!683
2019-03-15 13:03:35 +00:00
William Pitcock
f93d4a3754
after store: fix setting postFormats field
2019-03-14 21:35:45 +00:00
Edijs
3c5c09c74f
Merge branch 'develop' into feature/version-info
2019-03-13 15:24:09 -07:00
lain
5318227c37
afterStoreSetup: Move log in and theme load to afterStoreSetup.
2019-03-13 13:29:34 +01:00
lain
48ac96cfc7
afterStoreSetup: Handle 404 cases.
2019-03-13 12:41:39 +01:00
lain
446785ddce
afterStoreSetup: Emoji and nodeinfo refactor.
2019-03-13 12:26:40 +01:00
lain
f535ccd925
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
2019-03-13 12:10:57 +01:00
lain
c030e62254
afterStoreSetup: refactor.
2019-03-13 11:57:30 +01:00
shpuld
7ce8fe9214
merge develop, add mobile nav component
2019-03-12 23:50:54 +02:00
Edijs
068c9724e4
Added new tab to display versions of BE/FE
2019-03-10 16:58:12 -07:00
slice
e618c6ffb0
Only connect to chat when authenticating in the first place
...
To avoid duplication of the connection, the chat socket is destroyed
upon logging out.
2019-03-10 11:25:36 -07:00
Edijs
f91e4a5801
Load post status content type from instance config
2019-03-04 21:29:56 -08:00
shpuld
c7e180080a
more work with notifications drawer
2019-03-03 16:33:40 +02:00
Henry Jameson
6184c88ac7
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:45:17 +02:00
Shpuld Shpludson
b6bac4d06d
Merge branch 'fix/profile-not-loading-without-persisted-state' into 'develop'
...
Fix #324 Profiles sometimes not loading when there's no persisted state
Closes #324
See merge request pleroma/pleroma-fe!553
2019-02-11 13:34:03 +00:00
shpuld
3fb531976a
Change the async stuff to not render app before theme is loaded
2019-02-09 11:26:35 +02:00
Shpuld Shpludson
531f150dd3
Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'
...
#254 Add option to hide filtered statuses
See merge request pleroma/pleroma-fe!539
2019-02-09 06:47:29 +00:00
jasper
92874b6902
Fxing conflicts
2019-02-08 13:13:11 -08:00
jasper
70c05a0c08
Fix showFeaturesPanel option as instance
2019-02-08 12:17:14 -08:00
Xiaofeng An
460976c6e5
#301 - add an option for default formatting
2019-02-06 14:26:46 -05:00
jasper
a57f8bdd68
Add option to hide filtered statuses
2019-02-06 10:18:13 -08:00
shpuld
41c4d59341
Connect only after-store instead of when user gets token
2019-01-29 17:16:25 +02:00
Henry Jameson
f38da239d9
"spring" cleaning
2019-01-24 21:03:13 +03:00
Henry Jameson
ac64e90898
fix custom nsfwCensorImage not working
2019-01-23 00:15:24 +03:00
lambda
1555a5fef3
Merge branch 'restore-routes' into 'develop'
...
Restore old routes, enable user route as fallback.
See merge request pleroma/pleroma-fe!440
2018-12-29 13:27:59 +00:00
Maxim Filippov
85c487b933
Make "noAttachmentLinks" configurable
2018-12-27 13:25:11 +03:00
Lambda
f35dbaf064
Treat reserved users like external users in the frontend.
2018-12-26 14:50:48 +01:00
Shpuld Shpludson
67c2a607aa
Feature/bigger icons for mobile / #211
2018-12-18 18:26:14 +00:00
Maxim Filippov
2211c533dd
Merge branch 'develop' into feature/new-user-routes
2018-12-17 02:39:37 +03:00
HJ
99b2b7a203
Merge branch 'feature/file-size-checking' into 'develop'
...
[pleroma#36] Add errors when file uploading fails
See merge request pleroma/pleroma-fe!405
2018-12-13 21:02:17 +00:00
Henry Jameson
f87001c22f
fix old MR
2018-12-13 20:25:46 +03:00
Shpuld Shpludson
dbe79a3c26
Merge branch 'dev-qol' into 'develop'
...
Several fixes to make life of contributors a tiny bit easier.
See merge request pleroma/pleroma-fe!409
2018-12-13 14:42:58 +00:00
Rinpatch
6de4dcc7c9
Resolve merge conflict
2018-12-13 17:22:19 +03:00
Henry Jameson
c54eb1ecad
fix
2018-12-11 19:01:08 +03:00
Henry Jameson
b839ba7870
Quality of Frontend Developer's Life: here to stay
2018-12-11 18:45:25 +03:00
Egor Kislitsyn
ee70ec4c7e
fix race condition
2018-12-10 22:36:25 +07:00
rinpatch
788383d8a1
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
2018-12-08 21:56:00 +01:00
Rinpatch
ba188eddab
[pleroma#36] Add upload errors
2018-12-08 18:23:21 +03:00
Maxim Filippov
79d864c3f2
Move routes to the separate file -> make it testable
2018-12-06 22:09:54 +03:00
Egor Kislitsyn
09147cacea
add service worker and push notifications
2018-12-06 20:34:00 +07:00
Henry Jameson
c241de4634
fix
2018-12-05 10:51:11 +03:00
Henry Jameson
e06717fd0d
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
...
* upstream/develop:
DM timeline: stream new statuses
update-japanese-translation
Add actual user search.
incorporate most translation changes from MR 368
update french translation
Always show dm panel.
Add direct message tab.
api service url
On logout switch to public timeline.
Put oauth text into description.
Display OAuth login on login form button.
Add login form back in.
Linting.
Re-activate registration, use oauth password flow to fetch token.
Fix typo.
Remove gonsole.logg :DD
Fix linting.
Move login to oauth.
2018-11-26 04:38:44 +03:00
Roger Braun
c34eebff6c
Add actual user search.
2018-11-14 20:31:06 +01:00
Roger Braun
b37a0f4f23
Add direct message tab.
2018-11-13 20:34:56 +01:00
Roger Braun
50264410f5
Add login form back in.
2018-11-07 16:56:12 +01:00
Roger Braun
b6cd4ff32a
Fix typo.
2018-11-06 21:47:11 +01:00
Roger Braun
fbe30b4922
Merge remote-tracking branch 'origin/develop' into oauth
2018-10-26 16:13:05 +02:00
Roger Braun
9af204b293
Move login to oauth.
2018-10-26 15:16:23 +02:00