28807 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	497c40e674	Merge pull request #2383 from tobiasd/20160225 ... a missing break	2016-02-29 11:11:54 +01:00
fabrixxm	9847083e79	Merge pull request #2384 from tobiasd/20160228-api ... old location might vanish, vinzv moved the GS API docs over here	2016-02-29 08:54:36 +01:00
Michael Vogel	6d3581dac8	"profile". "like" and "comment" could work, status messages only partly.	2016-02-29 08:02:50 +01:00
Michael Vogel	c02b54997e	Like and Comment could work (partially)	2016-02-28 19:05:23 +01:00
Tobias Diekershoff	08a7802112	old location might vanish, vinzv moved the GS API docs over here	2016-02-28 08:30:45 +01:00
Michael Vogel	a3960bda37	New Diaspora code	2016-02-27 23:54:17 +01:00
Tobias Diekershoff	f4b0e9316e	a missing break	2016-02-25 21:37:37 +01:00
Tobias Diekershoff	48642a8544	Merge pull request #2379 from annando/1602-abstract-doc ... Some documentation for the usage of the "abstract" element.	2016-02-25 13:15:12 +01:00
fabrixxm	53776919c0	Merge pull request #2382 from tobiasd/20160204-doc ... small stuff for the docs	2016-02-25 08:46:25 +01:00
Tobias Diekershoff	1b14b22b76	Client section in DeveloperIntro docs	2016-02-24 20:46:06 +01:00
Michael Vogel	68d7beb298	Welcome to the live editing and commenting of the pull request ;-)	2016-02-24 07:43:13 +01:00
Michael Vogel	8369e6ce59	Clarification between statusnet and GNU Social.	2016-02-24 07:37:18 +01:00
Michael Vogel	db92663466	One line, one sentence	2016-02-24 07:33:20 +01:00
Tobias Diekershoff	a2ed74e17f	Merge pull request #2380 from annando/issue-2373 ... Bugfix: Resharing on the display page works again.	2016-02-24 07:28:40 +01:00
Michael Vogel	99bac3a4d8	Corrected explanation	2016-02-24 07:22:32 +01:00
Michael Vogel	eec0dbf738	Bugfix: Resharing on the display page works again.	2016-02-24 07:20:23 +01:00
Tobias Diekershoff	a153f49920	clarification to the docs	2016-02-24 06:27:31 +01:00
Michael Vogel	86339cdb97	Some documentation for the usage of the "abstract" element.	2016-02-23 22:45:06 +01:00
rabuzarus	b93326bb23	contactedit-actions-button: use internal links instead of full links	2016-02-23 19:26:03 +01:00
rabuzarus	0db83b9586	contactedit-actions-button: move repair back to tabbar	2016-02-23 19:19:45 +01:00
fabrixxm	507f8ab4df	Merge pull request #2370 from annando/1602-mixed-content ... Initial work to prevent mixed content, allow hidden tor services ...	2016-02-23 08:45:19 +01:00
Michael Vogel	d27ed6e9d8	Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content	2016-02-23 08:03:30 +01:00
Tobias Diekershoff	556d044cc9	Merge pull request #2377 from annando/1602-abstract ... New BBCode element "abstract" for network depending messages.	2016-02-23 08:01:13 +01:00
Michael Vogel	148c89a20d	Added documentation	2016-02-23 07:56:49 +01:00
Michael Vogel	bc283a5316	The "abstract" has moved after the "nobb" part in bbcode.	2016-02-23 07:21:40 +01:00
Michael Vogel	8ec833f808	New BBCode element "abstract" for network depending messages.	2016-02-22 23:20:59 +01:00
Michael Vogel	d10eee45b9	Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content	2016-02-19 11:55:57 +01:00
fabrixxm	8c8ebb4adc	Merge pull request #2372 from annando/issue-2367 ... Issue 2367: The data for the gserver table is now sanitized.	2016-02-19 08:30:54 +01:00
Michael Vogel	8a3de7b186	Issue 2367: The data for the gserver table is now sanitized.	2016-02-19 07:30:28 +01:00
Michael Vogel	2eb461ed2c	Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content	2016-02-18 08:15:58 +01:00
Tobias Diekershoff	26463d92da	Merge pull request #2366 from annando/1602-array_merge ... Avoid "array_merge" warning.	2016-02-18 07:50:43 +01:00
Michael Vogel	9619829b4a	Avoid "array_merge" warning.	2016-02-18 07:41:08 +01:00
Michael Vogel	f9e2543133	Merge pull request #2354 from fabrixxm/issues/api-errors ... api: throw HTTPException instead of calling api_error directly	2016-02-18 07:26:33 +01:00
Michael Vogel	7d4c99ebbc	"get_baseurl" and "z_root" are disappearing ...	2016-02-17 23:47:32 +01:00
rabuzarus	69865ea843	Initial commit	2016-02-17 19:33:23 +01:00
fabrixxm	063bc5480f	Merge pull request #2365 from tobiasd/20160217-it ... IT update to the strings	2016-02-17 15:18:15 +01:00
Tobias Diekershoff	e22d980e91	IT update to the strings	2016-02-17 15:13:45 +01:00
Michael Vogel	ba99ac7200	Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup	2016-02-17 12:21:03 +01:00
Michael Vogel	c770b00d6d	Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content	2016-02-17 12:18:46 +01:00
Michael Vogel	8af8567567	Some more ...	2016-02-17 12:18:36 +01:00
fabrixxm	fb28713ca3	Merge pull request #2363 from tobiasd/2016ß217-credits ... make_credits.py: handle exception with non-existing addon directory	2016-02-17 09:01:29 +01:00
Michael Vogel	c5b724828a	Just some more removed baseurls ...	2016-02-17 08:08:28 +01:00
Tobias Diekershoff	b21275ee9c	handle exception with non-existing addon directory	2016-02-17 08:00:38 +01:00
Tobias Diekershoff	406b141e22	Merge pull request #2355 from annando/1602-remove-simplepie ... Simplepie is removed since we don't use it anymore	2016-02-17 07:24:34 +01:00
Tobias Diekershoff	6924cd1fec	Merge pull request #2362 from soko1/translate ... Complemented and improved russian translation	2016-02-17 07:21:33 +01:00
Michael Vogel	f7537c9e90	Remove the baseurl where possible to avoid mixed content	2016-02-17 00:01:24 +01:00
Sakałoŭ Alaksiej	a9f80d435b	Complemented and improved russian translation	2016-02-16 20:57:15 +03:00
Michael Vogel	a18fde458c	Added documentation.	2016-02-16 08:06:55 +01:00
Michael Vogel	ade5ef7065	Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie	2016-02-16 07:58:01 +01:00
Tobias Diekershoff	e9fe220116	Merge pull request #2356 from annando/1602-redmatrix-name ... We now show the correct platform (redmatrix or hubzilla)	2016-02-15 07:38:16 +01:00