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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-10-01	2	-5/+5
\|\
\| *	allow additional uses for xtags	redmatrix	2015-10-01	2	-5/+5
* \|	Merge pull request #66 from HaakonME/master	redmatrix	2015-10-02	18	-7716/+8321
\|\ \
\| * \|	Small fix to deploy	Haakon Meland Eriksen	2015-10-01	1	-1/+1
\| * \|	Small fix to deploy	Haakon Meland Eriksen	2015-10-01	1	-1/+1
\| * \|	Changed deploy script - removed hot_deploy and changed poller to every 10 min...	Haakon Meland Eriksen	2015-10-01	1	-7/+7
\| * \|	Updated Norwegian strings for Hubzilla	Haakon Meland Eriksen	2015-10-01	1	-1502/+1560
\| * \|	Updated Norwegian string for Hubzilla	Haakon Meland Eriksen	2015-10-01	1	-6214/+6500
\| * \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-10-01	13	-21033/+22308
\| \|\ \
\| * \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-30	84	-3019/+137693
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-25	10	-19/+140
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-24	22	-150/+318
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-23	2	-2/+24
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-22	13	-6/+128
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-22	7	-146/+188
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-21	9	-27/+63
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Removed hot_deploy	Haakon Meland Eriksen	2015-09-20	1	-0/+0
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-20	3	-18/+66
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-19	14	-20/+122
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Added hot_deploy directly to .openshift/makers/hot_deploy	Haakon Meland Eriksen	2015-09-18	1	-0/+0
\| * \| \| \| \| \| \| \| \| \| \| \|	Added hot_deploy to deploy script - fixed echo	Haakon Meland Eriksen	2015-09-18	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-18	75	-761/+964
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Added hot_deploy to deploy script	Haakon Meland Eriksen	2015-09-18	1	-0/+16
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-11	64	-833/+1535
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed old poller	Haakon Meland Eriksen	2015-09-04	1	-10/+0
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Updating OpenShift deploy script	Haakon Meland Eriksen	2015-09-04	1	-0/+24
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-03	34	-708/+1358
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-01	16	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix filename	Haakon Meland Eriksen	2015-09-01	1	-2/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed deploy script	Haakon Meland Eriksen	2015-09-01	1	-8/+37
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-01	1	-2/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added openshift-hubzilla-deploy to .openshift/action_hooks/deploy	Haakon Meland Eriksen	2015-09-01	1	-0/+110
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-01	47	-663/+722
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-08-27	23	-1165/+1188
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-08-23	33	-238/+532
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-08-19	45	-11403/+20389
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-08-06	13	-117/+114
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hubzilla addons added	Haakon Meland Eriksen	2015-08-03	1	-0/+5
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-08-03	19	-3273/+209
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-07-29	97	-1293/+1407
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-07-08	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-07-07	11	-9/+206
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added cron script to exexute poller every 5 minutes	Haakon Meland Eriksen	2015-07-05	1	-0/+10
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'openshift/master'	Haakon Meland Eriksen	2015-07-05	14	-0/+78
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creating template	Template builder	2015-07-05	15	-0/+352
\| \| / / / / / / / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-10-01	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update cert authorities	redmatrix	2015-10-01	3	-3/+3
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #65 from tuscanhobbit/master	Wave	2015-10-01	2	-17/+17
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More updates on Italian translation from transifex	Paolo Tacconi	2015-10-01	2	-17/+17
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #64 from tuscanhobbit/master	Wave	2015-10-01	2	-7589/+7886
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|