4147 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	f6320f3319	Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact.	2012-02-24 07:11:26 +01:00
friendica	44c23cda8e	theme shakeup commences - themes are now administered in admin panel.	2012-02-23 20:29:09 -08:00
friendica	65ddefe9c5	system notifications to notify module, untranslated string in notifications.tpl	2012-02-23 17:37:03 -08:00
friendica	b4d38f6eed	implement firehose notify in ping, strip links so notify popup displays correctly in all themes	2012-02-23 16:50:29 -08:00
Michael	484a442f2b	GIT problems ...	2012-02-23 20:59:34 +01:00
Michael	0409b5cdba	Merge remote branch 'upstream/master' ... Conflicts: include/bbcode.php	2012-02-23 20:53:22 +01:00
Michael	311e35731c	bbcode.php: A list or quote at the beginning wasn't detected	2012-02-23 20:51:44 +01:00
Fabio Comuni	f5b8654818	fix visualization in groupeditor	2012-02-23 16:21:28 +01:00
Fabio Comuni	fd3274ff53	less html in mod/group.php, template for group members editor, quattro theme for group edit.	2012-02-23 16:17:36 +01:00
Simon	8cacff6985	Merge pull request #47 from fabrixxm/master ... quattro: fix typos	2012-02-23 06:44:06 -08:00
Fabio Comuni	d45e26d6d9	Merge remote-tracking branch 'friendica/master'	2012-02-23 15:23:52 +01:00
Tobias Diekershoff	1dacb2e570	quattro-green: removed contact_template.tpl	2012-02-23 14:16:20 +01:00
Fabio Comuni	6a0c815c1f	Merge remote-tracking branch 'friendica/master'	2012-02-23 14:10:32 +01:00
Fabio Comuni	edd946bcad	quattro: fix typos	2012-02-23 14:10:23 +01:00
Tobias Diekershoff	c03b5b62c0	green-quattro: applied a color for shiny class and preview	2012-02-23 12:54:14 +01:00
fabrixxm	d5adb67ef4	Merge pull request #46 from fabrixxm/master ... more work on quattro theme and less html in php	2012-02-23 02:52:04 -08:00
Fabio Comuni	cbc60d525e	quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside. ... remove html from viewcontacts.php and contacts.php use contact_template.tpl to print contacts also in viewcontacts	2012-02-23 11:22:32 +01:00
Tobias Diekershoff	85d09f48d0	fix img tag with size attribute	2012-02-23 11:12:36 +01:00
friendica	d9e9fd0359	Merge branch 'master' into notify	2012-02-23 00:30:17 -08:00
friendica	fd43e2c563	more theme notify fixes	2012-02-23 00:28:26 -08:00
Tobias Diekershoff	734cdcef28	Merge branch 'master' of https://github.com/friendica/friendica	2012-02-23 09:04:00 +01:00
Tobias Diekershoff	56f3c00eec	quattro: added styling to pivate message view	2012-02-23 09:02:40 +01:00
friendica	41636a50aa	new notify sort of working in testbubble	2012-02-22 23:34:30 -08:00
Michael Vogel	e1ecf48b8b	README file shortened because this was for my branch only.	2012-02-23 07:55:56 +01:00
Michael Vogel	9f92bbb04c	Removed the export of markdown articles. That was for testing purposes only.	2012-02-23 07:53:45 +01:00
friendica	808b886a3e	Merge branch 'master' into notify	2012-02-22 22:36:07 -08:00
friendica	3c6b127d40	nested quote check fails to account for strpos returning position 0	2012-02-22 20:58:04 -08:00
friendica	d75d49a4c1	restore poller normal operation	2012-02-22 20:31:33 -08:00
friendica	58a9c652de	Merge pull request #45 from annando/master ... New HTML to BBCode converter, changes to BBCode, nginx support, ...	2012-02-22 20:21:05 -08:00
friendica	8b2189f67f	Merge branch 'pull'	2012-02-22 19:58:01 -08:00
friendica	f9eddad44f	allow forum posts by followers on Diaspora	2012-02-22 19:56:28 -08:00
Michael	e34a648cad	German translation more gender friendly. Some more logging in poller.php	2012-02-22 15:20:49 +01:00
friendica	700b8d2031	Merge pull request #44 from simonlnu/master ... minor doc fix. there will be more ;)	2012-02-22 03:59:37 -08:00
Simon L'nu	4e3506fce3	clean up Groups help file. there was a stray 'Freindika' in it ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-02-22 06:05:48 -05:00
friendica	390eb15e7d	never enough documentation	2012-02-22 01:50:06 -08:00
friendica	a19ddb48ee	waitman gobble media upload via api patch	2012-02-21 23:35:50 -08:00
friendica	91c3349025	escape smiley conversion in code and pre blocks	2012-02-21 23:13:03 -08:00
friendica	9fe12d1724	some cleanup of tb notifications	2012-02-21 20:22:09 -08:00
friendica	53d3ee8852	new notifications	2012-02-21 19:03:55 -08:00
friendica	3f2497ad20	add full email link to notification	2012-02-21 18:10:15 -08:00
friendica	f03aaf554e	mark all notifications read	2012-02-21 16:59:57 -08:00
friendica	3e69b86bc1	Merge branch 'pull'	2012-02-21 14:32:17 -08:00
friendica	a97cb88b65	logger_debug was used as string instead of constant	2012-02-21 14:15:10 -08:00
fabrixxm	2904a3265a	Merge pull request #43 from fabrixxm/master ... Add support for variable filters in template	2012-02-21 02:38:52 -08:00
Fabio Comuni	01a2791e3a	template: add support for variable filters	2012-02-21 11:25:22 +01:00
friendica	5910fbf420	fill in notify msg with redirect link after we get the id	2012-02-21 00:02:42 -08:00
friendica	32d9008dd4	more cleanup of community followup detection. Remote worked well but local didn't.	2012-02-20 21:07:40 -08:00
friendica	b821399f00	email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes	2012-02-20 19:50:05 -08:00
friendica	6edd6d8ae1	Merge branch 'pull'	2012-02-20 18:07:16 -08:00
friendica	11871195be	fix twitter title showing up occasionally	2012-02-20 18:06:43 -08:00