]>
git.mxchange.org Git - friendica.git/log
tomtom84 [Thu, 12 Apr 2012 15:39:32 +0000 (08:39 -0700)]
Merge pull request #229 from tomtom84/master
fixes in theme diabook
tommy tomson [Thu, 12 Apr 2012 15:37:55 +0000 (17:37 +0200)]
fix css in aside
friendica [Thu, 12 Apr 2012 14:48:28 +0000 (07:48 -0700)]
query to find un-grouped contacts
friendica [Thu, 12 Apr 2012 13:50:11 +0000 (06:50 -0700)]
reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem
friendica [Thu, 12 Apr 2012 12:48:41 +0000 (05:48 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Thu, 12 Apr 2012 12:47:57 +0000 (05:47 -0700)]
Merge pull request #228 from fabrixxm/master
settings tabs, notifications js and quattro
friendica [Thu, 12 Apr 2012 12:46:24 +0000 (05:46 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Thu, 12 Apr 2012 12:45:28 +0000 (05:45 -0700)]
turn off update transactions until we figure out how to do them safely.
friendica [Thu, 12 Apr 2012 12:15:45 +0000 (05:15 -0700)]
table cleanup
Fabio Comuni [Thu, 12 Apr 2012 07:17:35 +0000 (09:17 +0200)]
quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu
Fabio Comuni [Thu, 12 Apr 2012 07:15:08 +0000 (09:15 +0200)]
main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all
Fabio Comuni [Thu, 12 Apr 2012 06:42:00 +0000 (08:42 +0200)]
settings: remove call to profile_load()
Fabio Comuni [Thu, 12 Apr 2012 06:40:17 +0000 (08:40 +0200)]
quattro: move center css to style.php. add tpl for generic_links_widget
Fabio Comuni [Thu, 12 Apr 2012 06:38:55 +0000 (08:38 +0200)]
settings: move tabs to aside. add a new template "generic_links_widget.tpl"
Simon [Thu, 12 Apr 2012 05:09:09 +0000 (22:09 -0700)]
Merge pull request #227 from simonlnu/master
minor css fixes
Simon L'nu [Thu, 12 Apr 2012 05:08:02 +0000 (01:08 -0400)]
fix the icons a bit
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Thu, 12 Apr 2012 05:03:54 +0000 (01:03 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: small fix
* master:
friendica [Wed, 11 Apr 2012 23:45:19 +0000 (16:45 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Wed, 11 Apr 2012 23:13:57 +0000 (16:13 -0700)]
extensible item_id table for managing all the different message-ids generated by multiple services
tommy tomson [Wed, 11 Apr 2012 16:49:07 +0000 (18:49 +0200)]
diabook-themes: small fix
Simon [Wed, 11 Apr 2012 06:01:57 +0000 (23:01 -0700)]
Merge pull request #226 from simonlnu/master
re-factor default.php
Simon L'nu [Wed, 11 Apr 2012 05:59:33 +0000 (01:59 -0400)]
major refactor. step 1
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Wed, 11 Apr 2012 05:57:52 +0000 (01:57 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
visit "random profile" feature
* master:
friendica [Wed, 11 Apr 2012 03:51:04 +0000 (20:51 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Wed, 11 Apr 2012 03:50:31 +0000 (20:50 -0700)]
visit "random profile" feature
Simon [Wed, 11 Apr 2012 03:47:55 +0000 (20:47 -0700)]
Merge pull request #225 from simonlnu/master
[fixes] absolute links in docs and newmember.php; breaks sub-dir installs
Simon L'nu [Wed, 11 Apr 2012 03:45:47 +0000 (23:45 -0400)]
more ' = ' spacing fixes
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Wed, 11 Apr 2012 03:34:55 +0000 (23:34 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
* master:
Simon L'nu [Wed, 11 Apr 2012 03:34:39 +0000 (23:34 -0400)]
[fix] absolute links in docs and newmember.php; breaks sub-dir installs
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
friendica [Wed, 11 Apr 2012 03:09:51 +0000 (20:09 -0700)]
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
Simon L'nu [Wed, 11 Apr 2012 02:51:29 +0000 (22:51 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
cleanup photo menus
more backend work on mail2 followers
make editplain work everywhere
move all fix_mce to one function so it can easily be undone
duplicate community posts
fix_mce_lf contact edit page
fix_mce_lf on profiles
set default on get_avatar
rev update
Incorrect tranlation (one negation too much)
fixed install bug
diabook-themes: smal fix in bbcode-js
diabook-themes: added url and quote to bbcode toolbar under comment box
Remove Gravatar from core and add new hook avatar_lookup.
Rename gravatar_img() more generic to avatar_img().
* master:
friendica [Wed, 11 Apr 2012 02:33:32 +0000 (19:33 -0700)]
cleanup photo menus
friendica [Wed, 11 Apr 2012 02:15:52 +0000 (19:15 -0700)]
more backend work on mail2 followers
friendica [Wed, 11 Apr 2012 01:08:06 +0000 (18:08 -0700)]
make editplain work everywhere
friendica [Wed, 11 Apr 2012 00:14:07 +0000 (17:14 -0700)]
move all fix_mce to one function so it can easily be undone
friendica [Tue, 10 Apr 2012 23:59:30 +0000 (16:59 -0700)]
duplicate community posts
friendica [Tue, 10 Apr 2012 23:32:38 +0000 (16:32 -0700)]
fix_mce_lf contact edit page
friendica [Tue, 10 Apr 2012 23:31:49 +0000 (16:31 -0700)]
fix_mce_lf on profiles
friendica [Tue, 10 Apr 2012 23:07:05 +0000 (16:07 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Tue, 10 Apr 2012 22:33:43 +0000 (15:33 -0700)]
set default on get_avatar
friendica [Tue, 10 Apr 2012 22:28:48 +0000 (15:28 -0700)]
Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull
friendica [Tue, 10 Apr 2012 22:25:15 +0000 (15:25 -0700)]
rev update
friendica [Tue, 10 Apr 2012 22:23:04 +0000 (15:23 -0700)]
Merge pull request #222 from CatoTH/master
Translation bugfix
friendica [Tue, 10 Apr 2012 22:21:37 +0000 (15:21 -0700)]
Merge pull request #223 from campino/master
bug fix
Tobias Hößl [Tue, 10 Apr 2012 20:43:31 +0000 (20:43 +0000)]
Incorrect tranlation (one negation too much)
Alexander Kampmann [Tue, 10 Apr 2012 15:10:24 +0000 (17:10 +0200)]
fixed install bug
tommy tomson [Tue, 10 Apr 2012 13:13:34 +0000 (15:13 +0200)]
diabook-themes: smal fix in bbcode-js
tommy tomson [Tue, 10 Apr 2012 12:38:59 +0000 (14:38 +0200)]
diabook-themes: added url and quote to bbcode toolbar under comment box
Simon [Tue, 10 Apr 2012 09:50:42 +0000 (02:50 -0700)]
Merge pull request #221 from simonlnu/master
aaah, nice asides ;). we'll be updating these soon
Simon L'nu [Tue, 10 Apr 2012 09:48:42 +0000 (05:48 -0400)]
aaah, nice asides ;). we'll be updating these soon
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Tue, 10 Apr 2012 09:03:32 +0000 (05:03 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
path to default.php in theme dir was incorrect
* master:
friendica [Tue, 10 Apr 2012 08:51:53 +0000 (01:51 -0700)]
path to default.php in theme dir was incorrect
Simon L'nu [Tue, 10 Apr 2012 06:49:34 +0000 (02:49 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
rev update
source beautifarming to make review easier
fixed some typos
made exceptions from the db optional set address for updae mails correctly
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
* master:
friendica [Mon, 9 Apr 2012 23:55:06 +0000 (16:55 -0700)]
Merge branch 'pull'
friendica [Mon, 9 Apr 2012 23:54:39 +0000 (16:54 -0700)]
rev update
friendica [Mon, 9 Apr 2012 23:53:23 +0000 (16:53 -0700)]
Merge pull request #218 from campino/master
db errors and update error mail
Simon L'nu [Mon, 9 Apr 2012 23:20:51 +0000 (19:20 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bbcode toolbar attached to the comment text field minor css-fixes
diabook-themes: small icon fix
diabook-nav-icons with gradient
use local_user for tag completion if available. See bug #368
more sane defaults datetime_convert
fix empty string timezone
Some new German translations
send zrl after dfrn_request homecoming for manual entries
fix to wall_upload photos default permissions to use cid rather than uid.
fixed z-index of youtube-vids fixed bug to hide right_side
* master:
tomtom84 [Mon, 9 Apr 2012 22:56:52 +0000 (15:56 -0700)]
Merge pull request #220 from tomtom84/master
fixes in diabook-themes
tommy tomson [Mon, 9 Apr 2012 22:55:39 +0000 (00:55 +0200)]
bbcode toolbar attached to the comment text field
minor css-fixes
Klaus Weidenbach [Sun, 8 Apr 2012 21:20:31 +0000 (23:20 +0200)]
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?
Klaus Weidenbach [Mon, 20 Feb 2012 23:54:34 +0000 (00:54 +0100)]
Rename gravatar_img() more generic to avatar_img().
I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service.
First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin.
tommy tomson [Mon, 9 Apr 2012 17:56:53 +0000 (19:56 +0200)]
diabook-themes: small icon fix
Alexander Kampmann [Mon, 9 Apr 2012 14:56:37 +0000 (16:56 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica
Alexander Kampmann [Mon, 9 Apr 2012 14:56:01 +0000 (16:56 +0200)]
source beautifarming to make review easier
tomtom84 [Mon, 9 Apr 2012 14:42:57 +0000 (07:42 -0700)]
Merge pull request #217 from tomtom84/master
small fix in theme diabook
tommy tomson [Mon, 9 Apr 2012 14:41:23 +0000 (16:41 +0200)]
diabook-nav-icons with gradient
Alexander Kampmann [Mon, 9 Apr 2012 12:28:21 +0000 (14:28 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica
Alexander Kampmann [Mon, 9 Apr 2012 12:27:52 +0000 (14:27 +0200)]
fixed some typos
Alexander Kampmann [Mon, 9 Apr 2012 12:04:49 +0000 (14:04 +0200)]
made exceptions from the db optional
set address for updae mails correctly
friendica [Mon, 9 Apr 2012 11:56:43 +0000 (04:56 -0700)]
Merge branch 'pull'
friendica [Mon, 9 Apr 2012 11:55:52 +0000 (04:55 -0700)]
use local_user for tag completion if available. See bug #368
tomtom84 [Mon, 9 Apr 2012 11:02:29 +0000 (04:02 -0700)]
Merge pull request #216 from zzottel/master
German translations
friendica [Mon, 9 Apr 2012 01:09:21 +0000 (18:09 -0700)]
more sane defaults datetime_convert
friendica [Mon, 9 Apr 2012 01:01:49 +0000 (18:01 -0700)]
fix empty string timezone
zottel [Mon, 9 Apr 2012 00:30:18 +0000 (02:30 +0200)]
Some new German translations
friendica [Mon, 9 Apr 2012 00:28:36 +0000 (17:28 -0700)]
send zrl after dfrn_request homecoming for manual entries
zottel [Mon, 9 Apr 2012 00:20:34 +0000 (02:20 +0200)]
Merge remote branch 'upstream/master'
friendica [Sun, 8 Apr 2012 23:29:54 +0000 (16:29 -0700)]
Merge branch 'pull'
friendica [Sun, 8 Apr 2012 23:19:45 +0000 (16:19 -0700)]
fix to wall_upload photos default permissions to use cid rather than uid.
Alexander Kampmann [Sun, 8 Apr 2012 22:45:10 +0000 (00:45 +0200)]
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
tomtom84 [Sun, 8 Apr 2012 22:04:59 +0000 (15:04 -0700)]
Merge pull request #215 from tomtom84/master
fixes in diabook-themes
tommy tomson [Sun, 8 Apr 2012 22:02:48 +0000 (00:02 +0200)]
fixed z-index of youtube-vids
fixed bug to hide right_side
zottel [Sun, 8 Apr 2012 19:50:41 +0000 (21:50 +0200)]
Merge remote branch 'upstream/master'
Simon L'nu [Sun, 8 Apr 2012 17:49:52 +0000 (13:49 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
prepare for using a master theme_init()
provide theme_init() functions
rev updates
API: API is now enhanced. mentions, repeat and destroy now works.
"vier": Some design stuff
"vier": Bookmarks now look better.
API: template for test function added
The "vier"-theme is now working again. But there is still work needed
New script that checks if a script is running
poller: An optional lockfile is used to check if the poller is already running
Several improvements
* master:
friendica [Sun, 8 Apr 2012 13:20:57 +0000 (06:20 -0700)]
prepare for using a master theme_init()
friendica [Sun, 8 Apr 2012 12:52:00 +0000 (05:52 -0700)]
provide theme_init() functions
friendica [Sun, 8 Apr 2012 12:24:11 +0000 (05:24 -0700)]
rev updates
friendica [Sun, 8 Apr 2012 12:19:54 +0000 (05:19 -0700)]
Merge pull request #214 from annando/master
API, Locking, some changes to "vier"
zottel [Sun, 8 Apr 2012 08:33:32 +0000 (10:33 +0200)]
Merge remote branch 'upstream/master'
Michael Vogel [Sun, 8 Apr 2012 08:07:39 +0000 (10:07 +0200)]
Merge commit 'upstream/master'
Simon [Sun, 8 Apr 2012 03:47:37 +0000 (20:47 -0700)]
Merge pull request #213 from simonlnu/master
minor dispy* fixes
Simon L'nu [Sun, 8 Apr 2012 03:46:47 +0000 (23:46 -0400)]
minor dispy* fixes
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Michael Vogel [Sat, 7 Apr 2012 22:02:25 +0000 (00:02 +0200)]
API: API is now enhanced. mentions, repeat and destroy now works.
Simon L'nu [Sat, 7 Apr 2012 18:47:02 +0000 (14:47 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: small fix
changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
ignore utf8 offset error for unit tests
had arg order backwards
try assertContains
tag tests cont.
fix autonamenegativelength test
some work on tests
* master:
tommy tomson [Sat, 7 Apr 2012 17:56:00 +0000 (19:56 +0200)]
diabook-themes: small fix
Michael Vogel [Sat, 7 Apr 2012 16:35:37 +0000 (18:35 +0200)]
"vier": Some design stuff
Michael Vogel [Sat, 7 Apr 2012 16:35:29 +0000 (18:35 +0200)]
Merge commit 'upstream/master'
tomtom84 [Sat, 7 Apr 2012 14:41:23 +0000 (07:41 -0700)]
Merge pull request #212 from tomtom84/master
fixes in diabook-themes
tommy tomson [Sat, 7 Apr 2012 14:39:43 +0000 (16:39 +0200)]
changelog 1.014 :
image-rezise via jquery-plugin in stream
comments under uploaded pictues
add Diabook's version-number in head-section
css-fixes:
tabs
youtube-iframe
title-bar in jot-wrapper
blockquote & .oembed
friendica [Sat, 7 Apr 2012 09:31:41 +0000 (02:31 -0700)]
ignore utf8 offset error for unit tests