]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agomore ui thingies with dispy - we'll get you well dispy, we promise
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>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #81 from tomtom84/master
tomtom84 [Mon, 5 Mar 2012 01:46:48 +0000 (17:46 -0800)]
Merge pull request #81 from tomtom84/master

fixes in diabook theme

12 years agofixes in diabook
tommy tomson [Mon, 5 Mar 2012 01:45:24 +0000 (02:45 +0100)]
fixes in diabook

12 years agounused replacement variable displays %1 in all html2bbcode 'code' blocks
friendica [Mon, 5 Mar 2012 00:26:16 +0000 (16:26 -0800)]
unused replacement variable displays %1 in all html2bbcode 'code' blocks

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge branch 'pull'
friendica [Sun, 4 Mar 2012 21:39:53 +0000 (13:39 -0800)]
Merge branch 'pull'

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

12 years agoMerge pull request #79 from simonlnu/master
Simon [Sun, 4 Mar 2012 20:54:57 +0000 (12:54 -0800)]
Merge pull request #79 from simonlnu/master

more UI fixes

12 years agoremoved extra padding/border on tread-wrapper (heh, tea read :P)
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>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #78 from simonlnu/master
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

12 years agofix up toolbar so the notifications line up better together
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>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #77 from simonlnu/master
Simon [Sun, 4 Mar 2012 17:22:51 +0000 (09:22 -0800)]
Merge pull request #77 from simonlnu/master

CSS and JS tweaks

12 years agomore tweakage. stylesheet and jot-header
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>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agostyle.css fix
tommy tomson [Sun, 4 Mar 2012 13:19:53 +0000 (14:19 +0100)]
style.css fix

12 years agoMerge branch 'pull'
friendica [Sun, 4 Mar 2012 10:26:13 +0000 (02:26 -0800)]
Merge branch 'pull'

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

12 years agoMerge pull request #76 from simonlnu/master
Simon [Sun, 4 Mar 2012 10:20:57 +0000 (02:20 -0800)]
Merge pull request #76 from simonlnu/master

minor ui things

12 years agosoften '.shiny' a bit to fit in with colour scheme. tweak wall boxes
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>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #75 from simonlnu/master
Simon [Sun, 4 Mar 2012 10:02:15 +0000 (02:02 -0800)]
Merge pull request #75 from simonlnu/master

theme tweaks

12 years agotweak wall items a bit (nasty-looking wall items...). jot-header tries to count chars...
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>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #74 from tomtom84/master
tomtom84 [Sun, 4 Mar 2012 04:49:09 +0000 (20:49 -0800)]
Merge pull request #74 from tomtom84/master

fixes in diabook theme

12 years agosome fixes in diabook
tommy tomson [Sun, 4 Mar 2012 04:48:06 +0000 (05:48 +0100)]
some fixes in diabook

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #73 from simonlnu/master
Simon [Sun, 4 Mar 2012 00:23:07 +0000 (16:23 -0800)]
Merge pull request #73 from simonlnu/master

dispy! (and minor formatting)

12 years agothese are more finessing on formatting again
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>
12 years agofirst commit for dispy New Edition
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>
12 years agoMerge pull request #72 from tomtom84/master
tomtom84 [Sat, 3 Mar 2012 23:10:54 +0000 (15:10 -0800)]
Merge pull request #72 from tomtom84/master

fixes in diabook theme

12 years agotag fix
tommy tomson [Sat, 3 Mar 2012 23:10:03 +0000 (00:10 +0100)]
tag fix

12 years agoMerge pull request #71 from tomtom84/master
tomtom84 [Sat, 3 Mar 2012 22:45:03 +0000 (14:45 -0800)]
Merge pull request #71 from tomtom84/master

fixes in diabook theme

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

12 years agoMerge pull request #70 from tomtom84/master
tomtom84 [Sat, 3 Mar 2012 22:13:14 +0000 (14:13 -0800)]
Merge pull request #70 from tomtom84/master

fixes in diabook theme

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

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #69 from abinoam/docblox
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.

12 years agoAdded docblox default configuration file.
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

12 years agoMerge pull request #68 from tomtom84/master
tomtom84 [Sat, 3 Mar 2012 20:48:34 +0000 (12:48 -0800)]
Merge pull request #68 from tomtom84/master

fixes in diabook theme

12 years agofixed apps css
tommy tomson [Sat, 3 Mar 2012 20:45:59 +0000 (21:45 +0100)]
fixed apps css

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #67 from tomtom84/master
tomtom84 [Sat, 3 Mar 2012 18:09:28 +0000 (10:09 -0800)]
Merge pull request #67 from tomtom84/master

fixes in diabook theme

12 years agofixed star/unstar
tommy tomson [Sat, 3 Mar 2012 18:07:55 +0000 (19:07 +0100)]
fixed star/unstar

