549 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Pierre Jaury	1af0b8abbb	Configure trust proxies	2018-06-10 20:06:22 +02:00
Pierre Jaury	438fb3c514	Merge branch 'dev' of https://github.com/dansup/pixelfed into dev	2018-06-10 19:36:31 +02:00
daniel	75b7cebb14	Merge pull request #251 from dansup/frontend-ui-refactor ... Hide CW until its fully implemented	2018-06-09 17:45:08 -06:00
Daniel Supernault	39c2adb656	Hide CW until its fully implemented	2018-06-09 17:44:30 -06:00
daniel	02426d8c55	Merge pull request #250 from dansup/frontend-ui-refactor ... Frontend ui refactor	2018-06-09 17:41:53 -06:00
Daniel Supernault	016c1c7b7c	Update fediverse page	2018-06-09 17:37:42 -06:00
Daniel Supernault	40872a4159	Update status template	2018-06-09 17:36:45 -06:00
Daniel Supernault	b63b8353ad	Add pagination to notifications	2018-06-09 17:36:27 -06:00
Daniel Supernault	a39f9600b9	Add avatar to nav dropdown	2018-06-09 17:35:21 -06:00
Daniel Supernault	b677d0ced6	Update footer	2018-06-09 17:35:03 -06:00
Daniel Supernault	b6706b626a	Replace line-icons with font awesome icons	2018-06-09 17:34:53 -06:00
Daniel Supernault	0b85810a33	Update master layout, remove line-icons	2018-06-09 17:32:44 -06:00
Daniel Supernault	2726f90584	Update Status model	2018-06-09 17:32:07 -06:00
Daniel Supernault	0cc736d109	Update Profile model	2018-06-09 17:31:48 -06:00
Daniel Supernault	40d1b5342a	Update ProfileController	2018-06-09 17:31:14 -06:00
Daniel Supernault	545efbeee3	Update AccountController, add pagination to notifications	2018-06-09 17:30:54 -06:00
Daniel Supernault	63343ae503	Add basic CW/NSFW support	2018-06-09 16:29:36 -06:00
Daniel Supernault	0e316aabdc	Add activity.js, infinite scroll for notifications	2018-06-09 14:42:35 -06:00
Pierre Jaury	be13d1aa98	Enable apache rewrite mod	2018-06-09 17:45:57 +02:00
Pierre Jaury	b005b3a22c	Link html to public instead of renaming	2018-06-09 17:41:26 +02:00
Pierre Jaury	d76851732a	Set a proper path for public documents	2018-06-09 16:57:47 +02:00
Pierre Jaury	0700d32a6f	Add an apache build	2018-06-09 13:52:13 +02:00
daniel	bccd01b2dc	Merge pull request #239 from m4sk1n/fix-titles ... Fix following/ers page titles	2018-06-08 22:47:13 -06:00
Daniel Supernault	10bf0a7821	Update footer	2018-06-08 22:46:21 -06:00
daniel	a66a55cf9e	Merge pull request #237 from trwnh/patch-2 ... Footer reorganization	2018-06-08 22:44:36 -06:00
daniel	0d72b54df5	Merge pull request #230 from imbsky/editorconfig ... Add .editorconfig	2018-06-08 22:41:07 -06:00
Daniel Supernault	5b8a4dfefd	Update nav menu ... Closes #60	2018-06-08 22:39:06 -06:00
Daniel Supernault	9c072482a5	Fix go tags	2018-06-08 21:34:49 -06:00
Daniel Supernault	7139b5f380	Add mention notifications	2018-06-08 21:33:57 -06:00
Daniel Supernault	dd60413394	Add MentionPipeline	2018-06-08 21:32:46 -06:00
Daniel Supernault	7bb1f10d19	Add new entity lexers	2018-06-08 21:31:42 -06:00
Daniel Supernault	33ff1f7829	Add mention model/migration/translation	2018-06-08 21:05:13 -06:00
Marcin Mikołajczak	1a4748d96e	fix following/ers page titles ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-06-08 16:34:32 -07:00
trwnh	7dd5080168	"Powered by PixelFed" ... Copyright status isn't really appropriate since PF isn't a commercial project and can be self-hosted across many instances	2018-06-07 19:40:36 -05:00
trwnh	5c6e6cbd7b	Reorder footer ... Organization more closely matches site routes menu	2018-06-07 18:27:03 -05:00
trwnh	dcc01d8191	Link footer to pixelfed.org ... Clicking pixelfed.org should load pixelfed.org	2018-06-07 17:47:08 -05:00
Daniel Supernault	86efcceb4c	Update LikePipeline, prevent duplicate like notifications	2018-06-07 00:14:32 -06:00
Daniel Supernault	1d5226c3c6	Update compiled assets	2018-06-06 23:55:17 -06:00
bsky	d3858930e0	Add .editorconfig	2018-06-07 14:52:17 +09:00
daniel	1b87ac1485	Merge pull request #228 from hellcp/patch-19 ... Make notification images not stretch	2018-06-06 23:51:38 -06:00
daniel	2cf44735bf	Merge branch 'frontend-ui-refactor' into patch-19	2018-06-06 23:50:55 -06:00
daniel	d4291c5513	Merge pull request #227 from hellcp/patch-18 ... Make profiles more consistent	2018-06-06 23:47:29 -06:00
daniel	f7d15127d1	Merge pull request #225 from hellcp/patch-17 ... Add titles to icons	2018-06-06 23:46:36 -06:00
daniel	ac3303d8ad	Merge pull request #219 from hellcp/patch-15 ... Fix squashed avatars and long images in timelines	2018-06-06 23:40:03 -06:00
daniel	eed7ab5fee	Merge pull request #229 from dansup/frontend-ui-refactor ... Frontend ui refactor	2018-06-06 22:40:52 -06:00
Daniel Supernault	7a7c87d87d	Add laravel-backup	2018-06-06 22:40:16 -06:00
Stasiek Michalski	bec5a8d919	Make notification images not stretch	2018-06-06 20:43:50 +02:00
Stasiek Michalski	410f9dab34	Make notification image a background-image	2018-06-06 20:42:24 +02:00
Stasiek Michalski	454f28911c	Add border to the bottom	2018-06-06 16:52:27 +02:00
Stasiek Michalski	f0d5024aa6	Remove border from topbar nav	2018-06-06 16:51:24 +02:00