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-12	22	-6589/+4277
\|\
\| *	Merge pull request #295 from simonlnu/master	Simon	2012-05-12	11	-54/+89
\| \|\ \| \| \| \| \| \|	css fixes; new screenshots
\| \| *	css fixes; new screenshots	Simon L'nu	2012-05-12	11	-54/+89
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-12	4	-391/+575
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Ĝisdatigis la esperantlingvan tradukaĵon al 100%. * master:
\| * \|	Merge pull request #294 from mschmitt/master	friendica	2012-05-12	4	-391/+575
\| \|\ \ \| \| \| \| \| \| \| \|	Esperanto at 100% again
\| \| * \|	Ĝisdatigis la esperantlingvan tradukaĵon al 100%.	Martin Schmitt	2012-05-12	4	-391/+575
\| \| \| \|
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-12	0	-0/+0
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: diabook-theme: fix in earthlayers diabook-theme: some fixes * master:
\| * \|	diabook-theme: fix in earthlayers	tommy tomson	2012-05-12	3	-29/+26
\| \| \|
\| * \|	diabook-theme: some fixes	tommy tomson	2012-05-12	3	-0/+519
\| \| \|
\| * \|	Merge pull request #293 from simonlnu/master	Simon	2012-05-12	8	-6152/+3105
\| \|\ \ \| \| \|/ \| \|/\|	finished migrating dispy light - maybe
\| \| *	finished migrating dispy light - maybe	Simon L'nu	2012-05-12	8	-6152/+3105
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-11	22	-323/+1737
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Darkzero - fixed notifications bar. diabook-theme: update mapquery and small fix diabook-theme: add "population density 2010"-layer to EarthLayers-box fix search/new against possible email leakage better test of email reply visibility diabook-theme:small fix moderated comment templates diabook-theme: small fix diabook-theme: include prv_message autocomplete fix PM replies after autocomplete changes add photos to PM autocomplete, improved appearance rev update diabook-theme: small fix * master:
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-10	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Diabook-dark. More touchups. specified background image does not exist diabook-theme: some fixes priv mail autocomplete, improved contrast for darkzero, etc. email autocomplete diabook-theme: some css/bug-fixes * master:
* \| \|	slackr drop shadows	friendica	2012-05-12	3	-63/+64
\| \| \|
* \| \|	language detection library	friendica	2012-05-12	11	-0/+4713
\| \| \|
* \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-12	8	-156/+1040
\|\\| \|
\| * \|	Darkzero - fixed notifications bar.	Thomas Willingham	2012-05-12	1	-0/+14
\| \| \|
\| * \|	diabook-theme: update mapquery and small fix	tommy tomson	2012-05-11	5	-158/+596
\| \| \|
\| * \|	diabook-theme: add "population density 2010"-layer to EarthLayers-box	tommy tomson	2012-05-11	5	-16/+448
\| \| \|
* \| \|	rev update	friendica	2012-05-12	2	-228/+229
\|/ /
* \|	fix search/new against possible email leakage	friendica	2012-05-11	1	-0/+3
\| \|
* \|	better test of email reply visibility	friendica	2012-05-11	2	-3/+3
\| \|
* \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-11	2	-1/+63
\|\ \
\| * \|	diabook-theme:small fix	tommy tomson	2012-05-11	2	-1/+63
\| \| \|
* \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-11	2	-81/+41
\|\\| \|
\| * \|	diabook-theme: small fix	tommy tomson	2012-05-11	1	-81/+1
\| \| \|
\| * \|	diabook-theme: include prv_message autocomplete	tommy tomson	2012-05-11	1	-0/+40
\| \| \|
* \| \|	moderated comment templates	friendica	2012-05-11	5	-0/+112
\|/ /
* \|	fix PM replies after autocomplete changes	friendica	2012-05-10	2	-3/+10
\| \|
* \|	add photos to PM autocomplete, improved appearance	friendica	2012-05-10	3	-3/+401
\| \|
* \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-10	4	-15/+18
\|\ \
\| * \|	Merge remote-tracking branch 'origin/master'	tommy tomson	2012-05-11	3	-9/+12
\| \|\\|
\| \| *	Diabook-dark. More touchups.	Thomas Willingham	2012-05-10	2	-8/+11
\| \| \|
\| * \|	diabook-theme: small fix	tommy tomson	2012-05-11	2	-7/+7
\| \| \|
* \| \|	rev update	friendica	2012-05-10	2	-91/+79
\| \|/ \|/\|
* \|	specified background image does not exist	friendica	2012-05-10	1	-1/+1
\|/
*	diabook-theme: some fixes	tommy tomson	2012-05-10	5	-50/+55
\|
*	priv mail autocomplete, improved contrast for darkzero, etc.	friendica	2012-05-10	1	-2/+1
\|
*	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-10	20	-56/+49
\|\
\| *	Merge remote-tracking branch 'origin/master'	tommy tomson	2012-05-10	2	-7/+13
\| \|\
\| \| *	Merge pull request #292 from simonlnu/master	Simon	2012-05-09	2	-7/+13
\| \| \|\ \| \| \| \| \| \| \| \|	don't make -desc so obnoxious looking
\| \| \| *	don't make -desc so obnoxious looking	Simon L'nu	2012-05-10	2	-7/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-10	2	-61/+73
\| \| \| \|\ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: rev update rev update * master:
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-09	16	-486/+650
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: send browser back to correct page (with query args) after posting slight improvement in a couple of queries Diabook-dark - do things the right way instead of the stupid way. Fix TinyMCE, but needs adding to theme.php Fix jquery.fancybox, but still needs adding to theme.php Diabook-dark cleaned up a bit. don't provide 'show more' on remote friends in common unless there are actually more make it optional to optimize the item table after expire wrap private message autocomplete in an ifdef to make it easier to test/develop DE update for the strings make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation * master:
\| \| \| * \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-07	14	-360/+598
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: finished dry run - now for real test diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie. don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of stuck processes trying to connect with dead or dying servers significantly. separate poll_interval from delivery_interval - default is the same. * master:
\| \| \| * \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-07	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: reset permissions to forum default when adding forum delivery chain * master:
\| * \| \| \| \|	diabook-theme: some css/bug-fixes	tommy tomson	2012-05-10	18	-49/+36
\| \|/ / / /
* / / / /	email autocomplete	friendica	2012-05-10	3	-18/+69
\|/ / / /
* \| \| \|	rev update	friendica	2012-05-09	1	-1/+1
\| \| \| \|
* \| \| \|	rev update	friendica	2012-05-09	2	-61/+73
\| \|_\|/ \|/\| \|