2274 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Roger Braun	f385e64a7c	Update vue-style-loader.	2017-02-21 15:23:46 +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
Roger Braun	7661357cf6	Merge branch 'develop' into feature/hash-routed	2017-02-21 11:48:55 +01:00
Roger Braun	abc9f06d93	Use runtime only build.	2017-02-21 11:48:08 +01:00
Roger Braun	b98cfbfade	Merge branch 'develop' into feature/hash-routed	2017-02-21 11:24:01 +01:00
Roger Braun	132d502194	Use correct vue import.	2017-02-21 11:23:03 +01:00
lambadalambda	842e15a314	Merge branch 'feature/mark_conversations_with_a_red_line' into 'develop' ... Feature/mark conversations with a red line See merge request !25	2017-02-21 04:23:13 -05: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
lambadalambda	549ee15472	Add changelog	2017-02-20 13:11:57 -05:00
Roger Braun	5d8b2eb8b5	Merge branch 'develop' into feature/hash-routed	2017-02-20 18:58:18 +01:00
Roger Braun	73afa8e075	Save notifications again.	2017-02-20 18:54:30 +01:00
Roger Braun	6e388c0126	Compress saved state with zlib.	2017-02-20 18:54:09 +01:00
Roger Braun	de986b81d5	Update package.json.	2017-02-20 18:42:10 +01:00
Roger Braun	ce6fb91501	Throttle saving data, once every 5 seconds is enough.	2017-02-20 18:38:18 +01:00
Roger Braun	ebf9fe6a98	Pull in persistence plugin, don't blow up on full storage.	2017-02-20 18:25:19 +01:00
Roger Braun	9763009d86	Merge branch 'feature/mutes' into develop	2017-02-20 18:06:01 +01:00
Roger Braun	8429de22e8	Remove notification persistence for now. ... Seems to blow things up.	2017-02-20 18:02:50 +01:00
Roger Braun	9c1093b6ca	Grab mutes from server on patched servers.	2017-02-20 18:01:45 +01:00
Roger Braun	3fd0d0d1cb	Revert "Remove state persistence for now." ... This reverts commit 9cf438f1b2.	2017-02-20 17:49:43 +01:00
lambadalambda	f40653a49d	Merge branch 'equal-padding' into 'develop' ... set top and bottom padding on the bars to be equal because it was too top-heavy See merge request !24	2017-02-20 10:37:47 -05: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
lambadalambda	5a9f71c1ef	Merge branch 'feature/mobile_timeline_fills_full_width' into 'develop' ... Make timeline use full width on mobile See merge request !23	2017-02-20 05:59:38 -05:00
shpuld	7e094a9880	Remove padding from timeline container and panel margins when in mobile mode	2017-02-20 12:46:20 +02:00
lambadalambda	a97f6a64ad	Update README.md	2017-02-19 16:15:42 -05:00
Roger Braun	fcb950fb43	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop	2017-02-19 16:50:35 +01:00
Roger Braun	96b10a6e4c	Update vue.	2017-02-19 16:50:04 +01:00
lambadalambda	5d08c0d3c9	Update COFE_OF_CONDUCT.md	2017-02-19 10:08:57 -05:00
lambadalambda	a326cb6a74	Add cofe of conduct.	2017-02-19 09:55:23 -05:00
Roger Braun	9cf438f1b2	Remove state persistence for now. ... Makes chrome really slow and adds problems with tab synchronization.	2017-02-19 14:25:31 +01: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	8fb0ec985a	Fix button hover in Firefox.	2017-02-19 12:27:59 +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
lambadalambda	d45774b485	Merge branch 'feature/ctrl-enter_posts_status' into 'develop' ... Ctrl-enter posts status See merge request !21	2017-02-19 05:43:39 -05: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	6dbdd322aa	Merge branch 'feature/top_bar_scrolls_to_top' into 'develop' ... Feature/top bar scrolls to top See merge request !19	2017-02-18 16:00:06 -05:00
shpuld	7b6719b96d	@click on top nav makes window scroll to top	2017-02-18 22:55:16 +02:00
Roger Braun	b5d7a179c4	Reverse title and notification count.	2017-02-18 21:43:26 +01:00
shpuld	e6f91badfb	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop	2017-02-18 22:37:48 +02:00
Roger Braun	f7a38eb021	Don't cache node-modules.	2017-02-18 21:26:17 +01: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