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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote branch 'upstream/master'	Michael Vogel	2012-05-29	27	-655/+660
\|\
\| *	ability to only expire contacts, not self	friendica	2012-05-29	4	-5/+10
\| \|
\| *	Provide backend option to only expire other peoples' conversations.	friendica	2012-05-28	1	-1/+8
\| \|
\| *	more theme cleanup	friendica	2012-05-28	4	-2/+24
\| \|
\| *	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-28	11	-294/+172
\| \|\
\| \| *	Merge pull request #315 from simonlnu/master	Simon	2012-05-28	11	-294/+172
\| \| \|\ \| \| \| \| \| \| \| \|	fixed font-size/line-height stuffs
\| \| \| *	fixed font-size/line-height stuffs	Simon L'nu	2012-05-28	11	-294/+172
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-28	11	-76/+168
\| \| \| \|\ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: slackr - tone down the shadows a smidgin add plugin hooks to gender, sexpref, and marital selectors birthday in november,december bug rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. handle multiple underscores in D* links * master:
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-26	3	-88/+89
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: more ssl policy stuff allow force ssl on notifications * master:
\| \| \| * \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-26	12	-499/+543
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: missing entries on personal tab after sql text search optimise bug #434 - default group placement not working after accepting dfrn friend request fix wall_uploaded photo permissions on group post by member improve location change notifications keep private FB stuff out of personal notes rev update DE update to strings and templates * master:
\| \| \| * \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-24	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fix small js error when user not logged in install wizard: fix php executable path - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect * master:
\| * \| \| \| \|	rev update	friendica	2012-05-28	3	-202/+202
\| \|/ / / /
\| * \| \| \|	slackr - tone down the shadows a smidgin	friendica	2012-05-27	1	-4/+9
\| \| \| \| \|
\| * \| \| \|	add plugin hooks to gender, sexpref, and marital selectors	friendica	2012-05-27	1	-0/+7
\| \| \| \| \|
\| * \| \| \|	birthday in november,december bug	friendica	2012-05-27	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	rework the way private photos are embedded to avoid url differences and also ↵	friendica	2012-05-27	6	-69/+142
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	check the permissions if possible to make sure that nothing sneaks by.
\| * \| \| \|	handle multiple underscores in D* links	friendica	2012-05-26	2	-1/+8
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	more ssl policy stuff	friendica	2012-05-26	1	-15/+12
\| \| \| \|
\| * \| \|	allow force ssl on notifications	friendica	2012-05-26	3	-73/+77
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'master' of github.com:annando/friendica	Michael Vogel	2012-05-26	8	-46/+67
\|\ \ \
\| * \ \	Merge branch 'master' of github.com:annando/friendica	Michael	2012-05-26	7	-31/+76
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/network.php
\| * \ \ \	Merge remote branch 'upstream/master'	Michael	2012-05-26	65	-1886/+2705
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	missing entries on personal tab after sql text search optimise	friendica	2012-05-25	2	-7/+6
\| \| \| \| \|
\| \| * \| \|	bug #434 - default group placement not working after accepting dfrn friend ↵	friendica	2012-05-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	request
\| \| * \| \|	fix wall_uploaded photo permissions on group post by member	friendica	2012-05-25	1	-1/+3
\| \| \| \| \|
\| \| * \| \|	improve location change notifications	friendica	2012-05-25	1	-1/+10
\| \| \| \| \|
\| \| * \| \|	keep private FB stuff out of personal notes	friendica	2012-05-25	3	-39/+50
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of github.com:annando/friendica	Michael	2012-05-19	915	-87935/+37921
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' of github.com:annando/friendica	Michael	2012-05-16	981	-4562/+162753
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote branch 'upstream/master'	Michael	2012-04-14	98	-911/+2464
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge remote branch 'upstream/master'	Michael	2012-04-13	92	-12077/+2089
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	Michael	2012-04-11	133	-1946/+2921
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' of github.com:annando/friendica	Michael	2012-04-11	2186	-18156/+97640
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	Michael	2012-03-03	41	-273/+2646
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	Michael	2012-03-02	13	-69/+50
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	Michael	2012-03-02	50	-741/+1128
\| \|\ \ \ \ \ \ \ \ \ \ \ \
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Doing negative caching for config values, special logfile for database ↵	Michael Vogel	2012-05-26	2	-4/+26
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	optmisations
* \| \| \| \| \| \| \| \| \| \| \| \|	Saved searches now can search for tags as well	Michael Vogel	2012-05-26	2	-6/+17
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Deactivating the test output in db engine	Michael Vogel	2012-05-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Speed optimisation by enabling the posibility of the MySQL fulltext engine	Michael Vogel	2012-05-26	5	-18/+43
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote branch 'upstream/master'	Michael Vogel	2012-05-25	64	-1873/+2671
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-25	10	-444/+450
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	DE update to strings and templates	Tobias Diekershoff	2012-05-25	3	-397/+419
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #313 from fabrixxm/master	Simon	2012-05-24	3	-5/+7
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	install wizard: fix php executable path
\| \| \| * \| \| \| \| \| \| \| \| \| \|	fix small js error when user not logged in	root	2012-05-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \|	install wizard: fix php executable path	root	2012-05-24	2	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #314 from simonlnu/master	Simon	2012-05-24	4	-42/+24
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update dark a bit. i messed up some buttons
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	update dark a bit. i messed up some buttons	Simon L'nu	2012-05-24	4	-42/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-24	0	-0/+0
\| \| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: slackr: improve interactivity slackr: hide calendar when posting more theme stuff * master:
\| * / / / / / / / / / / / /	rev update	friendica	2012-05-25	4	-89/+90
\| \|/ / / / / / / / / / / /