1327 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Eugen Rochko	3bddd647e0	Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown	2017-01-09 14:10:32 +01:00
Eugen Rochko	75f80bef10	Persist UI settings, add missing localizations for German	2017-01-09 14:00:55 +01:00
Eugen Rochko	23ebf60b95	Improve initialState loading	2017-01-09 12:37:53 +01:00
blackle	131bae89fd	Generate key for each input so we can upload the same file even after deleting	2017-01-08 21:00:13 -05:00
blackle	d64c454cfe	Switch to compose view when tapping 'mention' in dropdown on mobile	2017-01-08 17:12:00 -05:00
Eugen Rochko	2e71bb031b	Fix Paperclip timeout setting. Fix bug introduced in #437	2017-01-08 19:12:54 +01:00
Eugen	38bc85e695	Merge pull request #443 from blackle/master ... Add call-to developers on getting started page	2017-01-08 13:36:02 +01:00
Eugen	a8e30060ae	Merge pull request #446 from blackle/dropdown2 ... Expand dropdown leftways on status view	2017-01-08 13:34:27 +01:00
blackle	05e964688d	Expand dropdown leftways on status view	2017-01-08 06:32:37 -05:00
blackle	b4f09bae1d	Add call-to developers on getting started page	2017-01-08 00:23:22 -05:00
Eugen	69643338f6	Merge pull request #437 from krainboltgreene/patch-1 ... Simplifying followers mappings	2017-01-08 04:14:54 +01:00
Eugen	e8d6f6c8c1	Merge pull request #436 from krainboltgreene/patch-2 ... Less complicated determination of subscription	2017-01-08 04:00:22 +01:00
Eugen	db8a088502	Update badges	2017-01-08 03:47:33 +01:00
Kurtis Rainbolt-Greene	abe3ae1cc2	Simplifying followers mappings ... Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.	2017-01-07 18:09:00 -08:00
Kurtis Rainbolt-Greene	4a7e3e5082	Less complicated determination	2017-01-07 17:59:51 -08:00
Eugen	6d097d559b	Merge pull request #434 from vjackson725/fix_vagrantfile ... Fix Vagrantfile to include yarn	2017-01-08 02:58:43 +01:00
Eugen	4447c4c7c8	Merge pull request #435 from krainboltgreene/patch-1 ... Using "rails style" order arguments	2017-01-08 02:58:19 +01:00
Kurtis Rainbolt-Greene	e5d9009d71	Using "rails style" order arguments	2017-01-07 17:55:40 -08:00
vjackson725	db3d5d811c	Fix Vagrantfile to include yarn ... The current Vagrantfile fails to build upon provisioning, as it lacks yarn. Change the Vagrantfile to add the yarn repository, and install yarn.	2017-01-08 12:38:04 +11:00
Eugen	7a0a13ab53	Merge pull request #432 from blackle/volume-icon ... Show correct volume icons on video player	2017-01-08 02:36:12 +01:00
blackle	8a571158c9	Show correct volume icons on video player	2017-01-07 20:23:15 -05:00
Eugen	cec7e69827	Merge pull request #430 from blackle/logout_mobile ... Show logout button on getting started so it's available on mobile	2017-01-08 01:24:06 +01:00
blackle	e1ca354956	Show logout button on getting started so it's available on mobile	2017-01-07 18:41:57 -05:00
Eugen	679aa35e15	Merge pull request #429 from blackle/emojify_usernames ... Emojify display names in notifcations	2017-01-08 00:19:24 +01:00
blackle	57ff221c0f	Emojify display names in notifcations	2017-01-07 18:16:14 -05:00
Eugen	165df323ae	Merge pull request #428 from blackle/contrast ... Improve contrast of bio and username text in account info	2017-01-07 22:51:15 +01:00
blackle	61211b509c	Improve contrast of bio and username text in account info	2017-01-07 16:39:30 -05:00
Eugen	2fbb38e4b2	Merge pull request #425 from ineffyble/vagrant ... Add Vagrant support for easy development environments	2017-01-07 18:31:59 +01:00
Eugen Rochko	be6ae3546f	Replace getting started icon on desktop nav bar with asterisk instead of hamburger	2017-01-07 15:46:39 +01:00
Eugen Rochko	5c7add2176	Fix #147 - Unreblogging will leave original status in feeds	2017-01-07 15:44:22 +01:00
Eugen Rochko	7ddec6e7c3	Add read timeout to paperclip when it's downloading remote images	2017-01-07 15:43:56 +01:00
Effy Elden	11ea7336e9	Tweak Vagrant info in README	2017-01-08 01:30:48 +11:00
Effy Elden	46fb634c79	Improve Vagrantfile, load environment variables from .env.vagrant, always forward localhost:3000	2017-01-08 01:28:49 +11:00
Effy Elden	f1289ca3c0	Add Vagrant development environment support	2017-01-07 23:22:24 +11:00
Eugen Rochko	989c3f4002	Add tab bar alternative to desktop UI, upgrade react & react-redux	2017-01-06 22:09:55 +01:00
Eugen Rochko	1bfbce7b45	Clean up h-card mess of divs	2017-01-06 20:24:51 +01:00
Eugen Rochko	72c3a41bef	Fix h-card classes and remote follow button appearing when it shouldn't	2017-01-06 20:15:24 +01:00
Eugen Rochko	8b28b82141	Merge branch 'myfreeweb-master'	2017-01-06 20:09:34 +01:00
Greg V	18deeb9db5	Add Microformats2 markup ... h-feed, h-card and h-entry	2017-01-06 18:10:10 +03:00
Eugen	92bd5f62f6	Merge pull request #417 from ineffyble/twitter-card-metadata ... Twitter Cards support	2017-01-06 01:16:45 +01:00
Eugen	6917099a6a	Merge pull request #418 from ticky/upgrade-emojione ... Upgrade EmojiOne to 2.2.7	2017-01-06 01:13:34 +01:00
Eugen Rochko	7b9f8766e8	Fix #416 - Generate random unique 14-byte (19 characters) shortcodes ... for local attachments, use them in URLs. Check status privacy before redirecting to actual file.	2017-01-06 00:29:12 +01:00
Jessica Stokes	28a2f79dff	Upgrade EmojiOne to 2.2.7 ... Adds support for, among other things, 🏳️‍🌈	2017-01-05 15:16:13 -08:00
Effy Elden	819bfb75c6	Add twitter:card metatag to enable Twitter Cards support	2017-01-06 09:47:40 +11:00
Eugen	9f21eb6064	Merge pull request #415 from ineffyble/master ... Prevent duplicate desktop notifications	2017-01-05 23:15:01 +01:00
Effy Elden	10a9ebae3b	Add tag property to desktop notifications, preventing duplicates (i.e. when multiple Mastodon tabs are open)	2017-01-06 08:26:45 +11:00
Eugen Rochko	00b9ba64c9	Fixed unexpected error	2017-01-05 14:23:59 +01:00
Eugen Rochko	a1de2e332d	Fix compose form bug	2017-01-05 14:18:38 +01:00
Eugen Rochko	ca7dce4a5a	Fix selection resetting in compose form after unrelated data updates	2017-01-05 14:11:18 +01:00
Eugen Rochko	10e6288444	Revert to Roboto for all	2017-01-05 13:59:58 +01:00