]>
git.mxchange.org Git - friendica.git/log
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 sidebarSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Mon, 5 Mar 2012 17:23:16 +0000 (12:23 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Mon, 5 Mar 2012 17:23:01 +0000 (09:23 -0800)]
Merge pull request #86 from simonlnu/master
Simon L'nu [Mon, 5 Mar 2012 17:21:50 +0000 (12:21 -0500)]
still working on jot-header. amending <aside> and other elementsSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Mon, 5 Mar 2012 15:56:58 +0000 (10:56 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Mon, 5 Mar 2012 15:56:43 +0000 (07:56 -0800)]
Merge pull request #85 from simonlnu/master
Simon L'nu [Mon, 5 Mar 2012 15:55:26 +0000 (10:55 -0500)]
hopefully fix the overflow issue everywhere this timeSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Mon, 5 Mar 2012 15:17:34 +0000 (10:17 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Mon, 5 Mar 2012 11:10:45 +0000 (03:10 -0800)]
$name appearing on testbubble items
friendica [Mon, 5 Mar 2012 08:54:25 +0000 (00:54 -0800)]
Merge branch 'pull'
friendica [Mon, 5 Mar 2012 08:53:42 +0000 (00:53 -0800)]
testbubble notifications
Simon [Mon, 5 Mar 2012 06:09:56 +0000 (22:09 -0800)]
Merge pull request #84 from simonlnu/master
Simon L'nu [Mon, 5 Mar 2012 06:08:54 +0000 (01:08 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 5 Mar 2012 06:08:45 +0000 (01:08 -0500)]
yet more ui things, and bug fixingSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
tomtom84 [Mon, 5 Mar 2012 04:15:26 +0000 (20:15 -0800)]
Merge pull request #83 from tomtom84/master
tommy tomson [Mon, 5 Mar 2012 04:14:08 +0000 (05:14 +0100)]
like dislike button
Simon L'nu [Mon, 5 Mar 2012 03:20:42 +0000 (22:20 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Mon, 5 Mar 2012 03:19:45 +0000 (19:19 -0800)]
Merge pull request #80 from unary/darkzero
Simon [Mon, 5 Mar 2012 03:19:08 +0000 (19:19 -0800)]
Merge pull request #82 from simonlnu/master
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 promiseSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
friendica [Mon, 5 Mar 2012 03:15:42 +0000 (19:15 -0800)]
Merge branch 'pull'
Simon L'nu [Mon, 5 Mar 2012 03:15:28 +0000 (22:15 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Mon, 5 Mar 2012 03:14:03 +0000 (19:14 -0800)]
wrap title and text for editplain in zero and TB themes
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
tommy tomson [Mon, 5 Mar 2012 02:08:58 +0000 (03:08 +0100)]
fixes in diabook
tomtom84 [Mon, 5 Mar 2012 01:46:48 +0000 (17:46 -0800)]
Merge pull request #81 from tomtom84/master
tommy tomson [Mon, 5 Mar 2012 01:45:24 +0000 (02:45 +0100)]
fixes in diabook
friendica [Mon, 5 Mar 2012 00:26:16 +0000 (16:26 -0800)]
unused replacement variable displays %1 in all html2bbcode 'code' blocks
Simon L'nu [Sun, 4 Mar 2012 22:47:17 +0000 (17:47 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Michael Johnston [Sun, 4 Mar 2012 22:29:00 +0000 (17:29 -0500)]
improved contrast in acl selector, and preview (darkzero)
friendica [Sun, 4 Mar 2012 21:39:53 +0000 (13:39 -0800)]
Merge branch 'pull'
friendica [Sun, 4 Mar 2012 21:39:17 +0000 (13:39 -0800)]
revup
Simon [Sun, 4 Mar 2012 20:54:57 +0000 (12:54 -0800)]
Merge pull request #79 from simonlnu/master
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>
Simon L'nu [Sun, 4 Mar 2012 20:27:10 +0000 (15:27 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Sun, 4 Mar 2012 19:56:19 +0000 (11:56 -0800)]
Merge pull request #78 from simonlnu/master
Simon L'nu [Sun, 4 Mar 2012 19:55:09 +0000 (14:55 -0500)]
fix up toolbar so the notifications line up better togetherSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sun, 4 Mar 2012 19:53:57 +0000 (14:53 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Sun, 4 Mar 2012 17:22:51 +0000 (09:22 -0800)]
Merge pull request #77 from simonlnu/master
Simon L'nu [Sun, 4 Mar 2012 17:21:08 +0000 (12:21 -0500)]
more tweakage. stylesheet and jot-headerSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sun, 4 Mar 2012 17:19:43 +0000 (12:19 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tommy tomson [Sun, 4 Mar 2012 13:19:53 +0000 (14:19 +0100)]
style.css fix
friendica [Sun, 4 Mar 2012 10:26:13 +0000 (02:26 -0800)]
Merge branch 'pull'
friendica [Sun, 4 Mar 2012 10:25:32 +0000 (02:25 -0800)]
revup
Simon [Sun, 4 Mar 2012 10:20:57 +0000 (02:20 -0800)]
Merge pull request #76 from simonlnu/master
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 boxesSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sun, 4 Mar 2012 10:02:28 +0000 (05:02 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Sun, 4 Mar 2012 10:02:15 +0000 (02:02 -0800)]
Merge pull request #75 from simonlnu/master
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 :PSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sun, 4 Mar 2012 09:58:12 +0000 (04:58 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tomtom84 [Sun, 4 Mar 2012 04:49:09 +0000 (20:49 -0800)]
Merge pull request #74 from tomtom84/master
tommy tomson [Sun, 4 Mar 2012 04:48:06 +0000 (05:48 +0100)]
some fixes in diabook
Simon L'nu [Sun, 4 Mar 2012 00:24:54 +0000 (19:24 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Sun, 4 Mar 2012 00:23:07 +0000 (16:23 -0800)]
Merge pull request #73 from simonlnu/master
Simon L'nu [Sun, 4 Mar 2012 00:20:23 +0000 (19:20 -0500)]
these are more finessing on formatting againSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sun, 4 Mar 2012 00:19:35 +0000 (19:19 -0500)]
first commit for dispy New EditionSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
tomtom84 [Sat, 3 Mar 2012 23:10:54 +0000 (15:10 -0800)]
Merge pull request #72 from tomtom84/master
tommy tomson [Sat, 3 Mar 2012 23:10:03 +0000 (00:10 +0100)]
tag fix
tomtom84 [Sat, 3 Mar 2012 22:45:03 +0000 (14:45 -0800)]
Merge pull request #71 from tomtom84/master
tommy tomson [Sat, 3 Mar 2012 22:43:15 +0000 (23:43 +0100)]
fix
tomtom84 [Sat, 3 Mar 2012 22:13:14 +0000 (14:13 -0800)]
Merge pull request #70 from tomtom84/master
tommy tomson [Sat, 3 Mar 2012 22:12:03 +0000 (23:12 +0100)]
navbar fix
Simon L'nu [Sat, 3 Mar 2012 21:49:22 +0000 (16:49 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Abinoam P. Marques Jr. [Sat, 3 Mar 2012 20:56:17 +0000 (12:56 -0800)]
Merge pull request #69 from abinoam/docblox
Abinoam P. Marques Jr [Sat, 3 Mar 2012 20:52:33 +0000 (16:52 -0400)]
Added docblox default configuration file.
tomtom84 [Sat, 3 Mar 2012 20:48:34 +0000 (12:48 -0800)]
Merge pull request #68 from tomtom84/master
tommy tomson [Sat, 3 Mar 2012 20:45:59 +0000 (21:45 +0100)]
fixed apps css
Simon L'nu [Sat, 3 Mar 2012 18:39:56 +0000 (13:39 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tomtom84 [Sat, 3 Mar 2012 18:09:28 +0000 (10:09 -0800)]
Merge pull request #67 from tomtom84/master
tommy tomson [Sat, 3 Mar 2012 18:07:55 +0000 (19:07 +0100)]
fixed star/unstar
tomtom84 [Sat, 3 Mar 2012 15:54:21 +0000 (07:54 -0800)]
Merge pull request #66 from tomtom84/master
tommy tomson [Sat, 3 Mar 2012 15:49:48 +0000 (16:49 +0100)]
fixed admin
Simon L'nu [Sat, 3 Mar 2012 14:45:32 +0000 (09:45 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tomtom84 [Sat, 3 Mar 2012 14:03:34 +0000 (06:03 -0800)]
Merge pull request #65 from tomtom84/master
tommy tomson [Sat, 3 Mar 2012 14:01:25 +0000 (15:01 +0100)]
fix editor
Simon L'nu [Sat, 3 Mar 2012 13:05:53 +0000 (08:05 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tomtom84 [Sat, 3 Mar 2012 12:30:31 +0000 (04:30 -0800)]
Merge pull request #64 from tomtom84/master
tommy tomson [Sat, 3 Mar 2012 12:27:39 +0000 (13:27 +0100)]
fix text-editor in theme
Tobias Diekershoff [Sat, 3 Mar 2012 11:17:32 +0000 (12:17 +0100)]
german strings as of 28th Feb from transilex
tomtom84 [Sat, 3 Mar 2012 05:02:55 +0000 (21:02 -0800)]
Merge pull request #63 from tomtom84/master
tommy tomson [Sat, 3 Mar 2012 05:00:46 +0000 (06:00 +0100)]
small fix in style.css
tommy tomson [Sat, 3 Mar 2012 03:45:34 +0000 (04:45 +0100)]
fix star/unstar
friendica [Sat, 3 Mar 2012 03:32:34 +0000 (19:32 -0800)]
Merge pull request #62 from tomtom84/master
tommy tomson [Sat, 3 Mar 2012 03:27:06 +0000 (04:27 +0100)]
fixes in wall_item.tpl and style.css in theme diabook
tommy tomson [Sat, 3 Mar 2012 00:52:53 +0000 (01:52 +0100)]
fix in wall_item.tpl
friendica [Sat, 3 Mar 2012 00:24:26 +0000 (16:24 -0800)]
add diabook to default themes
Simon L'nu [Sat, 3 Mar 2012 00:09:17 +0000 (19:09 -0500)]
minor formatting issuesSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sat, 3 Mar 2012 00:05:41 +0000 (19:05 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Sat, 3 Mar 2012 00:02:02 +0000 (16:02 -0800)]
Merge pull request #61 from fabrixxm/master
tommy tomson [Fri, 2 Mar 2012 23:41:02 +0000 (00:41 +0100)]
fixed broken tags and notifications in theme
Fabio Comuni [Fri, 2 Mar 2012 23:12:45 +0000 (00:12 +0100)]
fix @mention autocomplete in comments
Fabio Comuni [Fri, 2 Mar 2012 23:06:44 +0000 (00:06 +0100)]
Merge remote-tracking branch 'friendica/master'
Fabio Comuni [Fri, 2 Mar 2012 23:00:38 +0000 (00:00 +0100)]
template proc: fix variables regexp
Simon [Fri, 2 Mar 2012 19:01:21 +0000 (11:01 -0800)]
Merge pull request #60 from simonlnu/master
Simon L'nu [Fri, 2 Mar 2012 18:59:28 +0000 (13:59 -0500)]
apply changes to templates to testbubbleSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Fri, 2 Mar 2012 17:28:28 +0000 (12:28 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Fri, 2 Mar 2012 17:28:04 +0000 (09:28 -0800)]
Merge pull request #58 from simonlnu/master
Simon [Fri, 2 Mar 2012 17:25:42 +0000 (09:25 -0800)]
Merge pull request #59 from tomtom84/master
tommy tomson [Fri, 2 Mar 2012 17:01:21 +0000 (18:01 +0100)]
deleted readme.txt from folder diabook
Simon L'nu [Fri, 2 Mar 2012 17:00:16 +0000 (12:00 -0500)]
fix for comment-wwedit-wrapper CSS class in tpl had a stray $Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
projects / friendica.git / log