2771 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Daniel Supernault	45930a31c3	Add new migration	2018-09-01 22:42:30 -06:00
daniel	0b56823429	Merge pull request #429 from pixelfed/frontend-ui-refactor ... Add FollowRequest model/migration	2018-09-01 22:29:27 -06:00
Daniel Supernault	f9fc8e2f64	Add FollowRequest model/migration	2018-09-01 22:28:01 -06:00
daniel	d1f58b2488	Merge pull request #428 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-09-01 21:55:56 -06:00
Daniel Supernault	a9b7117db9	Add bulk report actions	2018-09-01 21:50:54 -06:00
Daniel Supernault	18d171530d	Update web routes	2018-09-01 21:50:27 -06:00
Daniel Supernault	1e839d2517	Update AdminReportController	2018-09-01 21:35:32 -06:00
Daniel Supernault	2fa6adf705	Update admin report view	2018-08-31 20:31:49 -06:00
daniel	7ddd1fad4a	Merge pull request #426 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-08-31 20:29:42 -06:00
Daniel Supernault	89ced5bdde	Add admin report views	2018-08-31 20:26:56 -06:00
Daniel Supernault	84ba7f4a9c	Update timeline logic to filter non public posts	2018-08-31 19:50:37 -06:00
Daniel Supernault	bfa04b7ad7	Update BaseApiController@accountStatuses, handle visibility scope properly	2018-08-31 18:54:50 -06:00
Daniel Supernault	c1f66b968e	Add oauth to User model	2018-08-31 18:38:07 -06:00
daniel	075279efeb	Merge pull request #424 from pixelfed/frontend-ui-refactor ... Update web routes	2018-08-31 00:24:23 -06:00
Daniel Supernault	0f6d1ed150	Update web routes	2018-08-31 00:21:05 -06:00
daniel	54e69817a2	Merge pull request #423 from pixelfed/frontend-ui-refactor ... Fix discover bug	2018-08-30 23:08:20 -06:00
Daniel Supernault	ff860c9b85	Fix discover bug	2018-08-30 23:06:13 -06:00
daniel	6af9389479	Merge pull request #422 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-08-30 22:59:27 -06:00
Daniel Supernault	5a5f1bf637	Update DiscoverController	2018-08-30 22:58:57 -06:00
daniel	d0b4c4f765	Merge pull request #422 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-08-30 22:32:54 -06:00
Daniel Supernault	d4691b007b	Bump version	2018-08-30 22:32:07 -06:00
Daniel Supernault	d8d73298a9	Update SettingsController	2018-08-30 22:29:38 -06:00
Daniel Supernault	0508900b46	Update web routes	2018-08-30 22:28:09 -06:00
Daniel Supernault	90bd599e81	Update status template	2018-08-30 22:27:46 -06:00
Daniel Supernault	c9e75b1e63	Add user muted privacy settings	2018-08-30 22:26:23 -06:00
Daniel Supernault	cdc6a71c14	Add user blocked privacy settings	2018-08-30 22:25:55 -06:00
Daniel Supernault	db8de248b1	Update privacy settings	2018-08-30 22:25:08 -06:00
Daniel Supernault	b110bc5568	Update user settings sidebar	2018-08-30 22:19:31 -06:00
Daniel Supernault	0af5547dbb	Update DiscoverController	2018-08-30 22:18:43 -06:00
Daniel Supernault	2810b952dd	Update SiteController, add mutes and blocks to personal timeline	2018-08-30 21:47:25 -06:00
Daniel Supernault	4db7b72747	Update UserFilter model	2018-08-30 21:43:43 -06:00
daniel	dda3a33354	Merge pull request #421 from pixelfed/frontend-ui-refactor ... Update privacy settings view	2018-08-30 19:39:08 -06:00
Daniel Supernault	de1ebae425	Update privacy settings view	2018-08-28 19:58:44 -06:00
ButterflyOfFire	290a1f5b13	Add files via upload	2018-08-28 20:41:26 +01:00
ButterflyOfFire	8e688e5196	Preparing ar folder	2018-08-28 19:37:33 +00:00
daniel	c084064f15	Merge pull request #418 from pixelfed/frontend-ui-refactor ... Update ProfileController	2018-08-28 12:55:57 -06:00
Daniel Supernault	3362bbc9ba	Update ProfileController	2018-08-28 12:54:37 -06:00
daniel	3b4705b4e0	Merge pull request #417 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-08-27 22:06:36 -06:00
Daniel Supernault	505d734e68	Update CI config	2018-08-27 21:59:28 -06:00
Daniel Supernault	e8616c290f	Update CI config	2018-08-27 21:55:47 -06:00
Daniel Supernault	6bcbd061f0	Update CI config	2018-08-27 21:50:45 -06:00
Daniel Supernault	5dd02c78b1	Update CI config	2018-08-27 21:45:31 -06:00
Daniel Supernault	0515efec1b	Update CI config	2018-08-27 21:40:30 -06:00
Daniel Supernault	1d26ddc11c	Add Circle CI config	2018-08-27 21:33:39 -06:00
daniel	ef91291d4d	Merge pull request #416 from pixelfed/analysis-z4KpJn ... Apply fixes from StyleCI	2018-08-27 21:17:24 -06:00
daniel	b8abbdd90f	Apply fixes from StyleCI	2018-08-28 03:07:36 +00:00
Daniel Supernault	75de27f482	Update localizations	2018-08-27 21:06:32 -06:00
Daniel Supernault	3c5dc24bec	Update config	2018-08-27 21:01:08 -06:00
daniel	db16a391cc	Merge pull request #413 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-08-27 11:26:14 -06:00
Daniel Supernault	b7c7757cff	Update RegisterController	2018-08-27 11:24:28 -06:00