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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-30	1	-1/+1
\|\
\| *	Friendicaland - you can't 'live' on a demo server.	Thomas Willingham	2012-05-30	1	-1/+1
\| \|
* \|	transition to beta for private forums	friendica	2012-05-30	2	-3/+0
\| \|
* \|	rev update	friendica	2012-05-30	3	-168/+172
\| \|
* \|	Create a "potential default group" called "Friends" on registration.	friendica	2012-05-30	1	-0/+5
\| \|
* \|	fix private photos that also have a size specification	friendica	2012-05-30	1	-2/+2
\|/
*	private group tests, cont.	friendica	2012-05-29	8	-24/+54
\|
*	hide private group if desired	friendica	2012-05-29	2	-6/+14
\|
*	prvgroup should see intros	friendica	2012-05-29	1	-1/+1
\|
*	private group fix	friendica	2012-05-29	1	-1/+1
\|
*	possible sql injection in search	friendica	2012-05-29	2	-3/+3
\|
*	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-29	13	-111/+197
\|\ \| \| \| \| \| \| \| \|	Conflicts: mod/search.php
\| *	Merge pull request #316 from annando/master	Simon	2012-05-29	7	-78/+148
\| \|\ \| \| \| \| \| \|	Speed improvements
\| \| *	MySQL-Fulltext search option is disabled by default	Michael Vogel	2012-05-29	1	-1/+1
\| \| \|
\| \| *	Disabled logging of SQL statements	Michael Vogel	2012-05-29	1	-4/+4
\| \| \|
\| \| *	Merge remote branch 'upstream/master'	Michael Vogel	2012-05-29	27	-655/+660
\| \| \|\
\| \| * \	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
\| \| \| \|\ \ \
\| \| \| * \ \ \	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
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Performance tests	Michael Vogel	2012-05-20	4	-10/+19
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote branch 'upstream/master'	Michael Vogel	2012-05-19	26	-665/+1036
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	Michael Vogel	2012-05-16	109	-12544/+17543
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	Michael Vogel	2012-05-09	854	-82504/+27120
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: RSS-Feeds are now shortened to 1000 characters. (With added link)	Michael Vogel	2012-04-22	1	-45/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'upstream/master'	Michael Vogel	2012-04-21	864	-4473/+154113
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge commit 'upstream/master'	Michael Vogel	2012-04-15	162	-136/+8652
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge pull request #317 from CatoTH/master	Simon	2012-05-29	1	-6/+11
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Events: additional hooks, and a bugfix
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add two hooks, event_created and event_updated. One Bugfix for the ↵	Tobias Hößl	2012-05-29	1	-6/+11
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	<id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #318 from simonlnu/master	Simon	2012-05-29	5	-28/+38
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix toolbar; more size dynamicism
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix toolbar. more size dynamicism	Simon L'nu	2012-05-29	5	-28/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-29	0	-0/+0
\| \|/ / / / / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: ability to only expire contacts, not self Provide backend option to only expire other peoples' conversations. more theme cleanup rev update * master:
* / / / / / / / / / / / / / / / / /	bugfixes: private photo embeds and search for strings with %	friendica	2012-05-29	4	-148/+154
\|/ / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \