Michael Vogel
4e220ec391
Merge commit 'upstream/master'
2012-04-14 13:15:25 +02:00
Simon L'nu
96cda3136b
lighten wrapper shadow a bit on dispy
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-13 20:14:09 -04:00
Simon L'nu
6b46fe3dfe
neat little changes. hopefully the shadow will be well recieved
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-13 19:30:07 -04:00
friendica
bfb821e918
well that was a silly mistake...
2012-04-13 16:12:06 -07:00
tommy tomson
a300616bcb
diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
2012-04-13 22:08:13 +02:00
tommy tomson
2c843466a9
diabook: theme-settings: users can set font-size and line-height for posts and comments
2012-04-13 21:34:21 +02:00
tommy tomson
615cd53e51
diabook-themes: small fixes
2012-04-13 18:28:11 +02:00
Fabio Comuni
f6e1ddf7fb
Merge remote-tracking branch 'friendica/master'
2012-04-13 11:59:25 +02:00
Fabio Comuni
469710893d
quattro: language icon in navbar
2012-04-13 11:56:56 +02:00
Fabio Comuni
4496d075e5
move html out of lang_selector() and new template lang_selector.tpl
2012-04-13 11:56:21 +02:00
Fabio Comuni
fdf50b8574
display settings: show theme screenshot on page load
2012-04-13 11:55:36 +02:00
Fabio Comuni
7aa3b92f4c
quattro: add admin theme settigs. darker items background with a bottom border.
2012-04-13 11:21:15 +02:00
Fabio Comuni
138a0e06b8
admin: change global theme settings
2012-04-13 11:20:05 +02:00
Fabio Comuni
8be7b5c65b
quattro: work on
...
"like" activitiy items less visible
fixes to widths
popup notification out of navbar
category input in jot
2012-04-13 09:43:38 +02:00
friendica
3c4e6d3461
bug #369 - show contacts who are not in any groups
2012-04-12 23:06:41 -07:00
friendica
972c01edb3
profile change activities
2012-04-12 21:10:32 -07:00
friendica
32cd62ff0a
allow setting default new friend notify
2012-04-12 18:15:46 -07:00
Michael Vogel
572678fef9
Merge commit 'upstream/master'
...
Conflicts:
include/dba.php
2012-04-13 00:10:41 +02:00
tommy tomson
e3af552bbf
diabook-themes: fixed css for settings aside-links
2012-04-12 22:00:18 +02:00
tommy tomson
39009b5ac9
diabook-themes: css-fixes in aside
2012-04-12 20:23:03 +02:00
tommy tomson
3a8e6cbacb
fix css in aside
2012-04-12 17:37:55 +02:00
Fabio Comuni
309f2bfa5f
quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu
2012-04-12 09:17:35 +02:00
Fabio Comuni
6c50eba206
quattro: move center css to style.php. add tpl for generic_links_widget
2012-04-12 08:40:17 +02:00
Fabio Comuni
e992e29685
settings: move tabs to aside. add a new template "generic_links_widget.tpl"
2012-04-12 08:38:55 +02:00
Simon L'nu
c21244f679
fix the icons a bit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-12 01:08:02 -04:00
Michael Vogel
ee714daf4d
Merge commit 'upstream/master'
2012-04-11 19:35:51 +02:00
Michael Vogel
c88c2515e4
API: Improved the timeline. Several (disabled) tests with caching of photos.
2012-04-11 19:31:01 +02:00
tommy tomson
a1d5026abf
diabook-themes: small fix
2012-04-11 18:49:07 +02:00
Simon L'nu
c79d1deb92
major refactor. step 1
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-11 01:59:33 -04:00
friendica
b02a671494
visit "random profile" feature
2012-04-10 20:50:31 -07:00
friendica
ed608694ce
make editplain work everywhere
2012-04-10 18:08:06 -07:00
friendica
703bfcb6d4
Merge https://github.com/friendica/friendica into pull
2012-04-10 16:07:05 -07:00
friendica
3c66816938
Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull
2012-04-10 15:28:48 -07:00
Tobias Hößl
e1c43c1c1c
Incorrect tranlation (one negation too much)
2012-04-10 20:43:31 +00:00
tommy tomson
6db33fc513
diabook-themes: smal fix in bbcode-js
2012-04-10 15:13:34 +02:00
tommy tomson
b3f18945ba
diabook-themes: added url and quote to bbcode toolbar under comment box
2012-04-10 14:38:59 +02:00
Simon L'nu
707a5dbae7
aaah, nice asides ;). we'll be updating these soon
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 05:48:42 -04:00
friendica
2d23c8a246
Merge pull request #218 from campino/master
...
db errors and update error mail
2012-04-09 16:53:23 -07:00
tommy tomson
0d4fab4ee3
bbcode toolbar attached to the comment text field
...
minor css-fixes
2012-04-10 00:55:39 +02:00
Klaus Weidenbach
1f9fe8b5ee
Remove Gravatar from core and add new hook avatar_lookup.
...
This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow?
2012-04-09 21:22:09 +02:00
tommy tomson
d25a9df996
diabook-themes: small icon fix
2012-04-09 19:56:53 +02:00
Alexander Kampmann
2190b95d80
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-09 16:56:37 +02:00
tommy tomson
c27c340de1
diabook-nav-icons with gradient
2012-04-09 16:41:23 +02:00
Alexander Kampmann
1370ba5d16
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-09 14:28:21 +02:00
Alexander Kampmann
7187516718
fixed some typos
2012-04-09 14:27:52 +02:00
Michael Vogel
894e126c55
API: Tweetdeck is now working
2012-04-09 11:49:33 +02:00
zottel
5183d4f77d
Some new German translations
2012-04-09 02:30:18 +02:00
Alexander Kampmann
0d60dbef31
added exceptions to dba class
...
added exception handling to index.php, please mind that there is no
recovery at the moment
added transactions to db update. Please mind that they might not be
supported by db table engines.
added admin email on failed updates
added german translation for admin email
2012-04-09 00:45:10 +02:00
tommy tomson
7d018f651d
fixed z-index of youtube-vids
...
fixed bug to hide right_side
2012-04-09 00:02:48 +02:00
friendica
741a5dba57
provide theme_init() functions
2012-04-08 05:52:00 -07:00