1302 Commits (b4b314be5d885d7190f9ea4edacac2a2c14e2eca)

 

All Branches   

Search

Author	SHA1	Message	Date
lambda	b4b314be5d	Merge branch 'nginx-certbot-doc' into 'develop' ... Add info about certbot with the webroot plugin to pleroma.nginx See merge request pleroma/pleroma!125	7 years ago
lain	9e6ae44729	Formatting fixes.	7 years ago
lain	ce7618f6f6	add formatter	7 years ago
lain	21510f6990	.	7 years ago
lain	44a7789732	.	7 years ago
lain	34aab9f877	..	7 years ago
lain	b68c4bd271	Update CI.	7 years ago
lain	ff5e957476	Make search use id index too. ... Seems to be faster in general, query planner chooses well.	7 years ago
csaurus	1c6a691570	Add info about certbot with the webroot plugin to pleroma.nginx	7 years ago
lain	a61e8ac154	Formatting.	7 years ago
lain	18c3ca7844	Add format checking to CI.	7 years ago
lain	193be32f45	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	7 years ago
lain	0b4ff1bfe2	fix again	7 years ago
lambda	3f7b02e7c4	Merge branch 'feature/qvitter-notification-endpoint' into 'develop' ... TwitterAPI: Add Qvitter notification endpoint. Closes #142 See merge request pleroma/pleroma!123	7 years ago
eal	fa37acfcc7	TwitterAPI: Add Qvitter notification endpoint.	7 years ago
lambda	678fed47ee	Merge branch 'patch-2' into 'develop' ... Ignore setup_db.psql and specify a folder for custom emojis See merge request pleroma/pleroma!121	7 years ago
lain	7b96a756fb	fix again	7 years ago
lain	77fc40d5d7	Fix generate config	7 years ago
Dominik V. Salonen	8696c25efd	Ignore setup_db.psql and ignore a folder for custom emojis ... Wiki page should also be updated to recommend that admins put their custom emojis in /priv/static/emoji/custom/. This both makes for less hassle when doing a pull. And also prevents more mess in the /priv/static/emoji/ folder.	7 years ago
eal	e30a056476	Revert "Ask for proxy URL if proxy enabled." ... The most common case is running it on the same server.	7 years ago
lambda	e4da81d662	Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop' ... CommonAPI post: kill \r with fire See merge request pleroma/pleroma!120	7 years ago
William Pitcock	ee6f15529d	CommonAPI post: kill \r with fire	7 years ago
eal	b586ead6b8	rm_user: also ensure that cache is running.	7 years ago
lambda	8b5ea91f68	Merge branch 'fix/rm-user-task' into 'develop' ... Fix rm_user task. See merge request pleroma/pleroma!119	7 years ago
eal	4e3fc530db	Fix rm_user task.	7 years ago
lambda	a80cdd5906	Merge branch 'fix/login-with-username-or-email' into 'develop' ... MastoAPI and OAuth: allow login with either email or username. See merge request pleroma/pleroma!118	7 years ago
eal	947431e9aa	MastoAPI and OAuth: allow login with either email or username.	7 years ago
lain	e153b364a7	update frontend	7 years ago
lambda	fef8daa454	Update README.md	7 years ago
lambda	3b68eaa0ce	Merge branch 'mix_task_rm_user' into 'develop' ... Add rm_user mix task See merge request pleroma/pleroma!109	7 years ago
Phenethylamine	13a64b82e3	Switch to User.delete for rm_user task	7 years ago
Phenethylamine	4478b9115c	Add rm_user mix task	7 years ago
lambda	3d636cf533	Merge branch 'develop' into 'develop' ... Fix issue #124 Closes #124 See merge request pleroma/pleroma!108	7 years ago
lain	5612716c25	update frontend	7 years ago
lain	a8dddd9279	update frontend	7 years ago
Gian Sass	2de2e29df2	Oops	7 years ago
Gian Sass	3a5c0465eb	Add unit test for pinned statuses	7 years ago
Gian Sass	907df9b8ed	Fix issue #124	7 years ago
lambda	faa0feb095	Merge branch 'feld-hackneyupdate' into 'develop' ... Update httpoison to get the latest hackney. See merge request pleroma/pleroma!107	7 years ago
Mark Felder	366138fa72	Update httpoison to get the latest hackney. ... Works on my computer ^TM	7 years ago
lain	b910483c16	Fix register_user task.	7 years ago
lain	1dd2c8163f	Order masto searches by date.	7 years ago
lambda	d7654f4b3c	Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop' ... Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec See merge request pleroma/pleroma!104	7 years ago
lambda	6ff583e5e1	Merge branch 'feld-varnish' into 'develop' ... Remove attempted caching of toots See merge request pleroma/pleroma!106	7 years ago
Mark Felder	fcb32345d7	Remove attempted caching of toots ... This does not work as expected. We should not attempt to be clever here. Varnish will do the right thing if we just teach Pleroma to set headers properly for content we know can be cached.	7 years ago
lambda	fcc941adfd	Merge branch 'patch-1' into 'develop' ... Indentation for Apache vhost See merge request pleroma/pleroma!105	7 years ago
Stanislas	73ca18744e	Indentation for Apache vhost	7 years ago
Morgan Bazalgette	fc13a3ff24	Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec	7 years ago
lambda	d7c2909ce2	Merge branch 'bugfix/user-search-with-at-sign' into 'develop' ... user: strip leading @ from user query when searching for users if present Closes #117 See merge request pleroma/pleroma!99	7 years ago
lambda	210755ac46	Merge branch 'develop' into 'develop' ... Fix max upload size in nginx config. See merge request pleroma/pleroma!102	7 years ago