git.mxchange.org Git - friendica.git/log

tommy tomson [Mon, 5 Mar 2012 21:31:03 +0000 (22:31 +0100)]

Simon [Mon, 5 Mar 2012 20:57:30 +0000 (12:57 -0800)]

Merge pull request #88 from simonlnu/master

multiple ui fixes

Simon L'nu [Mon, 5 Mar 2012 20:55:17 +0000 (15:55 -0500)]

multiple fixes; the jot-header works as standalone, not sure what's up.

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

Simon L'nu [Mon, 5 Mar 2012 18:17:40 +0000 (13:17 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

commit | commitdiff | tree

Simon [Mon, 5 Mar 2012 18:17:26 +0000 (10:17 -0800)]

Merge pull request #87 from simonlnu/master

contact_block.tpl link fix and dispy page parts

commit | commitdiff | tree

Simon L'nu [Mon, 5 Mar 2012 18:16:28 +0000 (13:16 -0500)]

tweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

Simon L'nu [Mon, 5 Mar 2012 17:23:16 +0000 (12:23 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

commit | commitdiff | tree

Simon [Mon, 5 Mar 2012 17:23:01 +0000 (09:23 -0800)]

Merge pull request #86 from simonlnu/master

more dispy

commit | commitdiff | tree

Simon L'nu [Mon, 5 Mar 2012 17:21:50 +0000 (12:21 -0500)]

still working on jot-header. amending <aside> and other elements

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

Simon L'nu [Mon, 5 Mar 2012 15:56:58 +0000 (10:56 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

commit | commitdiff | tree

Simon [Mon, 5 Mar 2012 15:56:43 +0000 (07:56 -0800)]

Merge pull request #85 from simonlnu/master

hopefully fix overflow issue now

commit | commitdiff | tree

Simon L'nu [Mon, 5 Mar 2012 15:55:26 +0000 (10:55 -0500)]

hopefully fix the overflow issue everywhere this time

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

Simon L'nu [Mon, 5 Mar 2012 15:17:34 +0000 (10:17 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
$name appearing on testbubble items
testbubble notifications

* master:

commit | commitdiff | tree

friendica [Mon, 5 Mar 2012 11:10:45 +0000 (03:10 -0800)]

$name appearing on testbubble items

commit | commitdiff | tree

friendica [Mon, 5 Mar 2012 08:54:25 +0000 (00:54 -0800)]

commit | commitdiff | tree

friendica [Mon, 5 Mar 2012 08:53:42 +0000 (00:53 -0800)]

testbubble notifications

commit | commitdiff | tree

Simon [Mon, 5 Mar 2012 06:09:56 +0000 (22:09 -0800)]

Merge pull request #84 from simonlnu/master

more ui bugs fixed \o/

commit | commitdiff | tree

Simon L'nu [Mon, 5 Mar 2012 06:08:54 +0000 (01:08 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
like dislike button
fixes in diabook

* master:

commit | commitdiff | tree

Simon L'nu [Mon, 5 Mar 2012 06:08:45 +0000 (01:08 -0500)]

yet more ui things, and bug fixing

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

tomtom84 [Mon, 5 Mar 2012 04:15:26 +0000 (20:15 -0800)]

Merge pull request #83 from tomtom84/master

fixes in diabook theme

commit | commitdiff | tree

tommy tomson [Mon, 5 Mar 2012 04:14:08 +0000 (05:14 +0100)]

commit | commitdiff | tree

Simon L'nu [Mon, 5 Mar 2012 03:20:42 +0000 (22:20 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  wrap title and text for editplain in zero and TB themes
  correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
  improved contrast in acl selector, and preview (darkzero)

* master:

commit | commitdiff | tree

Simon [Mon, 5 Mar 2012 03:19:45 +0000 (19:19 -0800)]

Merge pull request #80 from unary/darkzero

improved contrast in acl selector, and preview (darkzero)

commit | commitdiff | tree

Simon [Mon, 5 Mar 2012 03:19:08 +0000 (19:19 -0800)]

