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
tommy tomson
baeb735315
small fixes
2012-03-25 19:43:42 +02:00
Simon L'nu
2c43120129
dispy-dark not experimental. start implementing fpostit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 03:22:16 -04:00
Simon L'nu
84686a2698
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
move community_pages to right_aside, fixes in css
improved the inivitations and added a bit of sales pitch.
* master:
2012-03-25 03:18:21 -04:00
tommy tomson
329a26d62e
move community_pages to right_aside, fixes in css
2012-03-25 08:47:17 +02:00
Simon L'nu
1d56224b08
increase version to 1.0 for dispys \o/
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 01:12:28 -04:00
Simon L'nu
8fe77e5b86
implement filer/file-as
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 01:01:59 -04:00
tommy tomson
8451b22d42
small fix in css
2012-03-24 08:56:26 +01:00
tommy tomson
ba027f174d
add right_aside to diabook-blue
2012-03-24 08:13:48 +01:00
tommy tomson
378762fed2
add connectable services to right_aside
2012-03-24 06:17:14 +01:00
tommy tomson
d76b052f90
add PostIt to right_aside, fixes in css
2012-03-24 04:05:21 +01:00
Fabio Comuni
1780fff161
diabook: theme.php
...
remove code duplication
last photos check for user "hidewall"
remove unneeded regex
move js code to close popup in main.js (missing stop event propagation in popup links)
2012-03-23 14:09:06 +01:00
Fabio Comuni
82cc86a41a
user settings: don't show emoticons
2012-03-23 12:07:22 +01:00
tommy tomson
c35b9ec24f
fix in css right_aside
2012-03-23 10:16:11 +01:00
tommy tomson
7706a8f9d8
small fix
2012-03-23 07:28:48 +01:00
tommy tomson
687fa80094
fix 1024resolution
2012-03-23 07:02:21 +01:00
tommy tomson
bf4dd8ad17
add right_aside to theme diabook
2012-03-23 02:36:34 +01:00
07c5b0af5a
quattro(-green) styling the 'filed under: remove' text
2012-03-22 14:09:21 +01:00
1e86e3fb26
it's only item.filer ;-)
2012-03-22 13:46:05 +01:00
5babf5c8b4
Merge branch 'quattrofiler'
2012-03-22 13:42:10 +01:00
6df7fae4b5
non static filer text
2012-03-22 13:41:41 +01:00
54c08b2b0f
adding filer functionality to quattro(-green)
2012-03-22 12:41:51 +01:00
friendica
808180ce5f
missing tooltip for "file as"
2012-03-22 04:07:37 -07:00
tommy tomson
e37c4f69b4
add file_as-option to diabook-derivates
2012-03-22 06:54:18 +01:00
tommy tomson
72d0756fa6
add icons to aside diabook, fixes in css
2012-03-22 04:33:21 +01:00
friendica
89028f2e2f
add comix-plain
2012-03-21 13:55:37 -07:00
friendica
56495e04b2
smooth the comix comment box
2012-03-21 06:48:04 -07:00
friendica
1a98f3c067
ika to ica
2012-03-21 00:35:33 -07:00
friendica
adcf52d02d
facepark is unsupported ATM
2012-03-21 00:08:06 -07:00
friendica
db02eebde1
Merge branch 'pull'
2012-03-20 23:59:02 -07:00
friendica
6c7b619b34
remove stray template variable from old code
2012-03-20 23:57:33 -07:00
friendica
efd7c14c24
Merge pull request #154 from tonybaldwin/master
...
added theme
2012-03-20 23:31:12 -07:00
friendica
0dc4c3f484
add comix theme
2012-03-20 22:54:20 -07:00
friendica
4d39b0658f
use password field for DB input
2012-03-20 22:53:19 -07:00
tony baldwin
e5c29fcc78
Merge remote branch 'upstream/master'
2012-03-21 01:36:23 -04:00
tony baldwin
cf17606d0f
added Vijay's theme from facepark.in
2012-03-21 01:33:48 -04:00
Simon L'nu
de0298e67e
some tweakings for intro boxes (finally got an intro i could see :). dispy synced with dispy-dark
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-20 11:37:51 -04:00
friendica
cca524495c
community discovery cont., cleanup of DB debugging
2012-03-18 22:12:36 -07:00
friendica
c286681158
Merge pull request #147 from CatoTH/master
...
CSRF-Protection in the group-related form
2012-03-18 17:54:12 -07:00
Simon L'nu
e84095182f
fix the comment box being too wide and looking off-kilter
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-18 18:33:38 -04:00
Michael Vogel
6f10142b2e
API: Seesmic is now working. Optimizing text export.
2012-03-18 17:52:51 +01:00
Tobias Hößl
453b5b46a3
CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)
2012-03-18 15:44:33 +00:00
Simon L'nu
87fdae2dd8
[fix] whitespace in photo_view and like_noshare. dispy-dark clean up
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-17 01:55:40 -04:00
Simon L'nu
75883b196e
remove auto-complete from darkzero-NS, dispys, since the comment one is now global
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 21:23:24 -04:00
Simon L'nu
368d93625d
make auto-complete in darkzero-NS. other themes can use this easily. might need to edit the id it hooks into
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 20:29:02 -04:00
Simon L'nu
91fee866b7
make profiles-menu disappear when clicked outside it
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 16:43:34 -04:00
Simon
1246a40ec2
Merge pull request #141 from CatoTH/master
...
Private messages - tabindex
2012-03-16 10:54:20 -07:00
Tobias Hößl
90bb32ab73
Bugfix of old IEs
2012-03-16 17:47:40 +00:00
Tobias Hößl
27054964fe
Forgot to remove a debug line
2012-03-16 17:46:26 +00:00
Tobias Hößl
75823c2353
Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
2012-03-16 17:45:07 +00:00
Simon L'nu
7b15f27ba4
weee, dispys get another update
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 13:31:59 -04:00
Simon L'nu
d965f73ef1
missing close double quote in mail_list.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 01:57:27 -04:00
Simon L'nu
6bdb71f01c
more changes in dispy-dark
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 01:55:34 -04:00
friendica
33e03a8df0
Merge branch 'pull'
2012-03-15 19:56:32 -07:00
friendica
5a12383b78
undo git stuffup
2012-03-15 19:55:58 -07:00
tommy tomson
02395c8af5
added icons to profile_side, fixes in css
2012-03-16 03:49:43 +01:00
friendica
5d2c590fa9
Merge pull request #136 from annando/master
...
Mail improvements, item caching and so on
2012-03-15 15:30:52 -07:00
Simon L'nu
5c75d40c0b
fixed the sidebar edit thingy. haven't synced dispy yet.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 17:27:06 -04:00
Michael Vogel
9243c9fc14
Merge commit 'upstream/master'
2012-03-15 21:11:58 +01:00
Simon L'nu
5b757e4e0e
commit latest to dispy-dark. fixes in html css and js
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 15:07:17 -04:00
friendica
a7fd3a8b24
Merge branch 'pull'
2012-03-15 01:48:10 -07:00
friendica
4cd3d5cd02
Merge https://github.com/friendica/friendica into pull
2012-03-15 01:48:07 -07:00
tommy tomson
6dbee45d92
add links to wall, photos, events, etc to aside on networkpage, fixes in css
2012-03-15 08:29:39 +01:00
friendica
93a8907f43
force login to ssl on SSL_POLICY_SELFSIGN
2012-03-14 21:29:44 -07:00
friendica
f0a62d8908
ssl_policy stuff
2012-03-14 20:36:23 -07:00
friendica
531201f2a1
Merge pull request #132 from campino/master
...
Test cases
2012-03-14 15:16:30 -07:00
friendica
959aa13de0
Merge pull request #133 from tonybaldwin/master
...
slack-NS
2012-03-14 15:15:34 -07:00
friendica
2dc527609e
Merge https://github.com/friendica/friendica into pull
2012-03-14 14:34:48 -07:00
Simon
c95deb4839
Merge pull request #134 from simonlnu/master
...
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
2012-03-14 08:02:04 -07:00
Alexander Kampmann
70709a8825
Merge branch 'master' of git://github.com/friendica/friendica
...
Conflicts:
view/de/strings.php
2012-03-14 12:57:35 +01:00
tommy tomson
f03c57007a
fix in nav
2012-03-14 12:56:59 +01:00
tommy tomson
42462cc1f0
add links to home, profile, photos, events, notes to aside in network-stream
2012-03-14 12:50:11 +01:00
Simon
fb77bfa648
Merge pull request #131 from simonlnu/master
...
massive work done to both dispys, mostly -dark
2012-03-13 22:10:02 -07:00
Simon L'nu
975781d3e2
massive work done to both dispys, mostly -dark
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-14 01:05:08 -04:00
friendica
4972d7ef6e
more work on filer, comment level and file tag removal
2012-03-13 20:46:37 -07:00
Tony Baldwin
1ae740535d
added slack-NS, non-scrolly, slackr-based theme.
2012-03-13 23:05:04 -04:00
friendica
be48fff157
file as widget and basic filing implementation for duepuntozero,slackr
...
much more work needed - this is just for test/evaluation currently
2012-03-13 18:13:03 -07:00
friendica
427362c324
Merge branch 'pull'
2012-03-13 15:41:13 -07:00
friendica
dc84da520d
invite potential connectees to the free social web
2012-03-13 15:40:16 -07:00
friendica
acc4bbeb6e
Merge pull request #129 from CatoTH/master
...
CSRF-Protection and minor changes
2012-03-13 14:36:52 -07:00
friendica
bf7425c591
click anywhere to close notifications -> zeros and bubbles
2012-03-12 20:21:32 -07:00
tommy tomson
8358b9247f
fix css
2012-03-13 00:38:38 +01:00
tomtom84
ecc9f4ba70
Merge pull request #127 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 16:06:15 -07:00
tommy tomson
27bc8052d0
use fancybox instead of lightbox
2012-03-13 00:04:19 +01:00
tomtom84
8a85914e1d
Merge pull request #126 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 15:33:29 -07:00
tommy tomson
caffb217c1
fixes
2012-03-12 23:31:54 +01:00
Tobias Hößl
59766b944c
Some security against XSRF-attacks
2012-03-12 20:17:37 +00:00
tomtom84
a1305433b8
Merge pull request #125 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 13:11:19 -07:00
tommy tomson
9436175746
add lightbox, fixex in css
2012-03-12 21:09:16 +01:00
Simon L'nu
9f52e3df8d
fix dispy-dark photo album stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 21:34:51 -04:00
Simon L'nu
e9b82bb5ee
fix dispys' css and layout
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 20:36:16 -04:00
Michael Vogel
7235d5466a
Removed changes
2012-03-11 20:24:55 +01:00
Michael Vogel
d653e27e2d
Merge commit 'upstream/master'
...
Conflicts:
view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl
2012-03-11 20:22:28 +01:00
Michael Vogel
b879a1ddf1
Pages: Show every community page - even from foreign servers (with caching)
2012-03-11 17:45:12 +01:00
Simon L'nu
258a8c0871
screwed up on the font-size for screen last push
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:29:12 -04:00
Simon L'nu
fa0cb8514d
add some '@media handheld' types for dispys
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:24:49 -04:00
Simon L'nu
62fe48f064
fix more stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:14:31 -04:00
Simon L'nu
57d8370376
fix some stuff right away
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 09:12:31 -04:00
Simon L'nu
f7ade749b8
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 01:32:11 -05:00
friendica
1bddd48661
bug #327 - composed private message is lost if no recip specified.
2012-03-10 15:50:51 -08:00
Michael Vogel
74b3e9f273
Enabled Caching for items. Changed color of tags in diabook.
2012-03-10 15:50:35 +01:00
tomtom84
c79cb57e1e
Merge pull request #118 from tomtom84/master
...
fixes in diabook-derivates
2012-03-10 04:24:49 -08:00
tommy tomson
0f3255467e
fixed login-fields, fixed. notofication.png, changed locations
2012-03-10 13:22:41 +01:00
1e37477fdc
German translation
2012-03-10 10:36:20 +01:00
Michael Johnston
fd1f8fb436
allow user to set number of items to show on network page
2012-03-09 21:29:39 -05:00
Michael Vogel
cb1ecf2c5a
diabook: Moving the location between the icons
2012-03-10 00:15:27 +01:00
tomtom84
68ca29719e
Merge pull request #116 from tomtom84/master
...
fixes in diabook-derivates
2012-03-09 09:17:01 -08:00
tommy tomson
8fe4645a5d
add js to hide nav-menus, when clicked outside
2012-03-09 18:15:27 +01:00
tomtom84
68541b5dd2
Merge pull request #115 from tomtom84/master
...
fixes in diabook-derivates
2012-03-09 04:24:59 -08:00
tommy tomson
9f441731af
fixes in css
2012-03-09 13:23:38 +01:00
Alexander Kampmann
af34cf019c
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-09 12:17:19 +01:00
friendica
2ce78253ae
Merge branch 'pull'
2012-03-09 00:48:16 -08:00
friendica
3878b58f0d
bug #324 - tinymce used for mail even if editplain being used.
2012-03-09 00:47:10 -08:00
Simon L'nu
81f5b0e2df
[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-09 00:26:54 -05:00
Simon L'nu
dc8d060d4d
i consider dispy pretty stable at this point, so i'm removing the experimental file
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-09 00:00:56 -05:00
Simon L'nu
20b2090182
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
removed info
add info
fixed star-bug
More improved transparency for smilies
removed dolphin file (wtf?)
.
* master:
2012-03-08 23:59:43 -05:00
tomtom84
e25fb2b2f9
Merge pull request #112 from tomtom84/master
...
fixes in diabook-derivates
2012-03-08 19:39:39 -08:00
tommy tomson
e06b941307
removed info
2012-03-09 04:38:20 +01:00
tomtom84
92ab98f8d8
Merge pull request #111 from tomtom84/master
...
fixes in diabook-derivates
2012-03-08 19:16:01 -08:00
tommy tomson
722f631d15
add info
2012-03-09 04:14:24 +01:00
tomtom84
05561bd905
Merge pull request #110 from tomtom84/master
...
fixes in diabook-derivates
2012-03-08 18:02:25 -08:00
tommy tomson
feda3cfc96
fixed star-bug
2012-03-09 02:59:13 +01:00
Simon L'nu
8d19baadff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
theme info file for testbubble
catalan translation
revup
add theme diabook-blue, fix css
* master:
2012-03-08 20:38:54 -05:00
friendica
b86a08166c
theme info file for testbubble
2012-03-08 16:30:45 -08:00
friendica
af9f7da449
catalan translation
2012-03-08 16:29:22 -08:00
friendica
3b47626c15
Merge https://github.com/friendica/friendica into pull
2012-03-08 14:35:47 -08:00
tommy tomson
b9dda93f0c
add theme diabook-blue, fix css
2012-03-08 23:22:26 +01:00
Simon L'nu
5fe8952c29
make svg from notifications.svg to ease future editing. more dispy tweaks
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-08 13:37:45 -05:00
tomtom84
08b5ede5a1
Merge pull request #107 from tomtom84/master
...
fixes in theme diabook
2012-03-08 05:52:14 -08:00
tommy tomson
1fcbc7aa5a
add links to /profiles, add some icons to diabook/icons, fixes in css
2012-03-08 14:49:07 +01:00
Simon L'nu
15d310e4c3
fix jot.tpl buttons. fix up subsequent styling breakage
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-07 12:35:04 -05:00
Simon L'nu
66d2c52b5f
push fix for funky menu action. the overflow-x might break again for some people
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-07 10:07:36 -05:00
Alexander Kampmann
4690d00141
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-07 12:06:20 +01:00
Alexander Kampmann
b2df1205ef
merged
2012-03-07 12:06:09 +01:00
tomtom84
dd2ff7c796
Merge pull request #103 from tomtom84/master
...
fixes in theme diabook
2012-03-06 23:44:18 -08:00
tommy tomson
ec3ce05357
fix in navbar
2012-03-07 08:42:19 +01:00
tomtom84
05a52b2660
Merge pull request #101 from tomtom84/master
...
fixes in theme diabook
2012-03-06 15:49:32 -08:00
tommy tomson
49b5a1bf20
fix in navbar
2012-03-07 00:47:43 +01:00
Simon
decc9e5798
Merge pull request #99 from tomtom84/master
...
fixes in theme diabook
2012-03-06 15:22:55 -08:00
tommy tomson
6a5c4bab9c
messages-menu translation, add scroll-to-top and theme-bug-report in theme
2012-03-07 00:07:27 +01:00
Simon L'nu
edd450cf06
dispy, dispy, oh what a little lispy
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-06 17:55:05 -05:00
friendica
8fb0ea4048
bugs #312 , #313
2012-03-06 14:27:53 -08:00
Simon L'nu
bc8b014906
styling fixes in dispy. fix typos in settings.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-06 16:18:26 -05:00
Fabio Comuni
607ee1ff9c
quattro: theme settings (a bit hackish)
2012-03-06 09:50:18 +01:00
tommy tomson
eaaf030c18
Merge remote-tracking branch 'origin/master'
2012-03-06 08:28:21 +01:00
tommy tomson
b64b1d13a4
fixes in diabook
2012-03-06 08:27:20 +01:00
friendica
321b651635
Merge branch 'pull'
2012-03-05 18:52:15 -08:00
friendica
23460302f5
some admin page fixes and cleanup
2012-03-05 18:51:21 -08:00
Michael Johnston
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
friendica
e5de03040e
Merge branch 'pull'
2012-03-05 15:59:28 -08:00
friendica
7b3349f38a
some testbubble stuff
2012-03-05 15:58:26 -08:00
Simon L'nu
190650060a
forgot a small change in .field_help
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 18:16:51 -05:00
Simon L'nu
50824bddd0
implement more of the changes requested
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 17:57:04 -05:00
tommy tomson
a406c16581
fixes
2012-03-05 22:31:03 +01:00
Alexander Kampmann
fbc017cdba
added test blueprints, fixed? encoding issues
2012-03-05 22:22:10 +01:00
Simon L'nu
9d461846e2
multiple fixes; the jot-header works as standalone, not sure what's up.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 15:55:17 -05:00
Simon L'nu
02f825ca3c
tweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 13:16:28 -05:00
Simon L'nu
ef1d02e7bd
still working on jot-header. amending <aside> and other elements
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 12:21:57 -05:00
Simon L'nu
65b6ec79ed
hopefully fix the overflow issue everywhere this time
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 10:55:26 -05:00
friendica
965e657c20
$name appearing on testbubble items
2012-03-05 03:10:45 -08:00
friendica
31f192bb57
Merge branch 'pull'
2012-03-05 00:54:25 -08:00
friendica
0d97799324
testbubble notifications
2012-03-05 00:53:42 -08:00
Simon L'nu
7de79a8c49
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
like dislike button
fixes in diabook
* master:
2012-03-05 01:08:54 -05:00
Simon L'nu
fe7a6b070d
yet more ui things, and bug fixing
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 01:08:45 -05:00
tomtom84
9c541dbd67
Merge pull request #83 from tomtom84/master
...
fixes in diabook theme
2012-03-04 20:15:26 -08:00
tommy tomson
fe614b4e7c
like dislike button
2012-03-05 05:14:08 +01:00
Simon
04527bd0b1
Merge pull request #80 from unary/darkzero
...
improved contrast in acl selector, and preview (darkzero)
2012-03-04 19:19:45 -08:00
Simon
3b95171824
Merge pull request #82 from simonlnu/master
...
say hello to dispy's younger brother
2012-03-04 19:19:08 -08:00
Simon L'nu
58cdf776b6
more ui thingies with dispy - we'll get you well dispy, we promise
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 22:16:10 -05:00
friendica
b57247d6a6
Merge branch 'pull'
2012-03-04 19:15:42 -08: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
Michael Johnston
b2035ae0c6
improved contrast in acl selector, and preview (darkzero)
2012-03-04 17:29:00 -05: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
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
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
tommy tomson
8e49b4332c
style.css fix
2012-03-04 14:19:53 +01: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
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
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
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
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
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
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
tommy tomson
d3f83c9375
fixed broken tags and notifications in theme
2012-03-03 00:41:02 +01: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
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
tommy tomson
e2798cee16
adjust
2012-03-02 16:01:20 +01:00
Fabio Comuni
ef34847501
templates: fix tags
2012-03-02 12:41:34 +01:00
fabrixxm
3a609adfb7
Merge pull request #55 from fabrixxm/master
...
Some minor and one majior mod in templates
2012-03-02 00:00:03 -08:00
tommy tomson
5183e737d0
diabook commit
2012-03-02 02:05:35 +01:00
Fabio Comuni
ed42fa7d59
conversation: remove templating items in code and move it to template.
2012-03-01 11:46:08 +01:00
Fabio Comuni
a26ce7c56b
show relation in contact_template
2012-03-01 11:31:16 +01:00
Fabio Comuni
b71a3af457
Merge remote-tracking branch 'friendica/master' into randomerror
2012-02-29 14:58:37 +01:00
Fabio Comuni
42d591d257
revert 01a2791e3a to avoid random preg internal errors. fix contact_template
2012-02-27 18:48:59 +01:00
friendica
153e7beb19
add plugin hooks to enotify
2012-02-26 23:54:04 -08:00
Simon L'nu
72e78046af
minor typographical fixes. need to do something about the http on https sites for html5shiv. changed to https on mine
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-27 01:04:41 -05:00
friendica
6bc48b29cc
fix tag icon size
2012-02-26 16:40:21 -08:00
friendica
e994b990eb
typo in css
2012-02-26 16:31:51 -08:00
friendica
a1861d1128
tagging missing from wallwall and a couple of themes, star missing from dispy
2012-02-26 16:29:06 -08:00
Michael
fe3dfbee56
Mail: New options for actions after importing mails.
2012-02-26 23:39:29 +01:00
Michael
437e18d7a7
Merge remote branch 'upstream/master'
2012-02-26 21:47:47 +01:00
Michael
edc44933a4
"Vier-Theme" Some more design stuff.
2012-02-26 21:16:29 +01:00
2081e6d507
some revision to the German strings
2012-02-26 17:12:14 +01:00
0877fbb42a
German strings
2012-02-26 15:41:27 +01:00
friendica
5f7858a688
show experimental and unsupported theme status on theme admin page
2012-02-26 04:17:02 -08:00
friendica
fb8675f349
jumping divs with no scrolling
2012-02-26 01:20:43 -08:00
friendica
484426d3e2
imrpove contrast on darkzero blockquotes
2012-02-26 00:53:31 -08:00
friendica
828034ad23
darkzero-NS theme
2012-02-26 00:48:11 -08:00
friendica
d075fd8a40
reverse order of links
2012-02-25 16:47:21 -08:00
friendica
579738aff7
fixed link for toggling plugin from detail page
2012-02-25 13:00:44 -08:00
Michael
1cf1870512
poller.php: Test for moving to archive, vier-style: notifications fixed
2012-02-25 19:40:05 +01:00
friendica
00edc89c47
notify positioning, theming
2012-02-25 05:00:48 -08:00
friendica
c90bac5727
sysnotify count in wrong location, and wrong number
2012-02-25 04:37:12 -08:00
friendica
4839c235da
theme seen,unseen notifications
2012-02-25 03:28:07 -08:00
Michael
3c68bf25ac
"vier" popup menu looks nicer now (more like quattro again)
2012-02-25 11:13:04 +01:00
Michael
dccefb3c36
"vier": The contacts are now working again. Line break before closing bbcodes removed.
2012-02-25 11:00:35 +01:00
friendica
aa67771eaa
photos in notifications
2012-02-25 00:42:25 -08:00
friendica
18bf5d1402
theme info (like plugin info)
2012-02-25 00:30:14 -08:00
friendica
6092567c97
notifications to zeros, bug in notify link
2012-02-24 23:44:55 -08:00
friendica
44c23cda8e
theme shakeup commences - themes are now administered in admin panel.
2012-02-23 20:29:09 -08:00
friendica
65ddefe9c5
system notifications to notify module, untranslated string in notifications.tpl
2012-02-23 17:37:03 -08:00
Fabio Comuni
f5b8654818
fix visualization in groupeditor
2012-02-23 16:21:28 +01:00
Fabio Comuni
fd3274ff53
less html in mod/group.php, template for group members editor, quattro theme for group edit.
2012-02-23 16:17:36 +01:00
Fabio Comuni
d45e26d6d9
Merge remote-tracking branch 'friendica/master'
2012-02-23 15:23:52 +01:00
1dacb2e570
quattro-green: removed contact_template.tpl
2012-02-23 14:16:20 +01:00
Fabio Comuni
6a0c815c1f
Merge remote-tracking branch 'friendica/master'
2012-02-23 14:10:32 +01:00
Fabio Comuni
edd946bcad
quattro: fix typos
2012-02-23 14:10:23 +01:00
c03b5b62c0
green-quattro: applied a color for shiny class and preview
2012-02-23 12:54:14 +01:00
Fabio Comuni
cbc60d525e
quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside.
...
remove html from viewcontacts.php and contacts.php
use contact_template.tpl to print contacts also in viewcontacts
2012-02-23 11:22:32 +01:00
friendica
d9e9fd0359
Merge branch 'master' into notify
2012-02-23 00:30:17 -08:00
friendica
fd43e2c563
more theme notify fixes
2012-02-23 00:28:26 -08:00
56f3c00eec
quattro: added styling to pivate message view
2012-02-23 09:02:40 +01:00
friendica
41636a50aa
new notify sort of working in testbubble
2012-02-22 23:34:30 -08:00
friendica
808b886a3e
Merge branch 'master' into notify
2012-02-22 22:36:07 -08:00
friendica
58a9c652de
Merge pull request #45 from annando/master
...
New HTML to BBCode converter, changes to BBCode, nginx support, ...
2012-02-22 20:21:05 -08:00
Michael
e34a648cad
German translation more gender friendly. Some more logging in poller.php
2012-02-22 15:20:49 +01:00
friendica
9fe12d1724
some cleanup of tb notifications
2012-02-21 20:22:09 -08:00
Abinoam P. Marques Jr
914169472e
view/admin_remoteupdate.tpl - Friendika -> Friendica
2012-02-20 19:47:56 -03:00
Abinoam P. Marques Jr
d89a0449d0
htconfig.tpl - Friendika -> Friendica
2012-02-20 19:47:44 -03:00
Abinoam P. Marques Jr
12a8796854
mod/dfrn_request.php and templates - Friendika -> Friendica
2012-02-20 19:38:43 -03:00
Michael
3a7695ded1
Fetched some missing styles from testbubble.
2012-02-20 15:11:27 +01:00
root
b6d7777226
New version of markdown. Playing with stylesheet. Testing line breaks.
2012-02-19 22:47:32 +01:00
Michael
4713069e68
Many small changes
2012-02-19 20:11:36 +01:00
Michael
cafd400352
Merge remote branch 'upstream/master'
...
Conflicts:
view/theme/vier/style.css
2012-02-19 20:09:42 +01:00
ike
73e0e4d783
New theme "vier" derives from "quattro"
2012-02-19 20:05:51 +01:00
friendica
75acc1ed96
support plaintext on editpost, editorinit called before all buttons laid out
2012-02-17 11:49:27 -08:00
652622894f
de strings
2012-02-16 11:55:52 +01:00
friendica
b1d31aca51
quick comments
2012-02-15 18:13:41 -08:00
fabrixxm
16f00cb73b
Merge pull request #36 from fabrixxm/master
...
Missing icons in 'quattro' and ajax events calendar
2012-02-15 03:51:44 -08:00
Fabio Comuni
73bee08ac2
enable ajax calendar with $a->config['experimentals']['new_calendar']=1
2012-02-15 12:47:50 +01:00
Fabio Comuni
fe3e8ee854
quattro: icons for attachments
2012-02-15 11:10:02 +01:00
friendica
03171fd7de
preliminary qcomment support, [nosmile] tag to disable smiley processing
2012-02-14 23:13:18 -08:00
Fabio Comuni
549c920e6f
events js: don't modify rendered item if not autor specified
2012-02-14 16:28:10 +01:00
Fabio Comuni
22cfb77173
events: first test for full-javascript events calendar
2012-02-14 16:19:48 +01:00
friendica
060ac4ebf1
delete mail message icon not brightening on hover
2012-02-14 02:34:05 -08:00
friendica
d2a9ce9362
more contacts categorisation, page cleanup
2012-02-13 22:48:35 -08:00
friendica
d75b6a00d4
tabs and total count for contacts page
2012-02-13 20:38:00 -08:00
friendica
bcad629633
more stray quotes
2012-02-13 18:40:56 -08:00
friendica
803a7425ea
make hr bbtag shareable, stray quote in duepuntozero wall_item
2012-02-13 18:40:28 -08:00
friendica
23f5abfa1f
Merge branch 'pull'
2012-02-13 14:17:20 -08:00
friendica
52cb63655a
POST should be lowercase these days
2012-02-13 14:15:39 -08:00
22bb285c7f
green variation of the quattro theme
2012-02-13 17:05:48 +01:00
Fabio Comuni
8369c243b3
Fix 'item not found' message
2012-02-13 10:19:10 +01:00
Fabio Comuni
850560519a
Merge remote-tracking branch 'friendica/master' into mobile
2012-02-13 09:46:42 +01:00
Fabio Comuni
16d3bc9deb
quattro: pause icon
2012-02-13 09:35:11 +01:00
Fabio Comuni
3e664dbdfe
reshare in "display" view
2012-02-13 09:33:20 +01:00
friendica
0c4606682f
fix link/bookmark reshares
2012-02-11 19:21:41 -08:00
friendica
da946bb9b0
bug #278 show only blocked contacts
2012-02-11 03:07:15 -08:00
friendica
75a62db9c5
show tags (pub_keywords) in advanced profile
2012-02-11 01:24:29 -08:00
Fabio Comuni
ed38808aae
hidden jot in "display" to allow reshare
2012-02-10 17:30:22 +01:00
