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
tommy tomson
83e9f57459
fixed admin
...
fixed editor
2012-03-03 16:49:48 +01:00
Simon L'nu
2b9ea33e8b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix editor
* master:
2012-03-03 09:45:32 -05:00
tomtom84
792031c36e
Merge pull request #65 from tomtom84/master
...
fix editor in theme diabook
2012-03-03 06:03:34 -08:00
tommy tomson
b3ba2eb4d0
fix editor
2012-03-03 15:01:25 +01:00
Simon L'nu
ba28404470
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:
2012-03-03 08:05:53 -05:00
tomtom84
8ffe15fbb1
Merge pull request #64 from tomtom84/master
...
fix editor in theme diabook
2012-03-03 04:30:31 -08:00
tommy tomson
60adef2463
fix text-editor in theme
2012-03-03 13:27:39 +01:00
9d885c4801
german strings as of 28th Feb from transilex
2012-03-03 12:17:32 +01:00
Tobias Hößl
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
tomtom84
b4361e37e0
Merge pull request #63 from tomtom84/master
...
fixes in diabook theme
2012-03-02 21:02:55 -08:00
tommy tomson
83c25b4386
small fix in style.css
2012-03-03 06:00:46 +01:00
tommy tomson
89f667ff76
fix star/unstar
2012-03-03 04:45:34 +01:00
friendica
2ae82ae3c2
Merge pull request #62 from tomtom84/master
...
fixes in diabook theme
2012-03-02 19:32:34 -08:00
tommy tomson
d138d07c05
fixes in wall_item.tpl and style.css in theme diabook
2012-03-03 04:27:06 +01:00
tommy tomson
8f72d95b0e
fix in wall_item.tpl
...
new icon link.png
2012-03-03 01:52:53 +01:00
friendica
a66648356f
add diabook to default themes
2012-03-02 16:24:26 -08:00
Simon L'nu
7ef861907e
minor formatting issues
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-02 19:09:17 -05:00
Simon L'nu
705b4a00ce
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix @mention autocomplete in comments
template proc: fix variables regexp
* master:
2012-03-02 19:05:41 -05:00
Simon
d32edf83d3
Merge pull request #61 from fabrixxm/master
...
fix to variable rexexp and mentions autocomplete in comments
2012-03-02 16:02:02 -08:00
tommy tomson
d3f83c9375
fixed broken tags and notifications in theme
2012-03-03 00:41:02 +01:00
Fabio Comuni
3339428987
fix @mention autocomplete in comments
2012-03-03 00:12:45 +01:00
Fabio Comuni
ae79de3039
Merge remote-tracking branch 'friendica/master'
2012-03-03 00:06:44 +01:00
Fabio Comuni
685686b3e8
template proc: fix variables regexp
2012-03-03 00:00:38 +01:00
Simon
f1efa0991a
Merge pull request #60 from simonlnu/master
...
apply changes to templates to testbubble
2012-03-02 11:01:21 -08:00
Simon L'nu
81de5f7802
apply changes to templates to testbubble
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-02 13:59:28 -05:00
Simon L'nu
02f8e95b1a
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:
2012-03-02 12:28:28 -05:00
Simon
e2e9050d74
Merge pull request #58 from simonlnu/master
...
fix for comment-wwedit-wrapper; CSS class in tpl had a stray $
2012-03-02 09:28:04 -08:00
Simon
d61ee3760d
Merge pull request #59 from tomtom84/master
...
diabook theme
2012-03-02 09:25:42 -08:00
tommy tomson
64a85b2507
deleted readme.txt from folder diabook
2012-03-02 18:01:21 +01:00
Simon L'nu
9c698b1a60
fix for comment-wwedit-wrapper CSS class in tpl had a stray $
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-02 12:00:16 -05:00
tommy tomson
ac1d758f6e
github finally working
2012-03-02 17:47:45 +01:00
tommy tomson
d72520f5f1
adjust3
2012-03-02 17:45:21 +01:00
Fabio Comuni
8a51e29824
template proc: add variable filters
2012-03-02 17:22:16 +01:00
tommy tomson
cb46e4a11f
Merge remote-tracking branch 'tomtom84_friendica/master' into master-2
2012-03-02 17:21:06 +01:00
tommy tomson
c26787ab94
adjust2
2012-03-02 17:18:11 +01:00
