volse-hubzilla.git - Volse Hubzilla -- soft fork of main Hubzilla core for Volse

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-02-23	1	-21/+0
\|\
\| *	quattro-green: removed contact_template.tpl	Tobias Diekershoff	2012-02-23	1	-21/+0
\| \|
* \|	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-02-23	3	-23/+43
\|\\|
\| *	green-quattro: applied a color for shiny class and preview	Tobias Diekershoff	2012-02-23	2	-22/+42
\| \|
\| *	Merge pull request #46 from fabrixxm/master	fabrixxm	2012-02-23	15	-134/+273
\| \|\ \| \| \| \| \| \|	more work on quattro theme and less html in php
\| * \|	fix img tag with size attribute	Tobias Diekershoff	2012-02-23	1	-1/+1
\| \| \|
* \| \|	quattro: fix typos	Fabio Comuni	2012-02-23	2	-4/+5
\| \|/ \|/\|
* \|	quattro post preview, style contacts pages, style for "shiny" class, fix ↵	Fabio Comuni	2012-02-23	15	-134/+273
\|/ \| \| \| \| \| \|	contacts list in profile aside. remove html from viewcontacts.php and contacts.php use contact_template.tpl to print contacts also in viewcontacts
*	Merge branch 'master' into notify	friendica	2012-02-23	5	-5/+155
\|\
\| *	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-02-23	2	-5/+2
\| \|\
\| \| *	README file shortened because this was for my branch only.	Michael Vogel	2012-02-23	1	-3/+0
\| \| \|
\| \| *	Removed the export of markdown articles. That was for testing purposes only.	Michael Vogel	2012-02-23	1	-2/+2
\| \| \|
\| * \|	quattro: added styling to pivate message view	Tobias Diekershoff	2012-02-23	3	-0/+153
\| \|/
* \|	more theme notify fixes	friendica	2012-02-23	2	-1/+2
\| \|
* \|	new notify sort of working in testbubble	friendica	2012-02-22	6	-3/+52
\| \|
* \|	Merge branch 'master' into notify	friendica	2012-02-22	23	-704/+1377
\|\\|
\| *	nested quote check fails to account for strpos returning position 0	friendica	2012-02-22	1	-2/+2
\| \|
\| *	restore poller normal operation	friendica	2012-02-22	1	-2/+2
\| \|
\| *	Merge pull request #45 from annando/master	friendica	2012-02-22	16	-689/+1257
\| \|\ \| \| \| \| \| \|	New HTML to BBCode converter, changes to BBCode, nginx support, ...
\| \| *	German translation more gender friendly. Some more logging in poller.php	Michael	2012-02-22	7	-11/+26
\| \| \|
\| \| *	Fetched some missing styles from testbubble.	Michael	2012-02-20	2	-0/+395
\| \| \|
\| \| *	Some testing stuff	Michael	2012-02-20	2	-1/+2
\| \| \|
\| \| *	API is now working on my nginx server.	Michael	2012-02-20	3	-12/+24
\| \| \|
\| \| *	New version of markdown. Playing with stylesheet. Testing line breaks.	root	2012-02-19	3	-504/+404
\| \| \|
\| \| *	Handling nested bbcodes. Some small design changes in html2bbcode. Change in ↵	Michael	2012-02-19	3	-23/+35
\| \| \| \| \| \| \| \| \| \| \| \|	poller.php is just for testing purposes.
\| \| *	README added	Michael	2012-02-19	1	-0/+3
\| \| \|
\| \| *	Brand new html2bbcode. Some other changes in diaspora to bbcode handling	Michael	2012-02-19	3	-158/+322
\| \| \|
\| \| *	Many small changes	Michael	2012-02-19	1	-23/+0
\| \| \|
\| \| *	Merge remote branch 'upstream/master'	Michael	2012-02-19	161	-7793/+23085
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/theme/vier/style.css
\| \| * \|	New theme "vier" derives from "quattro"	ike	2012-02-19	11	-0/+4270
\| \| \| \|
\| * \| \|	Merge branch 'pull'	friendica	2012-02-22	1	-1/+1
\| \|\ \ \
\| \| * \ \	Merge pull request #44 from simonlnu/master	friendica	2012-02-22	1	-1/+1
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	minor doc fix. there will be more ;)
\| \| \| * \| \|	clean up Groups help file. there was a stray 'Freindika' in it	Simon L'nu	2012-02-22	1	-1/+1
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \| \| \|	allow forum posts by followers on Diaspora	friendica	2012-02-22	2	-8/+20
\| \| \| \| \|
\| * \| \| \|	never enough documentation	friendica	2012-02-22	1	-0/+9
\| \|/ / /
\| * \| \|	waitman gobble media upload via api patch	friendica	2012-02-21	2	-5/+61
\| \| \| \|
\| * \| \|	escape smiley conversion in code and pre blocks	friendica	2012-02-21	1	-0/+17
\| \| \| \|
\| * \| \|	mark all notifications read	friendica	2012-02-21	3	-3/+14
\| \| \| \|
* \| \| \|	some cleanup of tb notifications	friendica	2012-02-21	2	-1/+6
\| \| \| \|
* \| \| \|	new notifications	friendica	2012-02-21	1	-0/+25
\| \| \| \|
* \| \| \|	add full email link to notification	friendica	2012-02-21	1	-3/+3
\|/ / /
* \| \|	Merge branch 'pull'	friendica	2012-02-21	1	-2/+26
\|\ \ \
\| * \ \	Merge pull request #43 from fabrixxm/master	fabrixxm	2012-02-21	1	-2/+26
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Add support for variable filters in template
\| \| * \| \|	template: add support for variable filters	Fabio Comuni	2012-02-21	1	-2/+26
\| \|/ / /
* / / /	logger_debug was used as string instead of constant	friendica	2012-02-21	2	-6/+6
\|/ / /
* \| \|	fill in notify msg with redirect link after we get the id	friendica	2012-02-21	1	-9/+16
\| \| \|
* \| \|	more cleanup of community followup detection. Remote worked well but local ↵	friendica	2012-02-20	1	-4/+13
\| \| \| \| \| \| \| \| \| \| \| \|	didn't.
* \| \|	email notify now redirected through mod_notify, weirdness in local deliver ↵	friendica	2012-02-20	6	-7/+72
\| \| \| \| \| \| \| \| \| \| \| \|	caused by community page changes
* \| \|	Merge branch 'pull'	friendica	2012-02-20	27	-51/+50
\|\ \ \
\| * \ \	Merge pull request #42 from friendica/ka2ca-rebased	friendica	2012-02-20	25	-45/+45
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Replaced some ocurrences of Friendika --> Friendica