]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agofix html reshares when editplain in use
friendica [Tue, 6 Mar 2012 23:28:27 +0000 (15:28 -0800)]
fix html reshares when editplain in use

12 years agosearch should be ok, but a little extra security won't hurt
friendica [Tue, 6 Mar 2012 23:15:59 +0000 (15:15 -0800)]
search should be ok, but a little extra security won't hurt

12 years agoMerge branch 'pull'
friendica [Tue, 6 Mar 2012 23:10:22 +0000 (15:10 -0800)]
Merge branch 'pull'

12 years agostring update
friendica [Tue, 6 Mar 2012 23:09:57 +0000 (15:09 -0800)]
string update

12 years agoMerge pull request #98 from simonlnu/master
Simon [Tue, 6 Mar 2012 23:04:50 +0000 (15:04 -0800)]
Merge pull request #98 from simonlnu/master

missed some fixes on last request

12 years agodispy, dispy, oh what a little lispy
Simon L'nu [Tue, 6 Mar 2012 22:55:05 +0000 (17:55 -0500)]
dispy, dispy, oh what a little lispy

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years ago[PRIVACY] privacy issue bug #314
friendica [Tue, 6 Mar 2012 22:53:14 +0000 (14:53 -0800)]
[PRIVACY] privacy issue bug #314

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 6 Mar 2012 22:52:12 +0000 (17:52 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bugs #312, #313
  revup

* master:

12 years agobugs #312, #313
friendica [Tue, 6 Mar 2012 22:27:53 +0000 (14:27 -0800)]
bugs #312, #313

12 years agoMerge branch 'pull'
friendica [Tue, 6 Mar 2012 21:58:26 +0000 (13:58 -0800)]
Merge branch 'pull'

12 years agorevup
friendica [Tue, 6 Mar 2012 21:57:38 +0000 (13:57 -0800)]
revup

12 years agoMerge pull request #95 from simonlnu/master
Simon [Tue, 6 Mar 2012 21:20:20 +0000 (13:20 -0800)]
Merge pull request #95 from simonlnu/master

styling fixes in dispy; typos fixed in settings.tpl

12 years agostyling fixes in dispy. fix typos in settings.tpl
Simon L'nu [Tue, 6 Mar 2012 21:18:26 +0000 (16:18 -0500)]
styling fixes in dispy. fix typos in settings.tpl

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

* remotes/upstream/master:
  remove "smilie" expansion for Diaspora logo
  prevent duplicate likes
  quattro: theme settings (a bit hackish)
  add img
  fixes in diabook
  finalise spam storage model, begin driver changes.
  fixes
  template proc: add variable filters

* master:

12 years agoMerge pull request #93 from fabrixxm/master
fabrixxm [Tue, 6 Mar 2012 13:09:03 +0000 (05:09 -0800)]
Merge pull request #93 from fabrixxm/master

quattro: theme settings

12 years agoremove "smilie" expansion for Diaspora logo
friendica [Tue, 6 Mar 2012 12:28:45 +0000 (04:28 -0800)]
remove "smilie" expansion for Diaspora logo

12 years agoprevent duplicate likes
friendica [Tue, 6 Mar 2012 10:17:55 +0000 (02:17 -0800)]
prevent duplicate likes

12 years agoMerge branch 'pull'
friendica [Tue, 6 Mar 2012 09:04:16 +0000 (01:04 -0800)]
Merge branch 'pull'

12 years agoquattro: theme settings (a bit hackish)
Fabio Comuni [Tue, 6 Mar 2012 08:50:18 +0000 (09:50 +0100)]
quattro: theme settings (a bit hackish)

12 years agoMerge remote-tracking branch 'friendica/master'
Fabio Comuni [Tue, 6 Mar 2012 08:48:08 +0000 (09:48 +0100)]
Merge remote-tracking branch 'friendica/master'

12 years agoMerge pull request #92 from tomtom84/master
tomtom84 [Tue, 6 Mar 2012 07:34:24 +0000 (23:34 -0800)]
Merge pull request #92 from tomtom84/master

fixes in theme diabbook

12 years agoadd img
tommy tomson [Tue, 6 Mar 2012 07:31:54 +0000 (08:31 +0100)]
add img

12 years agoMerge remote-tracking branch 'origin/master'
tommy tomson [Tue, 6 Mar 2012 07:28:21 +0000 (08:28 +0100)]
Merge remote-tracking branch 'origin/master'

12 years agofixes in diabook
tommy tomson [Tue, 6 Mar 2012 07:27:20 +0000 (08:27 +0100)]
fixes in diabook

12 years agofinalise spam storage model, begin driver changes.
friendica [Tue, 6 Mar 2012 07:20:42 +0000 (23:20 -0800)]
finalise spam storage model, begin driver changes.

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 6 Mar 2012 04:36:22 +0000 (23:36 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  some admin page fixes and cleanup
  changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
  string update
  some testbubble stuff
  can_write_wall documentation

* master:

12 years agoMerge branch 'pull'
friendica [Tue, 6 Mar 2012 02:52:15 +0000 (18:52 -0800)]
Merge branch 'pull'

12 years agosome admin page fixes and cleanup
friendica [Tue, 6 Mar 2012 02:51:21 +0000 (18:51 -0800)]
some admin page fixes and cleanup

12 years agoMerge pull request #91 from unary/darkzero
Simon [Tue, 6 Mar 2012 02:21:15 +0000 (18:21 -0800)]
Merge pull request #91 from unary/darkzero

changed bg color around comment box from white to match page background,...

12 years agochanged bg color around comment box from white to match page background, improved...
Michael Johnston [Tue, 6 Mar 2012 02:10:01 +0000 (21:10 -0500)]
changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)

12 years agostring update
friendica [Tue, 6 Mar 2012 00:43:44 +0000 (16:43 -0800)]
string update

12 years agoMerge branch 'pull'
friendica [Mon, 5 Mar 2012 23:59:28 +0000 (15:59 -0800)]
Merge branch 'pull'

12 years agosome testbubble stuff
friendica [Mon, 5 Mar 2012 23:58:26 +0000 (15:58 -0800)]
some testbubble stuff

12 years agoMerge pull request #90 from simonlnu/master
Simon [Mon, 5 Mar 2012 23:19:02 +0000 (15:19 -0800)]
Merge pull request #90 from simonlnu/master

field_help tweak

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

* remotes/upstream/master:

* master:

12 years agoforgot a small change in .field_help
Simon L'nu [Mon, 5 Mar 2012 23:16:51 +0000 (18:16 -0500)]
forgot a small change in .field_help

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'pull'
friendica [Mon, 5 Mar 2012 23:05:09 +0000 (15:05 -0800)]
Merge branch 'pull'

12 years agocan_write_wall documentation
friendica [Mon, 5 Mar 2012 23:04:43 +0000 (15:04 -0800)]
can_write_wall documentation

12 years agoMerge pull request #89 from simonlnu/master
Simon [Mon, 5 Mar 2012 22:57:51 +0000 (14:57 -0800)]
Merge pull request #89 from simonlnu/master

implement more changes

12 years agoimplement more of the changes requested
Simon L'nu [Mon, 5 Mar 2012 22:57:04 +0000 (17:57 -0500)]
implement more of the changes requested

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 22:56:38 +0000 (17:56 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  revup

* master:

12 years agoMerge branch 'pull'
friendica [Mon, 5 Mar 2012 21:38:06 +0000 (13:38 -0800)]
Merge branch 'pull'

12 years agorevup
friendica [Mon, 5 Mar 2012 21:37:32 +0000 (13:37 -0800)]
revup

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

12 years agoMerge pull request #88 from simonlnu/master
Simon [Mon, 5 Mar 2012 20:57:30 +0000 (12:57 -0800)]
Merge pull request #88 from simonlnu/master

multiple ui fixes

12 years agomultiple fixes; the jot-header works as standalone, not sure what's up.
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>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

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

12 years agotweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar
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>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #86 from simonlnu/master
Simon [Mon, 5 Mar 2012 17:23:01 +0000 (09:23 -0800)]
Merge pull request #86 from simonlnu/master

more dispy

12 years agostill working on jot-header. amending <aside> and other elements
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>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years agoMerge pull request #85 from simonlnu/master
Simon [Mon, 5 Mar 2012 15:56:43 +0000 (07:56 -0800)]
Merge pull request #85 from simonlnu/master

hopefully fix overflow issue now

12 years agohopefully fix the overflow issue everywhere this time
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>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
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:

12 years ago$name appearing on testbubble items
friendica [Mon, 5 Mar 2012 11:10:45 +0000 (03:10 -0800)]
$name appearing on testbubble items

12 years agoMerge branch 'pull'
friendica [Mon, 5 Mar 2012 08:54:25 +0000 (00:54 -0800)]
Merge branch 'pull'

12 years agotestbubble notifications
friendica [Mon, 5 Mar 2012 08:53:42 +0000 (00:53 -0800)]
testbubble notifications

12 years agoMerge pull request #84 from simonlnu/master
Simon [Mon, 5 Mar 2012 06:09:56 +0000 (22:09 -0800)]
Merge pull request #84 from simonlnu/master

more ui bugs fixed \o/

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

12 years agoyet more ui things, and bug fixing
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>
12 years agoMerge pull request #83 from tomtom84/master
tomtom84 [Mon, 5 Mar 2012 04:15:26 +0000 (20:15 -0800)]
Merge pull request #83 from tomtom84/master

fixes in diabook theme

12 years agolike dislike button
tommy tomson [Mon, 5 Mar 2012 04:14:08 +0000 (05:14 +0100)]
like dislike button

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

12 years agoMerge pull request #80 from unary/darkzero
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)

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

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 'pull'
friendica [Mon, 5 Mar 2012 03:15:42 +0000 (19:15 -0800)]
Merge branch 'pull'

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 agowrap title and text for editplain in zero and TB themes
friendica [Mon, 5 Mar 2012 03:14:03 +0000 (19:14 -0800)]
wrap title and text for editplain in zero and TB themes

12 years agocorrect owner info from misconfigured installs, duepuntozero title block misplaced...
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

12 years agofixes in diabook
tommy tomson [Mon, 5 Mar 2012 02:08:58 +0000 (03:08 +0100)]
fixes in diabook

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 agoimproved contrast in acl selector, and preview (darkzero)
Michael Johnston [Sun, 4 Mar 2012 22:29:00 +0000 (17:29 -0500)]
improved contrast in acl selector, and preview (darkzero)

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