This website requires JavaScript.
321b651635
Merge branch 'pull'
2012-03-05 18:52:15 -08:00
23460302f5
some admin page fixes and cleanup
2012-03-05 18:51:21 -08:00
d49dc1434f
Merge pull request #91 from unary/darkzero
2012-03-05 18:21:15 -08:00
9f44dbbb48
changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
2012-03-05 21:10:01 -05:00
8473444242
string update
2012-03-05 16:43:44 -08:00
e5de03040e
Merge branch 'pull'
2012-03-05 15:59:28 -08:00
7b3349f38a
some testbubble stuff
2012-03-05 15:58:26 -08:00
b6765ad742
Merge pull request #90 from simonlnu/master
2012-03-05 15:19:02 -08:00
1aa2367469
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 18:18:04 -05:00
190650060a
forgot a small change in .field_help
2012-03-05 18:16:51 -05:00
c47bae7a5f
Merge branch 'pull'
2012-03-05 15:05:09 -08:00
c37ffd2999
can_write_wall documentation
2012-03-05 15:04:43 -08:00
4b456e2273
Merge pull request #89 from simonlnu/master
2012-03-05 14:57:51 -08:00
50824bddd0
implement more of the changes requested
2012-03-05 17:57:04 -05:00
6a0729d5a4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 17:56:38 -05:00
0d9c2ca06f
Merge branch 'pull'
2012-03-05 13:38:06 -08:00
c6dce8dd6b
revup
2012-03-05 13:37:32 -08:00
a406c16581
fixes
2012-03-05 22:31:03 +01:00
fbc017cdba
added test blueprints, fixed? encoding issues
2012-03-05 22:22:10 +01:00
092115ca44
Merge pull request #88 from simonlnu/master
2012-03-05 12:57:30 -08:00
9d461846e2
multiple fixes; the jot-header works as standalone, not sure what's up.
2012-03-05 15:55:17 -05:00
7f894794e4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 13:17:40 -05:00
1772037c98
Merge pull request #87 from simonlnu/master
2012-03-05 10:17:26 -08:00
02f825ca3c
tweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar
2012-03-05 13:16:28 -05:00
e05313f88f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 12:23:16 -05:00
fd240687b9
Merge pull request #86 from simonlnu/master
2012-03-05 09:23:01 -08:00
ef1d02e7bd
still working on jot-header. amending <aside> and other elements
2012-03-05 12:21:50 -05:00
8cce12f28a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 10:56:58 -05:00
e786e4253d
Merge pull request #85 from simonlnu/master
2012-03-05 07:56:43 -08:00
65b6ec79ed
hopefully fix the overflow issue everywhere this time
2012-03-05 10:55:26 -05:00
3ab7132b64
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 10:17:34 -05:00
965e657c20
$name appearing on testbubble items
2012-03-05 03:10:45 -08:00
31f192bb57
Merge branch 'pull'
2012-03-05 00:54:25 -08:00
0d97799324
testbubble notifications
2012-03-05 00:53:42 -08:00
49d9dd374c
Merge pull request #84 from simonlnu/master
2012-03-04 22:09:56 -08:00
7de79a8c49
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 01:08:54 -05:00
fe7a6b070d
yet more ui things, and bug fixing
2012-03-05 01:08:45 -05:00
9c541dbd67
Merge pull request #83 from tomtom84/master
2012-03-04 20:15:26 -08:00
fe614b4e7c
like dislike button
2012-03-05 05:14:08 +01:00
290fdefa82
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-04 22:20:42 -05:00
04527bd0b1
Merge pull request #80 from unary/darkzero
2012-03-04 19:19:45 -08:00
3b95171824
Merge pull request #82 from simonlnu/master
2012-03-04 19:19:08 -08:00
58cdf776b6
more ui thingies with dispy - we'll get you well dispy, we promise
2012-03-04 22:16:10 -05:00
b57247d6a6
Merge branch 'pull'
2012-03-04 19:15:42 -08:00
b34dd1ca71
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-04 22:15:28 -05:00
b9bea3a549
wrap title and text for editplain in zero and TB themes
2012-03-04 19:14:03 -08:00
fba089012a
correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
2012-03-04 18:50:32 -08:00
e52891d8ab
fixes in diabook
2012-03-05 03:08:58 +01:00
d369fcc994
Merge pull request #81 from tomtom84/master
2012-03-04 17:46:48 -08:00
1653e5a615
fixes in diabook
2012-03-05 02:45:24 +01:00
4134fd3dce
unused replacement variable displays %1 in all html2bbcode 'code' blocks
2012-03-04 16:26:16 -08:00
efb60e603c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-04 17:47:17 -05:00
b2035ae0c6
improved contrast in acl selector, and preview (darkzero)
2012-03-04 17:29:00 -05:00
4b1f3555f1
Merge branch 'pull'
2012-03-04 13:39:53 -08:00
cd5a11bb0f
revup
2012-03-04 13:39:17 -08:00
7d8ed95e78
Merge pull request #79 from simonlnu/master
2012-03-04 12:54:57 -08:00
2441babbe9
removed extra padding/border on tread-wrapper (heh, tea read :P)
2012-03-04 15:52:50 -05:00
6b8cb80ea3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-04 15:27:10 -05:00
550a98aaae
Merge pull request #78 from simonlnu/master
2012-03-04 11:56:19 -08:00
25510453bf
fix up toolbar so the notifications line up better together
2012-03-04 14:55:09 -05:00
e3ad02d0dd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-04 14:53:57 -05:00
c0ecd7a925
Merge pull request #77 from simonlnu/master
2012-03-04 09:22:51 -08:00
5f77aff486
more tweakage. stylesheet and jot-header
2012-03-04 12:21:08 -05:00
d98ca8e127
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-04 12:19:43 -05:00
8e49b4332c
style.css fix
2012-03-04 14:19:53 +01:00
638bbb2171
Merge branch 'pull'
2012-03-04 02:26:13 -08:00
20d37f2e3e
revup
2012-03-04 02:25:32 -08:00
ae158aa6f9
Merge pull request #76 from simonlnu/master
2012-03-04 02:20:57 -08:00
cb57a0ebfd
soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes
2012-03-04 05:19:49 -05:00
46783d9189
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-04 05:02:28 -05:00
a7b637b933
Merge pull request #75 from simonlnu/master
2012-03-04 02:02:15 -08:00
c28ce8a79c
tweak wall items a bit (nasty-looking wall items...). jot-header tries to count chars and fails :P
2012-03-04 05:00:35 -05:00
a6d08ec852
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-04 04:58:12 -05:00
dfa056bb1b
Merge pull request #74 from tomtom84/master
2012-03-03 20:49:09 -08:00
e0e0224fa6
some fixes in diabook
2012-03-04 05:48:06 +01:00
eae6418074
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-03 19:24:54 -05:00
f3c1e2c546
Merge pull request #73 from simonlnu/master
2012-03-03 16:23:07 -08:00
09c2f81cb3
these are more finessing on formatting again
2012-03-03 19:20:23 -05:00
64400e8d59
first commit for dispy New Edition
2012-03-03 19:19:35 -05:00
74866a96de
Merge pull request #72 from tomtom84/master
2012-03-03 15:10:54 -08:00
25d6ca3b73
tag fix
2012-03-04 00:10:03 +01:00
f4b9c405da
Merge pull request #71 from tomtom84/master
2012-03-03 14:45:03 -08:00
b3eeb22401
fix
2012-03-03 23:43:15 +01:00
77db5becb6
Merge pull request #70 from tomtom84/master
2012-03-03 14:13:14 -08:00
173fb983c5
navbar fix
2012-03-03 23:12:03 +01:00
1bed4010aa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-03 16:49:22 -05:00
952bcc5158
Merge pull request #69 from abinoam/docblox
2012-03-03 12:56:17 -08:00
a19d8d9e9f
Added docblox default configuration file.
2012-03-03 16:52:33 -04:00
7230fa5a94
Merge pull request #68 from tomtom84/master
2012-03-03 12:48:34 -08:00
42b9887693
fixed apps css
2012-03-03 21:45:59 +01:00
da78d8594f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-03 13:39:56 -05:00
1dfd5c4f85
Merge pull request #67 from tomtom84/master
2012-03-03 10:09:28 -08:00
d4ac1f2a9c
fixed star/unstar
2012-03-03 19:07:55 +01:00
e84e684fdc
Merge pull request #66 from tomtom84/master
2012-03-03 07:54:21 -08:00
83e9f57459
fixed admin fixed editor
2012-03-03 16:49:48 +01:00
2b9ea33e8b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-03 09:45:32 -05:00
792031c36e
Merge pull request #65 from tomtom84/master
2012-03-03 06:03:34 -08:00
b3ba2eb4d0
fix editor
2012-03-03 15:01:25 +01:00
ba28404470
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-03 08:05:53 -05:00
8ffe15fbb1
Merge pull request #64 from tomtom84/master
2012-03-03 04:30:31 -08:00
friendica
Simon
Michael Johnston
Simon L'nu
tommy tomson
Alexander Kampmann
tomtom84
Abinoam P. Marques Jr.