Michael Vogel
|
3dc317dcc6
|
Merge commit 'upstream/master'
|
2012-04-02 22:00:22 +02:00 |
|
tommy tomson
|
6dfd55668f
|
diabook-themes: css-fixes
|
2012-04-02 20:30:27 +02:00 |
|
tommy tomson
|
076b1b374b
|
diabook-themes: fixes in js
|
2012-04-02 18:16:58 +02:00 |
|
tommy tomson
|
b5d57d5313
|
diabook-themes: fixed pageheader
|
2012-04-02 17:17:14 +02:00 |
|
tommy tomson
|
9faa940f04
|
diabook-themes: bugfixes / css-fixes
|
2012-04-02 15:06:55 +02:00 |
|
Michael Johnston
|
581b54c974
|
allow users to set categories on their posts
|
2012-04-01 21:28:31 -04:00 |
|
tommy tomson
|
23dc376364
|
diabook-themes: add link to global dir in "find friends" at right_aside
|
2012-04-02 01:29:20 +02:00 |
|
Michael Vogel
|
a39d8d3f02
|
The "vier"-theme is now working again. But there is still work needed
|
2012-04-02 00:08:49 +02:00 |
|
tommy tomson
|
408de09f72
|
css-fixes
|
2012-04-02 00:05:49 +02:00 |
|
tommy tomson
|
f075e977fe
|
add new messages-layout in diabook
|
2012-04-01 18:12:20 +02:00 |
|
tommy tomson
|
ff12637ceb
|
fix the display of community-plugin in diabook-themes
|
2012-04-01 16:34:31 +02:00 |
|
tommy tomson
|
15ba0ef5d0
|
various bugfixes and css-fixes
|
2012-04-01 13:12:15 +02:00 |
|
friendica
|
bc283f7c5d
|
qcomment overflow
|
2012-04-01 03:37:41 -07:00 |
|
friendica
|
ae5e5bf1e4
|
Merge branch 'pull'
|
2012-04-01 01:03:05 -07:00 |
|
friendica
|
5c2fdc795f
|
send unverified private mail using zrl
|
2012-04-01 00:59:35 -07:00 |
|
Simon L'nu
|
db7f7e4237
|
latest fixes for dispys. tweaking/repairing
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-04-01 03:57:05 -04:00 |
|
tommy tomson
|
36545e554b
|
diabook-themes: move "common tabs" to left side on settings page
|
2012-03-31 18:42:11 +02:00 |
|
tommy tomson
|
13ded12ffb
|
move the common tabs to right_aside in diabook-derivates
|
2012-03-31 16:58:02 +02:00 |
|
friendica
|
d5a31e5791
|
Merge branch 'pull'
|
2012-03-31 04:40:35 -07:00 |
|
tommy tomson
|
893ece9066
|
bug fix in diabook-aerith and -red
|
2012-03-31 11:50:33 +02:00 |
|
tommy tomson
|
0b41654935
|
bug-fixes in diabook-derivates
|
2012-03-31 11:09:57 +02:00 |
|
Simon L'nu
|
f5e3ec9a56
|
forgot the css changes for last push
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-31 04:02:51 -04:00 |
|
friendica
|
b4b1055b50
|
settings for unknown private mail acceptance
|
2012-03-31 00:57:59 -07:00 |
|
Simon L'nu
|
b88a452c6b
|
theme fixes; fix qcomment (finally)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-31 03:56:06 -04:00 |
|
Fabio Comuni
|
be2005f146
|
quattro: move quattro-green inside quattro folder.
Add config option to select quattro color scheme.
|
2012-03-30 21:21:14 +02:00 |
|
Fabio Comuni
|
77f57e1b13
|
Merge remote-tracking branch 'friendica/master'
|
2012-03-30 19:37:43 +02:00 |
|
tommy tomson
|
f50fb7d6ca
|
css-fixes in diabook-derivates
|
2012-03-30 17:52:29 +02:00 |
|
tommy tomson
|
6d3d882f9b
|
css-fixes in diabook-derivates
|
2012-03-30 16:33:34 +02:00 |
|
Fabio Comuni
|
24e7a3413c
|
quattro-green: remove settings code
Use config.php from quattro
|
2012-03-30 15:46:14 +02:00 |
|
Fabio Comuni
|
db59a45030
|
quattro: add config.php
|
2012-03-30 15:45:23 +02:00 |
|
Fabio Comuni
|
054d21a2e8
|
settings: add "display settings" tab, with UI-related settings.
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
|
2012-03-30 15:45:02 +02:00 |
|
tommy tomson
|
5b4bb347a6
|
css-fixes in diabook-derivates
|
2012-03-30 14:38:21 +02:00 |
|
|
|
8685a91742
|
quattro-green: added Description to the theme.php
|
2012-03-30 14:24:45 +02:00 |
|
|
|
b5e292509e
|
quattro-green: adopted quattro option for centered display
|
2012-03-30 14:03:33 +02:00 |
|
tommy tomson
|
5ced7f2bc5
|
add themes diabook-red & diabook-aerith
|
2012-03-30 13:48:34 +02:00 |
|
|
|
e2370b56bf
|
quattro-greey: apply theming to private mail
|
2012-03-30 08:10:49 +02:00 |
|
Simon L'nu
|
3b4016168d
|
tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-29 20:19:43 -04:00 |
|
friendica
|
e935b3a225
|
theme file_as combobox for 2.0
|
2012-03-29 04:07:16 -07:00 |
|
tommy tomson
|
339c8a4b56
|
css fixes in diabook-derivates
|
2012-03-29 11:02:59 +02:00 |
|
fabrixxm
|
3ee529d095
|
Merge pull request #185 from fabrixxm/master
Updated private message pages
|
2012-03-28 23:47:23 -07:00 |
|
friendica
|
75f3d41da2
|
Merge pull request #184 from annando/master
Enhancing the API - Preparations for a better facebook export
|
2012-03-28 15:08:15 -07:00 |
|
tommy tomson
|
aa26517cdc
|
add a searchbox to "find friends" for global search
|
2012-03-28 23:07:34 +02:00 |
|
tommy tomson
|
1a9bbac0be
|
bugfix in diabook
|
2012-03-28 20:45:39 +02:00 |
|
Michael Vogel
|
bdd2754740
|
Merge commit 'upstream/master'
|
2012-03-28 19:52:30 +02:00 |
|
Fabio Comuni
|
011a96d960
|
quattro: style pm pages
|
2012-03-28 15:34:02 +02:00 |
|
Fabio Comuni
|
50711040cb
|
message: remove tabs, move new message link to aside, all message with gmail-style
|
2012-03-28 15:31:58 +02:00 |
|
Fabio Comuni
|
f86e909a82
|
Merge remote-tracking branch 'friendica/master'
|
2012-03-28 15:21:01 +02:00 |
|
friendica
|
e894775a39
|
Merge branch 'pull'
|
2012-03-28 05:16:25 -07:00 |
|
Fabio Comuni
|
0f2a34c23b
|
quattro: tpl for "file as"
|
2012-03-28 13:37:04 +02:00 |
|
Simon L'nu
|
4a75ea2f42
|
really fix it this time...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-28 06:47:38 -04:00 |
|
Simon L'nu
|
3d5e711780
|
WITH is going on?
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-28 06:20:13 -04:00 |
|
friendica
|
b58dc43148
|
Merge branch 'pull'
|
2012-03-28 03:19:42 -07:00 |
|
friendica
|
b18086097e
|
title not updated when editing post
|
2012-03-28 03:18:26 -07:00 |
|
Simon
|
c32ee4d226
|
Merge pull request #180 from simonlnu/master
duh...
|
2012-03-28 03:03:47 -07:00 |
|
Simon L'nu
|
356e654521
|
doh fix
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-28 06:03:04 -04:00 |
|
fabrixxm
|
768326e484
|
Merge pull request #179 from fabrixxm/master
new field_combobox template and some eyecandy to "file as" function
|
2012-03-28 03:00:24 -07:00 |
|
Simon L'nu
|
bcf8a571f9
|
add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-28 05:52:28 -04:00 |
|
Fabio Comuni
|
0a2675d8b6
|
filer: replace "file as" prompt with combobox opened in fancybox
|
2012-03-28 10:49:34 +02:00 |
|
Fabio Comuni
|
82106632f0
|
template: field_combobox
a text input plus a select wich updates text input value on change.
html5 version commented out for poor browsers support.
|
2012-03-28 10:43:52 +02:00 |
|
friendica
|
7fc57f486f
|
support autocomplete @-tags in plaintext mode
|
2012-03-28 00:44:45 -07:00 |
|
friendica
|
f95fb2667a
|
vier navbar messed up after default theme template move
|
2012-03-28 00:16:22 -07:00 |
|
friendica
|
47eaa97af6
|
Merge branch 'pull'
|
2012-03-27 15:21:30 -07:00 |
|
friendica
|
aba63f8b78
|
turn on gecko spellcheck in tinymce
|
2012-03-27 15:20:36 -07:00 |
|
tommy tomson
|
f30471df4f
|
small fix in diabook
|
2012-03-27 23:41:19 +02:00 |
|
tommy tomson
|
211d00a1f5
|
fixes in diabook
|
2012-03-27 23:27:43 +02:00 |
|
tommy tomson
|
31fbc3fde3
|
provide a close-option for boxes in right_aside and store info via js and cookies
|
2012-03-27 19:02:07 +02:00 |
|
tommy tomson
|
9fd54de691
|
provide a close-option for boxes in right_aside and store info via js and cookies
|
2012-03-27 15:29:46 +02:00 |
|
Simon L'nu
|
c3388ad813
|
more fixes for dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-27 04:40:31 -04:00 |
|
Simon L'nu
|
6cd56e0f33
|
add dispy-dark snapshot; fix toolbar
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-27 03:57:47 -04:00 |
|
tommy tomson
|
e7bc3f2bd0
|
add "find friends" to right_aside to diabook, fixes in css in diabook
|
2012-03-27 08:28:47 +02:00 |
|
|
|
b9d976e31b
|
fixed Umlaute in de strings.php
|
2012-03-27 07:18:20 +02:00 |
|
friendica
|
5275b5d049
|
qcomment enhancements
|
2012-03-26 20:13:03 -07:00 |
|
Simon L'nu
|
3b9f0fd801
|
fix dispy's nav element; fix colours in #search-text
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-26 14:19:59 -04:00 |
|
tommy tomson
|
2d834d0f45
|
add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css
|
2012-03-26 18:54:57 +02:00 |
|
|
|
f1d15d8884
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2012-03-26 14:49:15 +02:00 |
|
|
|
37f10a6d4f
|
marking quattro-green as extension of quattro and deleting the tpl files
|
2012-03-26 14:48:01 +02:00 |
|
tommy tomson
|
aaddee0d94
|
minor css fixes in diabook
|
2012-03-26 13:52:44 +02:00 |
|
friendica
|
0164da4fb9
|
screenshot for darkzero-NS, same as darkzero
|
2012-03-26 04:25:20 -07:00 |
|
|
|
8ded404aaa
|
added quaddro templates to quaddro-green
|
2012-03-26 11:28:38 +02:00 |
|
friendica
|
63fa5f6c77
|
Merge pull request #172 from fabrixxm/master
Rearrange theme tpls
|
2012-03-26 02:00:14 -07:00 |
|
tommy tomson
|
876aa0c752
|
small fix in diabook :: add local friendica to right_aside
|
2012-03-26 10:33:28 +02:00 |
|
friendica
|
ca31aed490
|
Merge branch 'pull'
|
2012-03-26 00:53:32 -07:00 |
|
friendica
|
2820dba1e7
|
comix screenshot
|
2012-03-26 00:52:54 -07:00 |
|
Fabio Comuni
|
579c4f3079
|
diabook: small fix in theme_info array
|
2012-03-26 09:48:38 +02:00 |
|
friendica
|
109e8d4f05
|
more theme screenshots
|
2012-03-26 00:47:52 -07:00 |
|
Simon L'nu
|
0c4aba4b57
|
[fix] contact_edit.tpl syntax; reduce cols to fit better
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-26 03:39:06 -04:00 |
|
tommy tomson
|
c4c69959e2
|
add screenshots to diabook
|
2012-03-26 09:37:14 +02:00 |
|
Fabio Comuni
|
51d419e159
|
themes: use duepuntozero tpls as default
|
2012-03-26 09:09:14 +02:00 |
|
Simon L'nu
|
7de8e15ca4
|
fix the search box
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-26 03:01:13 -04:00 |
|
tommy tomson
|
37f02424f8
|
small fix
|
2012-03-26 07:02:27 +02:00 |
|
friendica
|
ba28362242
|
position the theme-preview on settings page
|
2012-03-25 21:12:10 -07:00 |
|
friendica
|
a06185e87c
|
screenshot gallery
|
2012-03-25 20:08:28 -07:00 |
|
friendica
|
be52ec6f5a
|
Merge branch 'pull'
|
2012-03-25 19:48:17 -07:00 |
|
Simon L'nu
|
3d11c22b01
|
add in the search box
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-25 22:45:44 -04:00 |
|
Simon L'nu
|
758e1b7424
|
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
theme screenshots
* master:
|
2012-03-25 22:40:24 -04:00 |
|
friendica
|
c88674aaf2
|
theme preview for end users
|
2012-03-25 19:05:14 -07:00 |
|
friendica
|
7ab117fd31
|
Merge branch 'pull'
|
2012-03-25 18:19:58 -07:00 |
|
friendica
|
7ef1ed2d70
|
theme screenshots
|
2012-03-25 17:55:43 -07:00 |
|
Simon L'nu
|
3d62cb9782
|
minor fix to dispy theme.php
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-25 17:13:24 -04:00 |
|
Simon L'nu
|
aa33815d3c
|
urgent fix to dispy-dark theme.php
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-25 17:06:38 -04:00 |
|
