Commit graph

Select branches

Hide pull requests

718

add-comptability-redirects

chore/mfa-improvements

ci-fixes

deploy-ci

develop

emoji-mastoapi

experiment-still-emoji

experimental-3-column

feat/favicon-badge

feat/lists

feat/report-notification

feat/user-popovers

feat/video-poster

feat/virtual-scrolling-timeline

feat/virtual-with-popover

feature/desktop-about-page

feature/groups

feature/image-description-authoring

feature/improve-status-header-and-spacing

feature/mobile-improvements-2

feature/nav-iconography

feature/polls-attempt-2

feature/sensitive-blur

fix-chrome69-dungeon-master

fix/aggregate-notification-settings

fix/login-local

fix/make-inline-video-playing-instance-configurable-default-true

fix/move-and-reaction-types-fixes-changes

fix/pinned-statuses-not-showing-on-bottom-of-tl

fix/private-mode-error-handling

fix/tos-panel-rendering

fixV2toV1

layout-overhaul

localforage-experiments

master

mastoapi/is-local-post

mentions-clean

push-fixes

rc/2.0.5

rc/2.3.0

redux

renovate/major-font-awesome

renovate/phoenix-1.x

renovate/sass-1.x

renovate/sass-loader-7.x

renovate/semver-5.x

renovate/stylelint-13.x

renovate/vue-monorepo

renovate/vuelidate-core-2.x

renovate/webpack-hot-middleware-2.x

renovate/webpack-merge-0.x

skip-thread-containment

test-shm

testing-ci-fixes

threecolumn

vue3

vue3compat-tabswitcher

webpack5

0.9.9

0.9.99

0.9.999

2.0.2

2.0.3

2.0.5

2.1.0

2.1.1

2.1.2

2.2.0

2.2.1

2.2.2

2.2.3

2.3.0

2.4.0

2.4.2

Mono Color