Merge pull request #82 from simonlnu/master

say hello to dispy's younger brother

commit | commitdiff | tree

Simon L'nu [Mon, 5 Mar 2012 03:16:10 +0000 (22:16 -0500)]

more ui thingies with dispy - we'll get you well dispy, we promise

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

friendica [Mon, 5 Mar 2012 03:15:42 +0000 (19:15 -0800)]

commit | commitdiff | tree

Simon L'nu [Mon, 5 Mar 2012 03:15:28 +0000 (22:15 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fixes in diabook
  unused replacement variable displays %1 in all html2bbcode 'code' blocks
  revup
  style.css fix

* master:

commit | commitdiff | tree

friendica [Mon, 5 Mar 2012 03:14:03 +0000 (19:14 -0800)]

wrap title and text for editplain in zero and TB themes

commit | commitdiff | tree

friendica [Mon, 5 Mar 2012 02:50:32 +0000 (18:50 -0800)]

correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode

commit | commitdiff | tree

tommy tomson [Mon, 5 Mar 2012 02:08:58 +0000 (03:08 +0100)]

commit | commitdiff | tree

tomtom84 [Mon, 5 Mar 2012 01:46:48 +0000 (17:46 -0800)]

Merge pull request #81 from tomtom84/master

fixes in diabook theme

commit | commitdiff | tree

tommy tomson [Mon, 5 Mar 2012 01:45:24 +0000 (02:45 +0100)]

commit | commitdiff | tree

friendica [Mon, 5 Mar 2012 00:26:16 +0000 (16:26 -0800)]

unused replacement variable displays %1 in all html2bbcode 'code' blocks

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 22:47:17 +0000 (17:47 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

commit | commitdiff | tree

Michael Johnston [Sun, 4 Mar 2012 22:29:00 +0000 (17:29 -0500)]

improved contrast in acl selector, and preview (darkzero)

commit | commitdiff | tree

friendica [Sun, 4 Mar 2012 21:39:53 +0000 (13:39 -0800)]

commit | commitdiff | tree

friendica [Sun, 4 Mar 2012 21:39:17 +0000 (13:39 -0800)]

commit | commitdiff | tree

Simon [Sun, 4 Mar 2012 20:54:57 +0000 (12:54 -0800)]

Merge pull request #79 from simonlnu/master

more UI fixes

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 20:52:50 +0000 (15:52 -0500)]

removed extra padding/border on tread-wrapper (heh, tea read :P)

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 20:27:10 +0000 (15:27 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

commit | commitdiff | tree

Simon [Sun, 4 Mar 2012 19:56:19 +0000 (11:56 -0800)]

Merge pull request #78 from simonlnu/master

fix ui issue with toolbar and notification icons

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 19:55:09 +0000 (14:55 -0500)]

fix up toolbar so the notifications line up better together

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 19:53:57 +0000 (14:53 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

commit | commitdiff | tree

Simon [Sun, 4 Mar 2012 17:22:51 +0000 (09:22 -0800)]

Merge pull request #77 from simonlnu/master

CSS and JS tweaks

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 17:21:08 +0000 (12:21 -0500)]

more tweakage. stylesheet and jot-header

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 17:19:43 +0000 (12:19 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
revup

* master:

commit | commitdiff | tree

tommy tomson [Sun, 4 Mar 2012 13:19:53 +0000 (14:19 +0100)]

commit | commitdiff | tree

friendica [Sun, 4 Mar 2012 10:26:13 +0000 (02:26 -0800)]

commit | commitdiff | tree

friendica [Sun, 4 Mar 2012 10:25:32 +0000 (02:25 -0800)]

commit | commitdiff | tree

Simon [Sun, 4 Mar 2012 10:20:57 +0000 (02:20 -0800)]

Merge pull request #76 from simonlnu/master

minor ui things

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 10:19:49 +0000 (05:19 -0500)]

soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 10:02:28 +0000 (05:02 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

commit | commitdiff | tree

Simon [Sun, 4 Mar 2012 10:02:15 +0000 (02:02 -0800)]

Merge pull request #75 from simonlnu/master

theme tweaks

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 10:00:35 +0000 (05:00 -0500)]

