7940 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Daniel Supernault	3cfae0a960	Update composer	2020-08-11 19:42:34 -06:00
daniel	90000f1350	Merge pull request #2375 from pixelfed/staging ... Staging	2020-08-11 19:18:06 -06:00
Daniel Supernault	a6e12fe2ed	Update compiled assets	2020-08-11 19:14:57 -06:00
Daniel Supernault	c238b82ed1	Update vue components	2020-08-11 19:11:12 -06:00
Daniel Supernault	68d3c40345	Update npm deps, add animate.css	2020-08-11 19:07:37 -06:00
Daniel Supernault	76756150e3	Update changelog	2020-08-11 00:26:11 -06:00
Daniel Supernault	d11fac0dfb	Update status embed, allow photo albums. Fixes #2374	2020-08-10 23:33:50 -06:00
Daniel Supernault	3b7ff030f2	Update RegisterController	2020-08-06 21:32:02 -06:00
daniel	e387bbd857	Merge pull request #2372 from pixelfed/staging ... Update Timeline.vue, move compose button	2020-08-05 22:45:03 -06:00
Daniel Supernault	5c0dee018e	Update compiled assets	2020-08-05 22:41:46 -06:00
Daniel Supernault	593dec6bf8	Update changelog	2020-08-05 22:41:21 -06:00
Daniel Supernault	9cad8f7736	Update Timeline.vue, move compose button	2020-08-05 22:40:20 -06:00
daniel	8d3356a830	Merge pull request #2368 from pixelfed/staging ... Update Hashtag.vue, add nsfw toggle. Fixes #2225	2020-08-05 01:53:27 -06:00
Daniel Supernault	cdc06aca4f	Update compiled assets	2020-08-05 01:52:28 -06:00
Daniel Supernault	7150bda37a	Update changelog	2020-08-05 01:51:39 -06:00
Daniel Supernault	e5aa506c5a	Update Hashtag.vue, add nsfw toggle. Fixes #2225	2020-08-05 01:50:34 -06:00
daniel	6f41cb79d5	Merge pull request #2367 from pixelfed/staging ... Update Profile.vue, add atom feed link to context menu. Fixes #2313	2020-08-05 01:13:34 -06:00
Daniel Supernault	6375bf4a28	Update changelog	2020-08-05 01:12:46 -06:00
Daniel Supernault	c675157713	Update compiled assets	2020-08-05 01:12:34 -06:00
Daniel Supernault	89f29072a1	Update Profile.vue, add atom feed link to context menu. Fixes #2313	2020-08-05 01:10:03 -06:00
daniel	9ebeb929b8	Merge pull request #2366 from pixelfed/staging ... Staging	2020-08-05 00:30:42 -06:00
Daniel Supernault	d30d16b3d7	Update compiled assets	2020-08-05 00:28:08 -06:00
Daniel Supernault	b1fb7dcbc3	Update components, redirect remote hashtag to local hashtag page	2020-08-05 00:26:29 -06:00
Daniel Supernault	714eceb3ea	Update compiled assets	2020-08-05 00:04:19 -06:00
Daniel Supernault	aa8fa30def	Update changelog	2020-08-04 23:58:46 -06:00
Daniel Supernault	f53f10fd9f	Update Timeline.vue, fixes #2363	2020-08-04 23:58:12 -06:00
Daniel Supernault	0c8ebf26fe	Update PostComponent.vue, improve MetroUI and fixes #2363	2020-08-04 23:54:14 -06:00
daniel	ef66bccbb5	Merge pull request #2365 from ahangarha/improve-Fa-translation ... Minor improvement in Persian translation	2020-08-04 23:39:11 -06:00
Mostafa Ahangarha	5851369801	minor improvement in Persian translation	2020-08-03 18:25:19 +04:30
daniel	d3f8af119f	Merge pull request #2362 from pixelfed/staging ... Update Timeline.vue component, fixes #2352 #2343	2020-08-01 23:29:25 -06:00
Daniel Supernault	9cb3051155	Update compiled assets	2020-08-01 23:28:18 -06:00
Daniel Supernault	465e7866c3	Update changelog	2020-08-01 23:28:03 -06:00
Daniel Supernault	e134a9ac55	Update Timeline.vue component, fixes #2352 #2343	2020-08-01 23:24:56 -06:00
daniel	0016fd7e57	Merge pull request #2361 from pixelfed/staging ... Staging	2020-08-01 20:16:20 -06:00
Daniel Supernault	4d42f8984d	Update compiled assets	2020-08-01 19:00:31 -06:00
Daniel Supernault	23ede463f8	Update Discover, add deprecation notice for loops	2020-08-01 18:57:04 -06:00
daniel	09206c6e8e	Merge pull request #2359 from pixelfed/dependabot/npm_and_yarn/elliptic-6.5.3 ... Bump elliptic from 6.5.2 to 6.5.3	2020-08-01 18:14:53 -06:00
daniel	b3dc64bbd3	Merge pull request #2356 from mccollam/patch-1 ... add 'taggingPeople' translation	2020-08-01 18:14:06 -06:00
dependabot[bot]	513036dd84	Bump elliptic from 6.5.2 to 6.5.3 ... Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3) Signed-off-by: dependabot[bot] <support@github.com>	2020-07-30 08:02:49 +00:00
Ronald McCollam	c13e3541cd	spelling	2020-07-27 20:31:25 -04:00
Ronald McCollam	36412d312a	fix array	2020-07-27 20:29:42 -04:00
Ronald McCollam	2aabc337f2	add 'taggingPeople' translation	2020-07-27 20:28:24 -04:00
daniel	351fe7035f	Merge pull request #2354 from pixelfed/staging ... Add MediaBlocklist feature	2020-07-26 22:25:22 -06:00
Daniel Supernault	accaa50a15	Update changelog	2020-07-26 22:18:18 -06:00
Daniel Supernault	597378bfb4	Update upload endpoints with MediaBlocklist checks	2020-07-26 22:17:00 -06:00
Daniel Supernault	5d0a24a779	Add MediaBlocklistService	2020-07-26 22:14:57 -06:00
daniel	8ffad2b615	Merge pull request #2348 from dx7/2FA-page-issues ... 2FA verification page issues	2020-07-26 22:11:36 -06:00
Daniel Supernault	ce498e9b67	Update Nickname lexer	2020-07-26 22:09:11 -06:00
Daniel Supernault	c1e41e5936	Update changelog	2020-07-26 22:06:37 -06:00
Daniel Supernault	ba1f7e7e2c	Add MediaBlocklist feature	2020-07-26 22:05:52 -06:00