• 71395ebca2 Add japanese translation. Roger Braun 2017-11-07 18:20:40 +01:00
• 2354255615 Merge branch 'feature/fi-language' into 'develop' lambda 2017-11-07 16:58:46 +00:00
• f89f120c44 Add fi to localization. Shpuld Shpludson 2017-11-07 16:55:08 +00:00
• ed18d44e19 update readme Roger Braun 2017-11-07 17:12:32 +01:00
• 8fb83502f0 Add translation to readme. Roger Braun 2017-11-07 15:42:34 +01:00
• 74b513122e Set locale from browser settings. Roger Braun 2017-11-07 15:23:00 +01:00
• 7516cd859f Prepare for i18n. Roger Braun 2017-11-07 15:14:37 +01:00
• 81b0849889 Merge branch 'fix/friendica-html' into 'develop' lambda 2017-11-07 10:33:02 +00:00
• acde0b316c Changes inside status html: restrict image/video sizes, make blockquotes waste less space. Shpuld Shpuldson 2017-11-07 12:22:33 +02:00
• e74e725750 Merge branch 'fix/authenticated-remote-profile-fetching' into 'develop' lambda 2017-11-06 22:37:00 +00:00
• 784eb8426c Send credentials when fetching remote profile. eal 2017-11-07 00:20:51 +02:00
• 9fedcab988 Merge branch 'fix/update-readme-new-repo' into 'develop' lambda 2017-11-06 13:27:25 +00:00
• 9eaf7087a3 Update dual boot link in README.md for new repo Shpuld Shpludson 2017-11-02 15:26:28 +00:00
• fb8b625d9a Merge branch 'fix/stop-inappropriate-scroll-auto-fetch' into 'develop' lambda 2017-11-02 14:59:31 +00:00
• 302c46741d Merge branch 'fix/disable-select-on-icons' into 'develop' lambda 2017-11-02 14:49:23 +00:00
• bfb1b3f10b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/stop-inappropriate-scroll-auto-fetch Shpuld Shpuldson 2017-11-02 16:48:01 +02:00
• 4cba955fca Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/disable-select-on-icons Shpuld Shpuldson 2017-11-02 16:41:15 +02:00
• f897c656fc Also disable select on buttons Shpuld Shpuldson 2017-11-02 16:27:34 +02:00
• 10bc83018c Deregister scroll listener properly, only fetch more if timeline is visible. Shpuld Shpuldson 2017-11-02 16:26:17 +02:00
• 6e611f4039 Update .gitlab-ci.yml lambda 2017-11-02 14:20:00 +00:00
• 226f435a17 Add user-select: none to i elements. Shpuld Shpuldson 2017-11-02 11:27:52 +02:00
• 63473964f8 Merge branch 'feature/emoji-completion' into 'develop' lambadalambda 2017-10-25 10:00:28 -04:00
• ba9b04a8ba Use the API endpoint for emoji completion. eal 2017-10-19 23:39:21 +03:00
• 447ec91176 Actually actually fix image url. eal 2017-09-19 22:58:15 +03:00
• f4b1319eff Actually fix image url. eal 2017-09-19 22:54:54 +03:00
• 70d66c48ad Fix image url. eal 2017-09-19 22:50:08 +03:00
• 2162ef20b0 Add emoji completion. eal 2017-09-19 22:43:20 +03:00
• 91991e2ac1 Merge branch 'feature/tag-timelines' into 'develop' lambadalambda 2017-09-17 07:58:05 -04:00
• c96a7b582b Remove another cache file. eal 2017-09-17 14:42:04 +03:00
• 59f07c0704 Remove cache file. eal 2017-09-17 14:37:48 +03:00
• 9abfcb34ef Add tag timeline view. eal 2017-09-17 14:26:35 +03:00
• 3eaaa4c16d Merge branch 'fix/set-cookie' into 'develop' lambadalambda 2017-09-13 04:47:23 -04:00
• 7abcb13ec0 Merge branch 'feature/login-with-cookie' into 'develop' lambadalambda 2017-09-13 04:47:03 -04:00
• c6b909570a Merge branch 'fix/upload-buttons-clickable' into 'develop' lambadalambda 2017-09-13 04:46:24 -04:00
• e7691bff82 Merge branch 'fix/responsive-user-search' into 'develop' lambadalambda 2017-09-13 04:46:06 -04:00
• 5e6ffc0e45 Make user finder more pleasant. eal 2017-09-10 20:46:42 +03:00
• 8a51bc6e22 Fix hide and cancel buttons on chromium eal 2017-09-10 13:33:02 +03:00
• 9c7eb1de3c Merge branch 'feature/follow-notif-tests' into 'develop' lambadalambda 2017-09-04 02:51:06 -04:00
• 00f8857876 Merge branch 'fix/timeago-months' into 'develop' lambadalambda 2017-09-03 19:00:42 -04:00
• b35acf4628 Merge branch 'fix/usercard-css' into 'develop' Shpuld Shpuldson 2017-09-03 01:20:46 -04:00
• 298bf5cfca Revert "Include cookie in every request" eal 2017-09-02 21:12:42 +03:00
• 8b4f59e1f7 Try logging in with the existing cookie. Roger Braun 2017-07-02 13:07:35 +02:00
• 00589a9af1 Include cookie in every request eal 2017-09-02 19:29:45 +03:00
• 2b0811dddc Make sure options exists every time on fetch() eal 2017-09-02 19:29:16 +03:00
• 522110c0bc Set cookies on fetch eal 2017-08-31 11:23:17 +03:00
• 43f416297f Change better specifier for months. eal 2017-08-29 23:15:20 +03:00
• 587cd7bcfa Fix 'Statuses' being different color eal 2017-08-27 13:10:25 +03:00
• ad6d0a1f0c Move the cog to avatar height eal 2017-08-25 14:59:55 +03:00
• 04a3a44195 Add tests for follow notifications. eal 2017-08-25 14:01:18 +03:00
• 87b18da811 Merge branch 'fix/pleromabe-follow-notifs' into 'develop' Shpuld Shpuldson 2017-08-25 03:19:01 -04:00
• 5bd6abc134 Add regex for follows from pleromabe eal 2017-08-24 21:53:31 +03:00
• 205024ba9d Merge branch 'feature/post-status-clear-error-message' into 'develop' Shpuld Shpuldson 2017-08-24 09:34:09 -04:00
• 7061675e96 whoops lint Shpuld Shpuldson 2017-08-24 16:25:26 +03:00
• c6798864d4 Add an X icon to clear error message from post status form, hack to allow posting empty statuses if they have attachments Shpuld Shpuldson 2017-08-24 16:16:06 +03:00
• 8778270381 Merge branch 'fix/style-fixes-user-profile' into 'develop' Shpuld Shpuldson 2017-08-23 13:41:24 -04:00
• bf61592b56 Round the edge of the user profile user card, make sure 'follows you' stays in the right, fix avatar class conflict. Shpuld Shpuldson 2017-08-23 20:33:20 +03:00
• 2bc261afba Merge branch 'feature/follow-lists' into 'develop' Shpuld Shpuldson 2017-08-23 12:40:39 -04:00
• e1ec01dc3e Appease linter. eal 2017-08-23 19:21:15 +03:00
• ccfc2e57d0 Add follower and following views eal 2017-08-21 20:25:01 +03:00
• 5a1ad84092 Merge branch 'fix/check-if-follow-notif-matches-self' into 'develop' lambadalambda 2017-08-22 06:18:41 -04:00
• e5d0965ff1 Merge branch 'fix/user-card-changes-and-fixes' into 'develop' lambadalambda 2017-08-22 06:13:10 -04:00
• 9ec4412894 Merge branch 'fix/double-post-with-ctrl-enter' into 'develop' Shpuld Shpuldson 2017-08-22 05:41:05 -04:00
• 6ad5052044 Make pic bigger and remove border and add shadow, make screen name white again, make cog appear only in sidepanel. Shpuld Shpuldson 2017-08-22 12:38:12 +03:00
• 2ef915c9f1 Don't allow posting again while previous hasn't returned Shpuld Shpuldson 2017-08-22 11:43:03 +03:00
• 863ea98acd Merge branch 'fix/profile-link-in-usercard' into 'develop' Shpuld Shpuldson 2017-08-22 04:35:44 -04:00
• 3d9d59915b Add regex to check if you're the one being followed before adding notification. Shpuld Shpuldson 2017-08-21 23:31:38 +03:00
• 4291263cec Add link to profile on usercard avatar and @handle eal 2017-08-21 23:14:05 +03:00
• cbe652f2d9 Merge branch 'fix/use-full-res-avatar-in-usercard' into 'develop' lambadalambda 2017-08-21 10:29:32 -04:00
• b5e5a8d1e3 Use _original profile pic instead of the 48x48 thumbnail in the user card content. Shpuld Shpuldson 2017-08-21 16:45:45 +03:00
• 6e800d9912 Merge branch 'fix/lock-submit-until-post-returns' into 'develop' lambadalambda 2017-08-21 08:57:50 -04:00
• d3169b057c Visual indicator for when posting is happening, as well as disabling the button to prevent double-posts. Shpuld Shpuldson 2017-08-21 15:35:14 +03:00
• 3ab9b477f8 Merge branch 'fix/avatar-clickable-areas' into 'develop' lambadalambda 2017-08-20 12:13:22 -04:00
• dbf2f1621e Adjust the clickable area of notif avatar to not contain everything below it, adjust the status avatar to not have ghost border on top/right Shpuld Shpuldson 2017-08-20 16:53:48 +03:00
• 47ab2b51cf Merge branch 'feature/post-status-errors' into 'develop' lambadalambda 2017-08-20 08:14:27 -04:00
• 42fb65e274 Add error message in post status form when failing to post and don't get rid of post/attachments when failing. Shpuld Shpuldson 2017-08-20 13:16:41 +03:00
• fb3408d64f Merge branch 'feature/profile-editing' into 'develop' lambadalambda 2017-08-19 03:32:44 -04:00
• 0c4f076765 Merge branch 'fix/pleromabe-favs-generate-notifs' into 'develop' lambadalambda 2017-08-18 06:10:53 -04:00
• 1136db24cc Fix issue with trying to match() on undefined Shpuld Shpuldson 2017-08-18 12:38:47 +03:00
• 052befa581 fix the very annoying thing where favs from pleromabe would not generate notifs when on GS Shpuld Shpuldson 2017-08-18 12:26:07 +03:00
• 9503b8fa41 Remove the profile pic change from the old settings menu since it's in the new profile edit menu. Shpuld Shpuldson 2017-08-18 12:00:59 +03:00
• 1526b4560c Clean up to have much less redundant code. Shpuld Shpuldson 2017-08-18 11:51:17 +03:00
• 0ece2f04fd Merge branch 'fix/user-finder-updates-user-timeline' into 'develop' lambadalambda 2017-08-16 09:51:32 -04:00
• 2084c92dff Force user profile timeline update when the user id changes (like when another user has been searched/found). Shpuld Shpuldson 2017-08-16 16:40:09 +03:00
• 6d7d173e4d Make linter happy. Shpuld Shpuldson 2017-08-16 00:46:55 +03:00
• c4920f2d86 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/profile-editing Shpuld Shpuldson 2017-08-16 00:15:00 +03:00
• dbad99cb4f Merge branch 'feature/follow-notifications' into 'develop' lambadalambda 2017-08-10 12:34:02 -04:00
• 3c2073bc8e Merge branch 'fix/user-card-visual-buggery' into 'develop' lambadalambda 2017-08-10 12:29:05 -04:00
• 701112f043 Add follow notifications. eal 2017-08-10 19:17:40 +03:00
• acf3fd5d91 Add new user-settings component/route, add options to change name, bio, avatar, banner and bg. Add those options to api service and backend interactor service. Shpuld Shpuldson 2017-08-02 22:09:40 +03:00
• b1d9cbaebd Add fetch polyfill. Roger Braun 2017-07-31 16:35:07 +02:00
• 9c5f001fd2 Add back relative numbering. Roger Braun 2017-07-29 19:10:09 +02:00
• 32e20b2e02 Only run through replies once. Roger Braun 2017-07-29 18:53:49 +02:00
• 9e61ab577b Revert "Throttle getReplies so it isn't called that often." Roger Braun 2017-07-28 15:52:05 +02:00
• 86773579ed Throttle getReplies so it isn't called that often. Roger Braun 2017-07-28 11:19:56 +02:00
• da3b604d9d Fix too long words in profile. Roger Braun 2017-07-27 15:54:34 +02:00
• 7d59051fc5 Add logout button. Roger Braun 2017-07-02 12:25:34 +02:00
• f81d1b0eea Fix long names overflowing and messing everything (now just overflowing parts not drawn), fix non-square avatars not drawn as squares. Shpuld Shpuldson 2017-06-23 17:43:34 +03:00
• b284689313 Hotfix for JS error in auto completion in firefox. Shpuld Shpuldson 2017-06-23 16:49:11 +03:00
• 937705ccb0 Merge branch 'feature/registration' into 'develop' lambadalambda 2017-06-21 12:22:28 -04:00
• e113d0a250 Merge branch 'feature/slicker-buttons' into 'develop' lambadalambda 2017-06-21 12:14:23 -04:00