21926 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	2e98b6873a	Merge pull request #5821 from JonnyTischbein/issue_rss_test ... [frio] Submit button for RSS Frequency	2018-10-04 18:33:11 -04:00
Jonny Tischbein	5a5a281ed2	css for submit button	2018-10-05 00:11:13 +02:00
Jonny Tischbein	2802f031d4	Submit button for rss poll	2018-10-05 00:08:16 +02:00
Hypolite Petovan	0589d9ed2d	Merge pull request #5819 from JonnyTischbein/issue_install_db_inuse ... Install: After detecting DB already in use, go back to db_stettings with error	2018-10-04 15:51:14 -04:00
Jonny Tischbein	faa86aa2c0	fix indent with tabs	2018-10-04 21:38:44 +02:00
Jonny Tischbein	07489a3a9c	Install: After detecting DB already in use, go back to db_stettings with error	2018-10-04 18:53:52 +02:00
Hypolite Petovan	743e7d3ecb	Merge pull request #5815 from annando/ap2 ... The ActivityPub functionality is now split into 4 files	2018-10-04 09:10:17 -04:00
Michael	4368c922fb	is sensitive	2018-10-04 13:08:11 +00:00
Michael	0ebfa6fc12	Added to-do	2018-10-04 12:57:42 +00:00
Michael	1c615f80c4	Improved return values	2018-10-04 12:53:41 +00:00
Hypolite Petovan	8f09f28e4c	Merge pull request #5816 from JonnyTischbein/issue_failed_login_layout ... [Frio] Fix Layout when login failed	2018-10-04 08:46:15 -04:00
Michael	9171b2a0f3	It's possibly better to use context links that do exist	2018-10-04 09:46:29 +00:00
Michael	06a59c8312	Funkwhale documentation added	2018-10-04 05:29:22 +00:00
Michael	72fc89d033	Simplified attachment handling	2018-10-04 05:26:00 +00:00
Michael	f6277970fa	Added some to-do	2018-10-03 19:35:01 +00:00
Michael	11a7f6c3e1	Unused "use" removed	2018-10-03 19:17:40 +00:00
Michael	cbfc3d0c28	Fix error / "about" is now converted to BBCode	2018-10-03 19:00:32 +00:00
Michael	221e197658	Tags are now transmitted as expected	2018-10-03 18:27:01 +00:00
Michael	a9a1ac808b	Attachments do work now	2018-10-03 17:36:55 +00:00
Jonny Tischbein	ee32459358	goaway with argument	2018-10-03 18:28:04 +02:00
Michael Vogel	5926ae1c1d	Merge pull request #5813 from MrPetovan/task/update-composer ... Update composer	2018-10-03 18:08:15 +02:00
Michael	78a7e130ae	Another renamed function	2018-10-03 15:50:21 +00:00
Michael	8841519c0d	Renamed functions	2018-10-03 15:41:51 +00:00
Jonny Tischbein	3c9b33176f	Static reason for login failure to prevent bruteforce	2018-10-03 14:32:16 +02:00
Jonny Tischbein	3ecabe0291	Fix goaway url when login failed + using info to display message	2018-10-03 13:10:49 +02:00
Michael	1fe55679fc	Moved documentation	2018-10-03 09:53:12 +00:00
Michael	acd1caa114	The function is only needed in the same class	2018-10-03 09:45:54 +00:00
Michael Vogel	ec898ecd2a	Merge pull request #5792 from MrPetovan/task/add-cache-console ... Add Cache console	2018-10-03 11:17:43 +02:00
Michael	3ab837f3c7	Functionality is now split	2018-10-03 09:15:38 +00:00
Michael	4528d8748c	Merge remote-tracking branch 'upstream/develop' into ap2	2018-10-03 06:16:23 +00:00
Michael	4d2e5c2bbe	AP class will be split in processor, receiver and transmitter	2018-10-03 06:15:07 +00:00
Hypolite Petovan	5063095d8d	Upgrade Composer dependencies	2018-10-03 01:35:12 -04:00
Hypolite Petovan	b285135ec0	Update composer binary to version 1.7.2	2018-10-03 01:34:48 -04:00
Hypolite Petovan	2a7327a41c	Fix spaces in Cache\Memcachedriver	2018-10-03 00:24:26 -04:00
Hypolite Petovan	1f7cb530c7	Merge pull request #5812 from annando/develop ... Issue 5811: "objects" instead of "object"	2018-10-02 22:11:28 -04:00
Michael	76cdc9e594	Renamed class	2018-10-02 20:14:28 +00:00
Michael	518d461a8f	Issue 5811: "objects" instead of "object"	2018-10-02 20:12:38 +00:00
Hypolite Petovan	406b46b635	Merge pull request #5800 from JonnyTischbein/issue_return_path ... Update return path former via $_SESSION['return_url']	2018-10-02 12:30:38 -04:00
Jonny Tischbein	6d1b98dc0e	wrong var name - conversation not found	2018-10-02 18:24:16 +02:00
Jonny Tischbein	ecb67cfcb4	syntax typo	2018-10-02 18:22:23 +02:00
Jonny Tischbein	fa3bbc5f45	Code Standards + return path for \!local_user() and cancel	2018-10-02 18:13:58 +02:00
Hypolite Petovan	100f35f9f5	Merge pull request #5810 from annando/develop ... removed obsolete package	2018-10-02 11:50:53 -04:00
Michael	c02dea7b02	removed obsolete package	2018-10-02 15:45:39 +00:00
Hypolite Petovan	505350c9fb	Merge pull request #5794 from annando/ap1 ... ActivityPub support	2018-10-02 11:24:04 -04:00
Michael	3020b0fdc4	Fix missing mentions	2018-10-02 14:48:57 +00:00
Jonny Tischbein	9915523490	mod/message return to conversation if message deleted	2018-10-02 13:16:43 +02:00
Hypolite Petovan	e8fd13ff21	Merge pull request #5806 from annando/issue-5804-2 ... Repeated posts from OStatus, ActitivyPub and Twitter are now shown as is	2018-10-02 07:07:07 -04:00
Hypolite Petovan	010a7e121c	Merge pull request #5807 from annando/fix-test ... The API test should now complete again	2018-10-02 07:06:28 -04:00
Michael	fcfd04bcc9	Normalize the mentions and ensure to not have duplicates	2018-10-02 09:04:32 +00:00
Michael	d4f6261b81	Avoid notice	2018-10-02 08:31:58 +00:00