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

	Commit message (Expand)	Author	Age	Files	Lines
...
\| \| * \| \| \|	Resolving merge conflict	Haakon Meland Eriksen	2015-11-29	9	-302/+49
\| \| * \| \| \|	My version of jot.tpl	Haakon Meland Eriksen	2015-11-28	1	-49/+58
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-28	27	-4462/+4962
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Removed my version of jot.tpl	Haakon Meland Eriksen	2015-11-28	31	-2752/+2496
\| \| * \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-24	9	-42/+96
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-23	7	-5/+59
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Documenting the need to change database server address from 127.0.0.1 to loca...	Haakon Meland Eriksen	2015-11-22	1	-1/+1
\| \| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-22	4	-346/+886
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-21	4	-2/+11
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-21	3	-6/+25
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-21	9	-27/+75
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Space between Preview and Submit in jot.tpl	Haakon Meland Eriksen	2015-11-20	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Space between Preview and Submit in jot.tpl	Haakon Meland Eriksen	2015-11-20	1	-0/+2
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-20	20	-4575/+4735
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-10/+3
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-3/+5
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-6/+8
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-6/+6
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-20	13	-13/+65
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-19	6	-3/+19
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-19	2	-4/+4
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-19	26	-5770/+16731
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-18	4	-9/+10
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-18	3	-3/+25
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-18	10	-19/+23
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-17	14	-233/+622
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-16	10	-26/+51
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-15	7	-1138/+1160
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-14	4	-533/+543
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorder buttons HME	Haakon Meland Eriksen	2015-11-13	1	-45/+43
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding original jot.tpl from GitHub	Haakon Meland Eriksen	2015-11-13	1	-49/+54
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-13	16	-10/+132
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorder buttons	Haakon Meland Eriksen	2015-11-13	1	-53/+48
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reverted changes - got white screen	Haakon Meland Eriksen	2015-11-13	1	-47/+52
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Regrouped post buttons	Haakon Meland Eriksen	2015-11-13	1	-7/+8
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Regrouped post buttons	Haakon Meland Eriksen	2015-11-13	1	-3/+0
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Regrouped post buttons	Haakon Meland Eriksen	2015-11-12	1	-21/+12
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Regrouped post buttons	Haakon Meland Eriksen	2015-11-12	1	-31/+29
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-12	5	-10/+34
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make upload and encrypt easier on phones by editing jot.tpl	Haakon Meland Eriksen	2015-11-12	1	-13/+11
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Promoted upload of images and encryption	Haakon Meland Eriksen	2015-11-11	1	-0/+10
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rearranged comment buttons back	Haakon Meland Eriksen	2015-11-11	1	-13/+10
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rearranged comment buttons	Haakon Meland Eriksen	2015-11-11	1	-10/+13
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	version and string update	redmatrix	2015-12-05	2	-322/+363
\|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add hubzilla.nl as fallback	redmatrix	2015-12-03	1	-1/+2
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-12-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	srand() is for seeding the PRNG. You want rand() here.	ken restivo	2015-12-03	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove non-working directory server from the project fallback list.	redmatrix	2015-12-03	1	-1/+0
\|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use the std_version where applicable instead of matching to the git.	redmatrix	2015-12-03	2	-7/+7