tweak wall items a bit (nasty-looking wall items...). jot-header tries to count chars and fails :P

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 09:58:12 +0000 (04:58 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
some fixes in diabook

* master:

commit | commitdiff | tree

tomtom84 [Sun, 4 Mar 2012 04:49:09 +0000 (20:49 -0800)]

Merge pull request #74 from tomtom84/master

fixes in diabook theme

commit | commitdiff | tree

tommy tomson [Sun, 4 Mar 2012 04:48:06 +0000 (05:48 +0100)]

some fixes in diabook

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 00:24:54 +0000 (19:24 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  tag fix
  fix
  navbar fix

* master:

commit | commitdiff | tree

Simon [Sun, 4 Mar 2012 00:23:07 +0000 (16:23 -0800)]

Merge pull request #73 from simonlnu/master

dispy! (and minor formatting)

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 00:20:23 +0000 (19:20 -0500)]

these are more finessing on formatting again

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

Simon L'nu [Sun, 4 Mar 2012 00:19:35 +0000 (19:19 -0500)]

first commit for dispy New Edition

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

tomtom84 [Sat, 3 Mar 2012 23:10:54 +0000 (15:10 -0800)]

Merge pull request #72 from tomtom84/master

fixes in diabook theme

commit | commitdiff | tree

tommy tomson [Sat, 3 Mar 2012 23:10:03 +0000 (00:10 +0100)]

commit | commitdiff | tree

tomtom84 [Sat, 3 Mar 2012 22:45:03 +0000 (14:45 -0800)]

Merge pull request #71 from tomtom84/master

fixes in diabook theme

commit | commitdiff | tree

tommy tomson [Sat, 3 Mar 2012 22:43:15 +0000 (23:43 +0100)]

commit | commitdiff | tree

tomtom84 [Sat, 3 Mar 2012 22:13:14 +0000 (14:13 -0800)]

Merge pull request #70 from tomtom84/master

fixes in diabook theme

commit | commitdiff | tree

tommy tomson [Sat, 3 Mar 2012 22:12:03 +0000 (23:12 +0100)]

commit | commitdiff | tree

Simon L'nu [Sat, 3 Mar 2012 21:49:22 +0000 (16:49 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
Added docblox default configuration file.
fixed apps css

* master:

commit | commitdiff | tree

Abinoam P. Marques Jr. [Sat, 3 Mar 2012 20:56:17 +0000 (12:56 -0800)]

Merge pull request #69 from abinoam/docblox

Added docblox default configuration file.

commit | commitdiff | tree

Abinoam P. Marques Jr [Sat, 3 Mar 2012 20:52:33 +0000 (16:52 -0400)]

Added docblox default configuration file.

Now docblox can be run without arguments on friendica root dir.
The documentation will be generated on ./data/output

commit | commitdiff | tree

tomtom84 [Sat, 3 Mar 2012 20:48:34 +0000 (12:48 -0800)]

Merge pull request #68 from tomtom84/master

fixes in diabook theme

commit | commitdiff | tree

tommy tomson [Sat, 3 Mar 2012 20:45:59 +0000 (21:45 +0100)]

commit | commitdiff | tree

Simon L'nu [Sat, 3 Mar 2012 18:39:56 +0000 (13:39 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
fixed star/unstar
fixed admin fixed editor

* master:

commit | commitdiff | tree

tomtom84 [Sat, 3 Mar 2012 18:09:28 +0000 (10:09 -0800)]

Merge pull request #67 from tomtom84/master

fixes in diabook theme

commit | commitdiff | tree

tommy tomson [Sat, 3 Mar 2012 18:07:55 +0000 (19:07 +0100)]

commit | commitdiff | tree

tomtom84 [Sat, 3 Mar 2012 15:54:21 +0000 (07:54 -0800)]

Merge pull request #66 from tomtom84/master

fixed editor and admin-sec in theme diabook

commit | commitdiff | tree

tommy tomson [Sat, 3 Mar 2012 15:49:48 +0000 (16:49 +0100)]

fixed admin
fixed editor

commit | commitdiff | tree

Simon L'nu [Sat, 3 Mar 2012 14:45:32 +0000 (09:45 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
fix editor

* master:

commit | commitdiff | tree

tomtom84 [Sat, 3 Mar 2012 14:03:34 +0000 (06:03 -0800)]

Merge pull request #65 from tomtom84/master

fix editor in theme diabook

commit | commitdiff | tree

tommy tomson [Sat, 3 Mar 2012 14:01:25 +0000 (15:01 +0100)]

commit | commitdiff | tree

Simon L'nu [Sat, 3 Mar 2012 13:05:53 +0000 (08:05 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix text-editor in theme
  german strings as of 28th Feb from transilex
  small fix in style.css
  fix star/unstar
  fixes in wall_item.tpl and style.css in theme diabook
  fix in wall_item.tpl new icon link.png
  add diabook to default themes
  fixed broken tags and notifications in theme

* master:

commit | commitdiff | tree

tomtom84 [Sat, 3 Mar 2012 12:30:31 +0000 (04:30 -0800)]

Merge pull request #64 from tomtom84/master

fix editor in theme diabook

commit | commitdiff | tree

tommy tomson [Sat, 3 Mar 2012 12:27:39 +0000 (13:27 +0100)]

fix text-editor in theme

commit | commitdiff | tree

Tobias Diekershoff [Sat, 3 Mar 2012 11:17:32 +0000 (12:17 +0100)]

german strings as of 28th Feb from transilex

commit | commitdiff | tree

tomtom84 [Sat, 3 Mar 2012 05:02:55 +0000 (21:02 -0800)]

Merge pull request #63 from tomtom84/master

fixes in diabook theme

commit | commitdiff | tree

tommy tomson [Sat, 3 Mar 2012 05:00:46 +0000 (06:00 +0100)]

small fix in style.css

commit | commitdiff | tree

tommy tomson [Sat, 3 Mar 2012 03:45:34 +0000 (04:45 +0100)]

commit | commitdiff | tree

friendica [Sat, 3 Mar 2012 03:32:34 +0000 (19:32 -0800)]

Merge pull request #62 from tomtom84/master

fixes in diabook theme

commit | commitdiff | tree

tommy tomson [Sat, 3 Mar 2012 03:27:06 +0000 (04:27 +0100)]

fixes in wall_item.tpl and style.css in theme diabook

commit | commitdiff | tree

tommy tomson [Sat, 3 Mar 2012 00:52:53 +0000 (01:52 +0100)]

fix in wall_item.tpl
new icon link.png

commit | commitdiff | tree

friendica [Sat, 3 Mar 2012 00:24:26 +0000 (16:24 -0800)]

add diabook to default themes

commit | commitdiff | tree

Simon L'nu [Sat, 3 Mar 2012 00:09:17 +0000 (19:09 -0500)]

minor formatting issues

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

commit | commitdiff | tree

Simon L'nu [Sat, 3 Mar 2012 00:05:41 +0000 (19:05 -0500)]

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
fix @mention autocomplete in comments
template proc: fix variables regexp

* master:

commit | commitdiff | tree

Simon [Sat, 3 Mar 2012 00:02:02 +0000 (16:02 -0800)]

Merge pull request #61 from fabrixxm/master

fix to variable rexexp and mentions autocomplete in comments

commit | commitdiff | tree

tommy tomson [Fri, 2 Mar 2012 23:41:02 +0000 (00:41 +0100)]

fixed broken tags and notifications in theme

commit | commitdiff | tree

Fabio Comuni [Fri, 2 Mar 2012 23:12:45 +0000 (00:12 +0100)]

fix @mention autocomplete in comments

commit | commitdiff | tree

Fabio Comuni [Fri, 2 Mar 2012 23:06:44 +0000 (00:06 +0100)]

Merge remote-tracking branch 'friendica/master'