Commit Graph

154 Commits

Author SHA1 Message Date
lambadalambda 935c0e09c6 Merge branch 'fix/dont_display_following_when_logged_out' into 'develop'
Hide Follow-button and 'Follows you' text when not logged in

Closes #14

See merge request !27
2017-02-22 05:11:18 -05:00
shpuld 874f976531 Hide Follow-button and 'Follows you' text when not logged in 2017-02-22 11:54:09 +02:00
Roger Braun 892b826df5 Small style adjustment, add meta-enter posting. 2017-02-21 21:48:48 +01:00
Roger Braun 34a593aa27 Merge branch 'develop' into feature/drag_and_drop_for_media_upload 2017-02-21 21:30:16 +01:00
Roger Braun 40fe40d96b Better attachment removal styling. 2017-02-21 15:24:35 +01:00
Roger Braun 137a7e643d Remove flex from general attachments. 2017-02-21 15:24:05 +01:00
shpuld ca71722c1e Files dropped into post_status_form text box get sent to media_upload for attachment upload, media_upload reorganized a bit to allow reuse of existing code. 2017-02-21 15:13:19 +02:00
shpuld 3d69a91aba cleanup/better naming 2017-02-21 10:22:04 +02:00
shpuld c244067787 Use a red border for expanded statuses 2017-02-21 10:19:42 +02:00
Roger Braun 9763009d86 Merge branch 'feature/mutes' into develop 2017-02-20 18:06:01 +01:00
Roger Braun 9c1093b6ca Grab mutes from server on patched servers. 2017-02-20 18:01:45 +01:00
hakui b29a094e38 set top and bottom padding on the bars to be equal because it was too top-heavy 2017-02-20 09:28:50 -06:00
Roger Braun 2933dc30a5 Only display 10 notifications at a time, 20 is too much. 2017-02-19 13:37:21 +01:00
Roger Braun 56e036b4de Add special case for mastodon user links.
They have a span embedded in the link, so let's look at the parent, too.
2017-02-19 13:25:30 +01:00
Roger Braun 04c4ad9a65 Open clicked links the statusnet_html in a new window. 2017-02-19 12:58:25 +01:00
Roger Braun 73f46bfba6 Merge branch 'clearnotifs' into develop 2017-02-19 12:28:36 +01:00
Roger Braun df3ffdd905 Follow style guide (https://github.com/feross/standard) 2017-02-19 12:19:47 +01:00
Roger Braun 5f74ae8de5 Revert "removed break-line for links because it didn't seem to make sense"
This reverts commit 2f4d811079.
2017-02-19 12:13:56 +01:00
shpuld 2639427236 Ctrl-enter posts status 2017-02-19 01:41:51 +02:00
hakui af91346328 changed to if-else to save on one line 2017-02-18 17:38:56 -06:00
hakui 14237cff77 clears notif number from title when marking as read 2017-02-18 17:33:00 -06:00
lambadalambda 6f98543b79 Merge branch 'link-wraparound-styling' into 'develop'
(practicing the new branch thing) url styling

See merge request !18
2017-02-18 15:03:30 -05:00
lambadalambda c2178819a0 Merge branch 'fix/prevent_follow_mute_button_deforming' into 'develop'
Fix follow/mute buttons from getting squished on mobile

See merge request !17
2017-02-18 15:02:31 -05:00
Roger Braun 963a0035e5 Make page title dynamic, better notification handling. 2017-02-18 20:44:41 +01:00
hakui 1ccc9dd629 wrap long urls while not breaking normal words. also practicing the new branch thing 2017-02-18 12:51:47 -06:00
shpuld 8a0197d682 Fix follow/mute buttons from getting squished on mobile 2017-02-18 19:58:16 +02:00
shpuld 15c82dea62 moved around classes in the user-info css 2017-02-18 15:49:27 +02:00
shpuld e86b1d71ee Changed following-info to user-interactions and moved muting there, made everything in user-interactions look a bit neater 2017-02-18 15:48:27 +02:00
hakui 2f4d811079 removed break-line for links because it didn't seem to make sense 2017-02-18 03:10:02 -06:00
hakui a4592445a3 making link thumbnails fit the whole box 2017-02-18 02:58:44 -06:00
hakui 0faaeb02f3 fixed line-height for text box 2017-02-18 01:54:54 -06:00
hakui 734597b43f hello world 2017-02-18 01:48:35 -06:00
Roger Braun cd0925747d Show current theme in theme selector. 2017-02-17 18:21:02 +01:00
Roger Braun cdc90f8edc One more fix. 2017-02-17 10:33:35 +01:00
Roger Braun 6c631016c6 One more small visual fix to oembeds. 2017-02-17 10:20:12 +01:00
Roger Braun eb7156de0d Fix oembed attachments. 2017-02-17 10:16:29 +01:00
Roger Braun 0be2051588 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-02-16 22:27:10 +01:00
Roger Braun 52dd7c009f Add Settings page. 2017-02-16 22:25:29 +01:00
Roger Braun 5481cf00a3 Make user profiles visible inline. 2017-02-16 15:58:49 +01:00
Roger Braun 832bd3cdd2 Fetch Public and TWKN timelines when viewed. 2017-02-16 11:17:47 +01:00
Roger Braun 1d64b76211 Add basic configuration module, make it work for title and theme. 2017-02-14 22:21:23 +01:00
Roger Braun 340b21475d Make temporarily unmuted posts hideable again. 2017-02-14 21:47:37 +01:00
Roger Braun 4c12de262f Add muting to statuses. 2017-02-14 00:01:50 +01:00
Roger Braun 66ef9f1328 Add users muting. 2017-02-13 23:22:32 +01:00
Roger Braun 038798f3f4 Prefer local image if available. 2017-02-05 23:37:24 +01:00
Roger Braun 2269e815e1 Make status expandable into conversation. 2017-02-04 13:53:28 +01:00
Roger Braun b420b5838c Use statusOrConversation component in timeline. 2017-02-04 13:53:16 +01:00
Roger Braun 800b051a16 Add statusOrConversation component. 2017-02-04 13:53:07 +01:00
Roger Braun 5ec4f1b047 Extract conversation and create conversation page. 2017-02-04 13:52:26 +01:00
Roger Braun ea25708bf3 Set color on status instead of on timeline. 2017-02-04 13:51:44 +01:00