Commit graph

9509 commits

Author SHA1 Message Date
Simon L'nu b34dd1ca71 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:
2012-03-04 22:15:28 -05:00
friendica b9bea3a549 wrap title and text for editplain in zero and TB themes 2012-03-04 19:14:03 -08:00
friendica fba089012a correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode 2012-03-04 18:50:32 -08:00
tommy tomson e52891d8ab fixes in diabook 2012-03-05 03:08:58 +01:00
tomtom84 d369fcc994 Merge pull request #81 from tomtom84/master
fixes in diabook theme
2012-03-04 17:46:48 -08:00
tommy tomson 1653e5a615 fixes in diabook 2012-03-05 02:45:24 +01:00
friendica 4134fd3dce unused replacement variable displays %1 in all html2bbcode 'code' blocks 2012-03-04 16:26:16 -08:00
Simon L'nu efb60e603c Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:

* master:
2012-03-04 17:47:17 -05:00
Michael Johnston b2035ae0c6 improved contrast in acl selector, and preview (darkzero) 2012-03-04 17:29:00 -05:00
friendica 4b1f3555f1 Merge branch 'pull' 2012-03-04 13:39:53 -08:00
friendica cd5a11bb0f revup 2012-03-04 13:39:17 -08:00
Simon 7d8ed95e78 Merge pull request #79 from simonlnu/master
more UI fixes
2012-03-04 12:54:57 -08:00
Simon L'nu 2441babbe9 removed extra padding/border on tread-wrapper (heh, tea read :P)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 15:52:50 -05:00
Simon L'nu 6b8cb80ea3 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:

* master:
2012-03-04 15:27:10 -05:00
Simon 550a98aaae Merge pull request #78 from simonlnu/master
fix ui issue with toolbar and notification icons
2012-03-04 11:56:19 -08:00
Simon L'nu 25510453bf fix up toolbar so the notifications line up better together
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 14:55:09 -05:00
Simon L'nu e3ad02d0dd Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:

* master:
2012-03-04 14:53:57 -05:00
Simon c0ecd7a925 Merge pull request #77 from simonlnu/master
CSS and JS tweaks
2012-03-04 09:22:51 -08:00
Simon L'nu 5f77aff486 more tweakage. stylesheet and jot-header
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 12:21:08 -05:00
Simon L'nu d98ca8e127 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  revup

* master:
2012-03-04 12:19:43 -05:00
tommy tomson 8e49b4332c style.css fix 2012-03-04 14:19:53 +01:00
friendica 638bbb2171 Merge branch 'pull' 2012-03-04 02:26:13 -08:00
friendica 20d37f2e3e revup 2012-03-04 02:25:32 -08:00
Simon ae158aa6f9 Merge pull request #76 from simonlnu/master
minor ui things
2012-03-04 02:20:57 -08:00
Simon L'nu cb57a0ebfd soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 05:19:49 -05:00
Simon L'nu 46783d9189 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:

* master:
2012-03-04 05:02:28 -05:00
Simon a7b637b933 Merge pull request #75 from simonlnu/master
theme tweaks
2012-03-04 02:02:15 -08:00
Simon L'nu c28ce8a79c 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>
2012-03-04 05:00:35 -05:00
Simon L'nu a6d08ec852 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  some fixes in diabook

* master:
2012-03-04 04:58:12 -05:00
tomtom84 dfa056bb1b Merge pull request #74 from tomtom84/master
fixes in diabook theme
2012-03-03 20:49:09 -08:00
tommy tomson e0e0224fa6 some fixes in diabook 2012-03-04 05:48:06 +01:00
Simon L'nu eae6418074 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  tag fix
  fix
  navbar fix

* master:
2012-03-03 19:24:54 -05:00
Simon f3c1e2c546 Merge pull request #73 from simonlnu/master
dispy! (and minor formatting)
2012-03-03 16:23:07 -08:00
Simon L'nu 09c2f81cb3 these are more finessing on formatting again
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-03 19:20:23 -05:00
Simon L'nu 64400e8d59 first commit for dispy New Edition
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-03 19:19:35 -05:00
tomtom84 74866a96de Merge pull request #72 from tomtom84/master
fixes in diabook theme
2012-03-03 15:10:54 -08:00
tommy tomson 25d6ca3b73 tag fix 2012-03-04 00:10:03 +01:00
tomtom84 f4b9c405da Merge pull request #71 from tomtom84/master
fixes in diabook theme
2012-03-03 14:45:03 -08:00
tommy tomson b3eeb22401 fix 2012-03-03 23:43:15 +01:00
tomtom84 77db5becb6 Merge pull request #70 from tomtom84/master
fixes in diabook theme
2012-03-03 14:13:14 -08:00
tommy tomson 173fb983c5 navbar fix 2012-03-03 23:12:03 +01:00
Simon L'nu 1bed4010aa Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  Added docblox default configuration file.
  fixed apps css

* master:
2012-03-03 16:49:22 -05:00
Abinoam P. Marques Jr. 952bcc5158 Merge pull request #69 from abinoam/docblox
Added docblox default configuration file.
2012-03-03 12:56:17 -08:00
Abinoam P. Marques Jr a19d8d9e9f Added docblox default configuration file.
Now docblox can be run without arguments on friendica root dir.
The documentation will be generated on ./data/output
2012-03-03 16:53:10 -04:00
tomtom84 7230fa5a94 Merge pull request #68 from tomtom84/master
fixes in diabook theme
2012-03-03 12:48:34 -08:00
tommy tomson 42b9887693 fixed apps css 2012-03-03 21:45:59 +01:00
Simon L'nu da78d8594f Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  fixed star/unstar
  fixed admin fixed editor

* master:
2012-03-03 13:39:56 -05:00
tomtom84 1dfd5c4f85 Merge pull request #67 from tomtom84/master
fixes in diabook theme
2012-03-03 10:09:28 -08:00
tommy tomson d4ac1f2a9c fixed star/unstar 2012-03-03 19:07:55 +01:00
tomtom84 e84e684fdc Merge pull request #66 from tomtom84/master
fixed editor and admin-sec in theme diabook
2012-03-03 07:54:21 -08:00