12 years agoMerge pull request #66 from tomtom84/master
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

12 years agofixed admin
tommy tomson [Sat, 3 Mar 2012 15:49:48 +0000 (16:49 +0100)]
fixed admin
fixed editor

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #65 from tomtom84/master
tomtom84 [Sat, 3 Mar 2012 14:03:34 +0000 (06:03 -0800)]
Merge pull request #65 from tomtom84/master

fix editor in theme diabook

12 years agofix editor
tommy tomson [Sat, 3 Mar 2012 14:01:25 +0000 (15:01 +0100)]
fix editor

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #64 from tomtom84/master
tomtom84 [Sat, 3 Mar 2012 12:30:31 +0000 (04:30 -0800)]
Merge pull request #64 from tomtom84/master

fix editor in theme diabook

12 years agofix text-editor in theme
tommy tomson [Sat, 3 Mar 2012 12:27:39 +0000 (13:27 +0100)]
fix text-editor in theme

12 years agogerman strings as of 28th Feb from transilex
Tobias Diekershoff [Sat, 3 Mar 2012 11:17:32 +0000 (12:17 +0100)]
german strings as of 28th Feb from transilex

12 years agoMerge pull request #63 from tomtom84/master
tomtom84 [Sat, 3 Mar 2012 05:02:55 +0000 (21:02 -0800)]
Merge pull request #63 from tomtom84/master

fixes in diabook theme

12 years agosmall fix in style.css
tommy tomson [Sat, 3 Mar 2012 05:00:46 +0000 (06:00 +0100)]
small fix in style.css

12 years agofix star/unstar
tommy tomson [Sat, 3 Mar 2012 03:45:34 +0000 (04:45 +0100)]
fix star/unstar

12 years agoMerge pull request #62 from tomtom84/master
friendica [Sat, 3 Mar 2012 03:32:34 +0000 (19:32 -0800)]
Merge pull request #62 from tomtom84/master

fixes in diabook theme

12 years agofixes in wall_item.tpl and style.css in theme diabook
tommy tomson [Sat, 3 Mar 2012 03:27:06 +0000 (04:27 +0100)]
fixes in wall_item.tpl and style.css in theme diabook

12 years agofix in wall_item.tpl
tommy tomson [Sat, 3 Mar 2012 00:52:53 +0000 (01:52 +0100)]
fix in wall_item.tpl
new icon link.png

12 years agoadd diabook to default themes
friendica [Sat, 3 Mar 2012 00:24:26 +0000 (16:24 -0800)]
add diabook to default themes

12 years agominor formatting issues
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>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #61 from fabrixxm/master
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

12 years agofixed broken tags and notifications in theme
tommy tomson [Fri, 2 Mar 2012 23:41:02 +0000 (00:41 +0100)]
fixed broken tags and notifications in theme

12 years agofix @mention autocomplete in comments
Fabio Comuni [Fri, 2 Mar 2012 23:12:45 +0000 (00:12 +0100)]
fix @mention autocomplete in comments

12 years agoMerge remote-tracking branch 'friendica/master'
Fabio Comuni [Fri, 2 Mar 2012 23:06:44 +0000 (00:06 +0100)]
Merge remote-tracking branch 'friendica/master'

12 years agotemplate proc: fix variables regexp
Fabio Comuni [Fri, 2 Mar 2012 23:00:38 +0000 (00:00 +0100)]
template proc: fix variables regexp

12 years agoMerge pull request #60 from simonlnu/master
Simon [Fri, 2 Mar 2012 19:01:21 +0000 (11:01 -0800)]
Merge pull request #60 from simonlnu/master

apply changes to templates to testbubble

