This website requires JavaScript.
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
60adef2463
fix text-editor in theme
2012-03-03 13:27:39 +01:00
81a8d4f9db
Merge remote branch 'upstream/master'
2012-03-03 13:21:11 +01:00
9d885c4801
german strings as of 28th Feb from transilex
2012-03-03 12:17:32 +01:00
02a9fd5dc1
A 'PHP Fatal error: Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore.
2012-03-03 10:44:34 +00:00
b4361e37e0
Merge pull request #63 from tomtom84/master
2012-03-02 21:02:55 -08:00
83c25b4386
small fix in style.css
2012-03-03 06:00:46 +01:00
89f667ff76
fix star/unstar
2012-03-03 04:45:34 +01:00
2ae82ae3c2
Merge pull request #62 from tomtom84/master
2012-03-02 19:32:34 -08:00
d138d07c05
fixes in wall_item.tpl and style.css in theme diabook
2012-03-03 04:27:06 +01:00
8f72d95b0e
fix in wall_item.tpl new icon link.png
2012-03-03 01:52:53 +01:00
a66648356f
add diabook to default themes
2012-03-02 16:24:26 -08:00
7ef861907e
minor formatting issues
2012-03-02 19:09:17 -05:00
705b4a00ce
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-02 19:05:41 -05:00
d32edf83d3
Merge pull request #61 from fabrixxm/master
2012-03-02 16:02:02 -08:00
d3f83c9375
fixed broken tags and notifications in theme
2012-03-03 00:41:02 +01:00
3339428987
fix @mention autocomplete in comments
2012-03-03 00:12:45 +01:00
ae79de3039
Merge remote-tracking branch 'friendica/master'
2012-03-03 00:06:44 +01:00
685686b3e8
template proc: fix variables regexp
2012-03-03 00:00:38 +01:00
f1efa0991a
Merge pull request #60 from simonlnu/master
2012-03-02 11:01:21 -08:00
81de5f7802
apply changes to templates to testbubble
2012-03-02 13:59:28 -05:00
02f8e95b1a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-02 12:28:28 -05:00
e2e9050d74
Merge pull request #58 from simonlnu/master
2012-03-02 09:28:04 -08:00
d61ee3760d
Merge pull request #59 from tomtom84/master
2012-03-02 09:25:42 -08:00
64a85b2507
deleted readme.txt from folder diabook
2012-03-02 18:01:21 +01:00
9c698b1a60
fix for comment-wwedit-wrapper CSS class in tpl had a stray $
2012-03-02 12:00:16 -05:00
ac1d758f6e
github finally working
2012-03-02 17:47:45 +01:00
d72520f5f1
adjust3
2012-03-02 17:45:21 +01:00
ccfe402fb0
Merge remote branch 'upstream/master'
2012-03-02 17:44:09 +01:00
8a51e29824
template proc: add variable filters
2012-03-02 17:22:16 +01:00
cb46e4a11f
Merge remote-tracking branch 'tomtom84_friendica/master' into master-2
2012-03-02 17:21:06 +01:00
c26787ab94
adjust2
2012-03-02 15:57:32 +01:00
725daf2a5d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-02 10:55:59 -05:00
a3dcf491f1
Merge pull request #57 from fabrixxm/master
2012-03-02 07:55:38 -08:00
e2798cee16
adjust
2012-03-02 15:57:32 +01:00
aef737f376
template proc: allow isolation of var name between [ and ]
2012-03-02 15:53:48 +01:00
5fc3c3ab85
group: fix create new group form
2012-03-02 15:40:17 +01:00
ef34847501
templates: fix tags
2012-03-02 12:41:34 +01:00
0bf087c895
template proc: remove unused function and commented out code
2012-03-02 12:36:22 +01:00
60e5dda1b5
template proc: first optimization
2012-03-02 12:24:35 +01:00
bcadd873ee
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-02 04:53:54 -05:00
20817b4b8e
Merge remote branch 'upstream/master'
2012-03-02 10:34:18 +01:00
52ea842e87
html2bbcode: don't convert sizes and fonts.
2012-03-02 10:33:39 +01:00
f1bf6dcdfb
expand multiple heart smilies e.g. <3333
2012-03-02 01:24:20 -08:00
f0fdd1a163
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-02 04:07:23 -05:00
90bdddca0d
Merge branch 'pull'
2012-03-02 00:10:05 -08:00
be231e3466
item table update for file feature
2012-03-02 00:09:10 -08:00
3a609adfb7
Merge pull request #55 from fabrixxm/master
2012-03-02 00:00:03 -08:00
f55ffcd48c
Merge pull request #56 from tomtom84/master
2012-03-01 20:03:18 -08:00
1fac47a247
Merge remote-tracking branch 'upstream/master'
2012-03-02 04:58:37 +01:00
tommy tomson
friendica
Simon L'nu
Michael Johnston
Simon
tomtom84
Abinoam P. Marques Jr.
Michael
Tobias Diekershoff
Tobias Hößl
Fabio Comuni