Commit Graph

635 Commits

Author SHA1 Message Date
Roger Braun 9c68acaa48 Add updateAvatar back in. 2017-08-21 17:05:12 +02:00
Roger Braun 43320cff9d Merge branch 'develop' into feature/pleroma-be 2017-08-21 17:02:50 +02:00
lambadalambda cbe652f2d9 Merge branch 'fix/use-full-res-avatar-in-usercard' into 'develop'
Use _original profile pic instead of the 48x48 thumbnail in the user card content.

See merge request !100
2017-08-21 10:29:32 -04:00
Shpuld Shpuldson b5e5a8d1e3 Use _original profile pic instead of the 48x48 thumbnail in the user card content. 2017-08-21 16:45:45 +03:00
lambadalambda 6e800d9912 Merge branch 'fix/lock-submit-until-post-returns' into 'develop'
fix/lock-submit-until-post-returns

See merge request !99
2017-08-21 08:57:50 -04:00
Shpuld Shpuldson d3169b057c Visual indicator for when posting is happening, as well as disabling the button to prevent double-posts. 2017-08-21 15:35:14 +03:00
lambadalambda 3ab9b477f8 Merge branch 'fix/avatar-clickable-areas' into 'develop'
Adjust the clickable areas around avatars

See merge request !98
2017-08-20 12:13:22 -04:00
Shpuld Shpuldson 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 2017-08-20 16:53:48 +03:00
lambadalambda 47ab2b51cf Merge branch 'feature/post-status-errors' into 'develop'
Add error message in post status form when failing to post

Closes #24

See merge request !97
2017-08-20 08:14:27 -04:00
Shpuld Shpuldson 42fb65e274 Add error message in post status form when failing to post and don't get rid of post/attachments when failing. 2017-08-20 13:16:41 +03:00
lambadalambda fb3408d64f Merge branch 'feature/profile-editing' into 'develop'
Feature/profile editing

See merge request !95
2017-08-19 03:32:44 -04:00
lambadalambda 0c4f076765 Merge branch 'fix/pleromabe-favs-generate-notifs' into 'develop'
Pleroma BE favs generate notifs on GS

See merge request !96
2017-08-18 06:10:53 -04:00
Shpuld Shpuldson 1136db24cc Fix issue with trying to match() on undefined 2017-08-18 12:38:47 +03:00
Shpuld Shpuldson 052befa581 fix the very annoying thing where favs from pleromabe would not generate notifs when on GS 2017-08-18 12:26:07 +03:00
Shpuld Shpuldson 9503b8fa41 Remove the profile pic change from the old settings menu since it's in the new profile edit menu. 2017-08-18 12:00:59 +03:00
Shpuld Shpuldson 1526b4560c Clean up to have much less redundant code. 2017-08-18 11:51:17 +03:00
lambadalambda 0ece2f04fd Merge branch 'fix/user-finder-updates-user-timeline' into 'develop'
Force user profile timeline update when the user id changes

Closes #23

See merge request !94
2017-08-16 09:51:32 -04:00
Shpuld Shpuldson 2084c92dff Force user profile timeline update when the user id changes (like when another user has been searched/found). 2017-08-16 16:40:09 +03:00
Shpuld Shpuldson 6d7d173e4d Make linter happy. 2017-08-16 00:46:55 +03:00
Shpuld Shpuldson c4920f2d86 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/profile-editing 2017-08-16 00:15:00 +03:00
lambadalambda dbad99cb4f Merge branch 'feature/follow-notifications' into 'develop'
Add follow notifications.

See merge request !92
2017-08-10 12:34:02 -04:00
lambadalambda 3c2073bc8e Merge branch 'fix/user-card-visual-buggery' into 'develop'
User card content visual bugfixes

See merge request !91
2017-08-10 12:29:05 -04:00
eal 701112f043 Add follow notifications. 2017-08-10 19:17:40 +03:00
Shpuld Shpuldson 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. 2017-08-02 22:09:40 +03:00
Roger Braun b1d9cbaebd Add fetch polyfill. 2017-07-31 16:35:07 +02:00
Roger Braun d3d58c25e7 Merge branch 'develop' into feature/pleroma-be 2017-07-29 19:10:40 +02:00
Roger Braun 9c5f001fd2 Add back relative numbering. 2017-07-29 19:10:09 +02:00
Roger Braun 5ce010cacf Merge branch 'develop' into feature/pleroma-be 2017-07-29 18:54:28 +02:00
Roger Braun 32e20b2e02 Only run through replies once. 2017-07-29 18:53:49 +02:00
Roger Braun 9e61ab577b Revert "Throttle getReplies so it isn't called that often."
This reverts commit 86773579ed.
2017-07-28 15:52:05 +02:00
Roger Braun 496bca9e7a Merge branch 'develop' into feature/pleroma-be 2017-07-28 11:21:09 +02:00
Roger Braun 86773579ed Throttle getReplies so it isn't called that often. 2017-07-28 11:20:54 +02:00
Roger Braun c7e477ebb6 Throttle getReplies so it isn't called that often. 2017-07-28 11:19:56 +02:00
Roger Braun da3b604d9d Fix too long words in profile. 2017-07-27 15:54:34 +02:00
Roger Braun 22469d80e7 Add MRN updating api. 2017-07-02 15:30:24 +02:00
Roger Braun f74ca19d14 Try logging in with the existing cookie. 2017-07-02 13:07:35 +02:00
Roger Braun fd4468a57f Merge branch 'develop' into feature/pleroma-be 2017-07-02 12:44:55 +02:00
Roger Braun 7d59051fc5 Add logout button. 2017-07-02 12:25:34 +02:00
Roger Braun e874e2dc7d Merge remote-tracking branch 'origin/develop' into feature/pleroma-be 2017-06-24 19:59:05 +02:00
Shpuld Shpuldson f81d1b0eea Fix long names overflowing and messing everything (now just overflowing parts not drawn), fix non-square avatars not drawn as squares. 2017-06-23 17:43:34 +03:00
Shpuld Shpuldson b284689313 Hotfix for JS error in auto completion in firefox. 2017-06-23 16:49:11 +03:00
lambadalambda 937705ccb0 Merge branch 'feature/registration' into 'develop'
Add a registration form.

See merge request !76
2017-06-21 12:22:28 -04:00
lambadalambda e113d0a250 Merge branch 'feature/slicker-buttons' into 'develop'
Feature/slicker buttons

See merge request !90
2017-06-21 12:14:23 -04:00
Shpuld Shpuldson 2d5fd21558 Make mobile panel switcher buttons obey the colors of the current style. 2017-06-21 17:43:59 +03:00
Shpuld Shpuldson c1f1599f2f Another minor consistency fix. 2017-06-21 17:32:41 +03:00
Shpuld Shpuldson 97bb03a00c Fix consistency in font families between chromium and ff 2017-06-21 17:19:56 +03:00
Shpuld Shpuldson bf84a87821 Make buttons stand out with some shading. 2017-06-21 17:15:45 +03:00
Shpuld Shpuldson 1a5ee95ee4 Add a config.json option for enabling registration, don't link and redirect away from register page when it's disabled. 2017-06-20 10:37:51 +03:00
Shpuld Shpuldson bfbc94d697 Move customizable terms-of-service into its separate .html file. 2017-06-19 16:35:35 +03:00
Shpuld Shpuldson 95605c32f1 Automatic square cropping for avatar upload, preview of the new avatar. 2017-06-19 12:26:33 +03:00