22490 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	cce561708a	Replaced $argv and $argc with the $_SERVER array	2015-01-04 13:24:16 +01:00
Michael Vogel	a86c143e24	The "scrape" bugfix lead to partly damaged encodings. This is fixed now.	2015-01-04 11:56:41 +01:00
fabrixxm	3195bacd9e	Merge pull request #1275 from annando/1501-hashtags-in-attachments ... Titles in attached link description now don't create misformatted text anymore	2015-01-03 21:32:55 +01:00
Tobias Diekershoff	379b161bbb	Merge pull request #1277 from annando/1501-bugfix-remote-self ... Items that were stored via "remote-self" hadn't contained a valid avatar	2015-01-02 13:07:14 +01:00
Michael Vogel	47bca7944e	Merge pull request #1276 from tobiasd/20150102fr ... FR update to the strings	2015-01-02 13:06:02 +01:00
Michael Vogel	7156294055	Items that were stored via "remote-self" hadn't contained a valid avatar picture.	2015-01-02 12:45:09 +01:00
Tobias Diekershoff	882f9c83d6	FR update to the strings	2015-01-02 08:26:08 +01:00
Michael Vogel	b5beb4c69a	Litte typo ...	2015-01-02 07:50:21 +01:00
Michael Vogel	bf147ca9d9	Hashtags in attached link description now don't create misformatted text anymore.	2015-01-02 01:43:31 +01:00
Michael Vogel	f9a6cbd89e	Merge remote-tracking branch 'upstream/develop'	2015-01-02 00:02:45 +01:00
Michael Vogel	38a45d325f	See issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined.	2015-01-02 00:01:17 +01:00
Tobias Diekershoff	8c8ffdf999	Merge pull request #1273 from annando/issue-920 ... Using a better placeholder. See issue 920	2015-01-01 21:47:48 +01:00
Michael Vogel	1520a3feab	Using a better placeholder. Could solve this issue: https://github.com/friendica/friendica/issues/920	2015-01-01 21:19:07 +01:00
Tobias Diekershoff	22ae03c1a3	Merge pull request #1271 from fabrixxm/api/favorites ... api: favorite create/destroy update also thread table	2015-01-01 19:06:59 +01:00
Tobias Diekershoff	3aabdd74a1	Merge pull request #1272 from annando/1412-api-attachments ... API: Support for attachments	2015-01-01 19:06:24 +01:00
Michael Vogel	a94673ccb4	API: Support for attachments	2015-01-01 18:31:50 +01:00
Michael Vogel	da3d175be8	Merge remote-tracking branch 'upstream/develop' into 1412-api-attachments	2015-01-01 14:53:13 +01:00
fabrixxm	ecc76c6090	Merge pull request #1254 from annando/1409-shadow-items ... Global Community	2014-12-31 18:13:58 +01:00
fabrixxm	35bb7816af	api: favorite create/destroy update also thread table	2014-12-31 18:08:11 +01:00
Michael Vogel	26d5746d99	Support for attachments in the API (for better AndStatus support)	2014-12-31 17:01:55 +01:00
Michael Vogel	d80c375220	Merge remote-tracking branch 'upstream/develop' into 1412-api-attachments	2014-12-31 15:45:51 +01:00
Michael Vogel	33c0aba5b7	Add the file size to the photo data array	2014-12-31 15:44:32 +01:00
fabrixxm	1c5348d885	Merge pull request #1270 from tobiasd/20141231 ... FR IT update for the strings	2014-12-31 13:36:54 +01:00
Tobias Diekershoff	2c40d78940	Merge pull request #1269 from fabrixxm/api/favorites ... api: add support to star/unstar items	2014-12-31 12:43:40 +01:00
Tobias Diekershoff	32400f5127	FR IT update to the strings	2014-12-31 12:41:00 +01:00
fabrixxm	5d91e5418b	api: add support to star/unstar items	2014-12-31 12:34:32 +01:00
Tobias Diekershoff	e24f97de43	FR update to the strings	2014-12-30 09:04:35 +01:00
Tobias Diekershoff	997df904c6	Merge pull request #1267 from fabrixxm/feature-hook-emailer_send ... Fix syntax error in include/Emailer.php	2014-12-29 17:41:50 +01:00
fabrixxm	d66fda2eab	Fix syntax error in include/Emailer.php	2014-12-29 16:40:04 +01:00
Tobias Diekershoff	384e5f15ff	Merge pull request #1266 from fabrixxm/feature-hook-emailer_send ... Adds 'emailer_send_prepare' and 'emailer_send' hooks	2014-12-29 16:22:56 +01:00
fabrixxm	917ce5b411	Adds optional parameter 'uid' to Emailer::send() ... that is the user id of the recipient of the mail. Make enotify pass it to Emailer::send()	2014-12-29 16:04:51 +01:00
Fabio Comuni	a659b34117	Adds 'emailer_send_prepare' and 'emailer_send' hooks ... Adds relative documentation in doc/Plugins	2014-12-29 15:44:30 +01:00
Tobias Diekershoff	c3ec68a520	Merge pull request #1264 from tugelbend/develop ... Develop	2014-12-28 19:29:09 +01:00
Tobias Diekershoff	c29ad105fa	Merge pull request #1263 from silke/documentation ... Documentation	2014-12-28 18:14:00 +01:00
Silke Meyer	06d807e4a9	added some info on vagrant to the help for devs	2014-12-28 16:58:49 +01:00
Silke Meyer	a57971c0c9	added a getting started file for developers	2014-12-28 16:40:07 +01:00
Silke Meyer	9c2e7a0c5c	renamed general dev documentation to github documentation	2014-12-28 16:39:19 +01:00
Silke Meyer	aa309ef063	updated help's table of content	2014-12-28 16:38:19 +01:00
hauke	a72d60f481	Added h-card and functionality for IndieAuth/Web-sign-in	2014-12-28 15:48:24 +01:00
Silke Meyer	0b0c574385	Fixed a small typo	2014-12-28 14:50:43 +01:00
hauke	395be3dcde	Merge branch 'develop' of https://github.com/friendica/friendica into develop	2014-12-27 12:50:24 +01:00
fabrixxm	ce12ec3054	Merge pull request #1259 from rabuzarus/issue_1258 ... Fix issue #1258 : photo albums are not complely themeable with photo_album.tpl	2014-12-26 19:52:57 +01:00
Michael Vogel	3908b9172d	Merge remote-tracking branch 'upstream/master'	2014-12-26 18:08:08 +01:00
Michael Vogel	a357ebd101	Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items	2014-12-26 18:07:37 +01:00
Rabuzarus	5939a8cea5	revert last commit f59e574, remove some html code	2014-12-26 14:44:48 +01:00
Rabuzarus	f59e574068	removed Pagination	2014-12-26 12:54:23 +01:00
Fabio Comuni	d87323c2bb	Merge branch 'master' into develop	2014-12-26 11:00:01 +01:00
Fabio Comuni	d10c8ddf57	Update version in boot.php	2014-12-26 10:46:10 +01:00
Fabio Comuni	fdf3163d29	merge changelist.txt into CHANGELOG	2014-12-26 10:44:23 +01:00
Rabuzarus	cb47fdfcb9	minor change: rel should not be part of the PHP	2014-12-26 03:32:21 +01:00