12 years agoapply changes to templates to testbubble
Simon L'nu [Fri, 2 Mar 2012 18:59:28 +0000 (13:59 -0500)]
apply changes to templates to testbubble

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 2 Mar 2012 17:28:28 +0000 (12:28 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  deleted readme.txt from folder diabook
  github finally working
  adjust3
  adjust2
  adjust

* master:

12 years agoMerge pull request #58 from simonlnu/master
Simon [Fri, 2 Mar 2012 17:28:04 +0000 (09:28 -0800)]
Merge pull request #58 from simonlnu/master

fix for comment-wwedit-wrapper; CSS class in tpl had a stray $

12 years agoMerge pull request #59 from tomtom84/master
Simon [Fri, 2 Mar 2012 17:25:42 +0000 (09:25 -0800)]
Merge pull request #59 from tomtom84/master

diabook theme

12 years agodeleted readme.txt from folder diabook
tommy tomson [Fri, 2 Mar 2012 17:01:21 +0000 (18:01 +0100)]
deleted readme.txt from folder diabook

12 years agofix for comment-wwedit-wrapper CSS class in tpl had a stray $
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>
12 years agogithub finally working
tommy tomson [Fri, 2 Mar 2012 16:47:45 +0000 (17:47 +0100)]
github finally working

12 years agoadjust3
tommy tomson [Fri, 2 Mar 2012 16:45:21 +0000 (17:45 +0100)]
adjust3

12 years agoMerge remote-tracking branch 'tomtom84_friendica/master' into master-2
tommy tomson [Fri, 2 Mar 2012 16:21:06 +0000 (17:21 +0100)]
Merge remote-tracking branch 'tomtom84_friendica/master' into master-2

12 years agoadjust2
tommy tomson [Fri, 2 Mar 2012 14:57:32 +0000 (15:57 +0100)]
adjust2

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 2 Mar 2012 15:55:59 +0000 (10:55 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  template proc: allow isolation of var name between [ and ]
  group: fix create new group form
  templates: fix tags
  template proc: remove unused function and commented out code
  template proc: first optimization

* master:

12 years agoMerge pull request #57 from fabrixxm/master
Simon [Fri, 2 Mar 2012 15:55:38 +0000 (07:55 -0800)]
Merge pull request #57 from fabrixxm/master

template processor optimizations

12 years agoadjust
tommy tomson [Fri, 2 Mar 2012 14:57:32 +0000 (15:57 +0100)]
adjust

12 years agotemplate proc: allow isolation of var name between [ and ]
Fabio Comuni [Fri, 2 Mar 2012 14:53:48 +0000 (15:53 +0100)]
template proc: allow isolation of var name between [ and ]

$var.name -> $[var.name]

12 years agogroup: fix create new group form
Fabio Comuni [Fri, 2 Mar 2012 14:40:17 +0000 (15:40 +0100)]
group: fix create new group form

12 years agotemplates: fix tags
Fabio Comuni [Fri, 2 Mar 2012 11:41:34 +0000 (12:41 +0100)]
templates: fix tags

12 years agotemplate proc: remove unused function and commented out code
Fabio Comuni [Fri, 2 Mar 2012 11:36:22 +0000 (12:36 +0100)]
template proc: remove unused function and commented out code

12 years agotemplate proc: first optimization
Fabio Comuni [Fri, 2 Mar 2012 11:24:35 +0000 (12:24 +0100)]
template proc: first optimization

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 2 Mar 2012 09:53:54 +0000 (04:53 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  expand multiple heart smilies e.g. <3333

* master:

12 years agoexpand multiple heart smilies e.g. <3333
friendica [Fri, 2 Mar 2012 09:24:20 +0000 (01:24 -0800)]
expand multiple heart smilies e.g. <3333

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 2 Mar 2012 09:07:23 +0000 (04:07 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  item table update for file feature
  probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
  diabook commit
  conversation: remove templating items in code and move it to template.
  Enabled automated doc building. Changes: -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them
  template proc: avoid a notice and allow template name to include to be passed with a variable value
  show relation in contact_template
  admin: fix small string
  fix visualization in groupeditor
  less html in mod/group.php, template for group members editor, quattro theme for group edit.

* master:

12 years agoMerge branch 'pull'
friendica [Fri, 2 Mar 2012 08:10:05 +0000 (00:10 -0800)]
Merge branch 'pull'

12 years agoitem table update for file feature
friendica [Fri, 2 Mar 2012 08:09:10 +0000 (00:09 -0800)]
item table update for file feature

12 years agoMerge pull request #55 from fabrixxm/master
fabrixxm [Fri, 2 Mar 2012 08:00:03 +0000 (00:00 -0800)]
Merge pull request #55 from fabrixxm/master

Some minor and one majior mod in templates

12 years agoMerge pull request #56 from tomtom84/master
friendica [Fri, 2 Mar 2012 04:03:18 +0000 (20:03 -0800)]
Merge pull request #56 from tomtom84/master

diabook theme

12 years agoMerge remote-tracking branch 'upstream/master'
tommy tomson [Fri, 2 Mar 2012 03:58:37 +0000 (04:58 +0100)]
Merge remote-tracking branch 'upstream/master'

12 years agoMerge branch 'pull'
friendica [Fri, 2 Mar 2012 02:54:50 +0000 (18:54 -0800)]
Merge branch 'pull'

12 years agoprobe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
friendica [Fri, 2 Mar 2012 02:49:23 +0000 (18:49 -0800)]
probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type

12 years agoMerge pull request #54 from campino/master
friendica [Fri, 2 Mar 2012 01:54:41 +0000 (17:54 -0800)]
Merge pull request #54 from campino/master

Build documentation

This looks good. It may take me some time to get up to speed - and I'm not sure I have all the utilities available via my hosting provider.

12 years agodiabook commit
tommy tomson [Fri, 2 Mar 2012 01:05:35 +0000 (02:05 +0100)]
diabook commit