]>
git.mxchange.org Git - friendica.git/log
tommy tomson [Fri, 30 Mar 2012 15:52:29 +0000 (17:52 +0200)]
css-fixes in diabook-derivates
tommy tomson [Fri, 30 Mar 2012 14:33:34 +0000 (16:33 +0200)]
css-fixes in diabook-derivates
Tobias Diekershoff [Fri, 30 Mar 2012 13:19:17 +0000 (15:19 +0200)]
catch OpenID login errors in cases when the OpenID server does not answers
tommy tomson [Fri, 30 Mar 2012 12:38:21 +0000 (14:38 +0200)]
css-fixes in diabook-derivates
Tobias Diekershoff [Fri, 30 Mar 2012 12:24:45 +0000 (14:24 +0200)]
quattro-green: added Description to the theme.php
Tobias Diekershoff [Fri, 30 Mar 2012 12:03:33 +0000 (14:03 +0200)]
quattro-green: adopted quattro option for centered display
friendica [Fri, 30 Mar 2012 11:53:49 +0000 (04:53 -0700)]
Merge branch 'pull'
friendica [Fri, 30 Mar 2012 11:53:00 +0000 (04:53 -0700)]
string update
tomtom84 [Fri, 30 Mar 2012 11:51:51 +0000 (04:51 -0700)]
Merge pull request #187 from tomtom84/master
add themes diabook-red & diabook-aerith
tommy tomson [Fri, 30 Mar 2012 11:48:34 +0000 (13:48 +0200)]
add themes diabook-red & diabook-aerith
friendica [Fri, 30 Mar 2012 09:42:36 +0000 (02:42 -0700)]
rename "file as" to "save to folder"
friendica [Fri, 30 Mar 2012 09:24:14 +0000 (02:24 -0700)]
Merge branch 'pull'
friendica [Fri, 30 Mar 2012 09:22:57 +0000 (02:22 -0700)]
bug #352 - qcomment plugin disabled, qcomments still allowed
Tobias Diekershoff [Fri, 30 Mar 2012 06:12:28 +0000 (08:12 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Fri, 30 Mar 2012 06:10:49 +0000 (08:10 +0200)]
quattro-greey: apply theming to private mail
friendica [Fri, 30 Mar 2012 05:20:14 +0000 (22:20 -0700)]
zrl into people searches
friendica [Fri, 30 Mar 2012 04:44:30 +0000 (21:44 -0700)]
another silly mistake
friendica [Fri, 30 Mar 2012 04:18:47 +0000 (21:18 -0700)]
silly mistake
friendica [Fri, 30 Mar 2012 04:08:10 +0000 (21:08 -0700)]
zrl on mentions
friendica [Fri, 30 Mar 2012 03:58:32 +0000 (20:58 -0700)]
use zrl to get home again
friendica [Fri, 30 Mar 2012 01:23:34 +0000 (18:23 -0700)]
Merge branch 'pull'
friendica [Fri, 30 Mar 2012 01:22:20 +0000 (18:22 -0700)]
provide a way to specify an admin account for siteinfo if more than one have admin email address
Simon [Fri, 30 Mar 2012 00:21:06 +0000 (17:21 -0700)]
Merge pull request #186 from simonlnu/master
tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
Simon L'nu [Fri, 30 Mar 2012 00:19:43 +0000 (20:19 -0400)]
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>
Simon L'nu [Fri, 30 Mar 2012 00:16:49 +0000 (20:16 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
typo in function name
* master:
friendica [Thu, 29 Mar 2012 23:01:44 +0000 (16:01 -0700)]
typo in function name
Simon L'nu [Thu, 29 Mar 2012 16:30:13 +0000 (12:30 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
theme file_as combobox for 2.0
css fixes in diabook-derivates
quattro: style pm pages
message: remove tabs, move new message link to aside, all message with gmail-style
quattro: tpl for "file as"
* master:
friendica [Thu, 29 Mar 2012 11:07:16 +0000 (04:07 -0700)]
theme file_as combobox for 2.0
tommy tomson [Thu, 29 Mar 2012 09:02:59 +0000 (11:02 +0200)]
css fixes in diabook-derivates
fabrixxm [Thu, 29 Mar 2012 06:47:23 +0000 (23:47 -0700)]
Merge pull request #185 from fabrixxm/master
Updated private message pages
Simon L'nu [Thu, 29 Mar 2012 04:04:00 +0000 (00:04 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
some reported warnings cleaned up
network permission ids
wrong var for notify total
fix notification total
improved rw notifications
bug #349 - email notls setting
add a searchbox to "find friends" for global search
bugfix in diabook
title not updated when editing post
New parameter in html2plain for plain text exports. More compatibility in API
API: added max_id
API: Now threading seems to work
API: Seesmic is now working. Optimizing text export.
Quotes with author are now having an "open/close" link
New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements
* master:
friendica [Thu, 29 Mar 2012 03:50:09 +0000 (20:50 -0700)]
some reported warnings cleaned up
friendica [Thu, 29 Mar 2012 02:57:28 +0000 (19:57 -0700)]
Merge branch 'pull'
friendica [Thu, 29 Mar 2012 02:56:14 +0000 (19:56 -0700)]
network permission ids
friendica [Thu, 29 Mar 2012 00:51:43 +0000 (17:51 -0700)]
wrong var for notify total
friendica [Thu, 29 Mar 2012 00:44:24 +0000 (17:44 -0700)]
fix notification total
friendica [Thu, 29 Mar 2012 00:21:56 +0000 (17:21 -0700)]
improved rw notifications
friendica [Wed, 28 Mar 2012 22:08:15 +0000 (15:08 -0700)]
Merge pull request #184 from annando/master
Enhancing the API - Preparations for a better facebook export
friendica [Wed, 28 Mar 2012 21:55:06 +0000 (14:55 -0700)]
Merge branch 'pull'
friendica [Wed, 28 Mar 2012 21:54:00 +0000 (14:54 -0700)]
bug #349 - email notls setting
tommy tomson [Wed, 28 Mar 2012 21:07:34 +0000 (23:07 +0200)]
add a searchbox to "find friends" for global search
tommy tomson [Wed, 28 Mar 2012 18:45:39 +0000 (20:45 +0200)]
bugfix in diabook
Michael Vogel [Wed, 28 Mar 2012 17:52:30 +0000 (19:52 +0200)]
Merge commit 'upstream/master'
Fabio Comuni [Wed, 28 Mar 2012 13:34:02 +0000 (15:34 +0200)]
quattro: style pm pages
Fabio Comuni [Wed, 28 Mar 2012 13:31:58 +0000 (15:31 +0200)]
message: remove tabs, move new message link to aside, all message with gmail-style
Fabio Comuni [Wed, 28 Mar 2012 13:21:01 +0000 (15:21 +0200)]
Merge remote-tracking branch 'friendica/master'
friendica [Wed, 28 Mar 2012 12:16:25 +0000 (05:16 -0700)]
Merge branch 'pull'
Fabio Comuni [Wed, 28 Mar 2012 11:37:04 +0000 (13:37 +0200)]
quattro: tpl for "file as"
Simon [Wed, 28 Mar 2012 10:49:10 +0000 (03:49 -0700)]
Merge pull request #183 from simonlnu/master
final pull req for now. really fixed.
Simon L'nu [Wed, 28 Mar 2012 10:48:05 +0000 (06:48 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
viewsrc: return only body if page is requested via ajax
* master:
Simon L'nu [Wed, 28 Mar 2012 10:47:38 +0000 (06:47 -0400)]
really fix it this time...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
fabrixxm [Wed, 28 Mar 2012 10:46:29 +0000 (03:46 -0700)]
Merge pull request #182 from fabrixxm/master
viewsrc returns only text if page is requested via ajax
Simon [Wed, 28 Mar 2012 10:21:34 +0000 (03:21 -0700)]
Merge pull request #181 from simonlnu/master
how the default.php gets read just changed from under me. not pleasant.
Simon L'nu [Wed, 28 Mar 2012 10:20:13 +0000 (06:20 -0400)]
WITH is going on?
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
friendica [Wed, 28 Mar 2012 10:19:42 +0000 (03:19 -0700)]
Merge branch 'pull'
friendica [Wed, 28 Mar 2012 10:18:26 +0000 (03:18 -0700)]
title not updated when editing post
Simon L'nu [Wed, 28 Mar 2012 10:05:54 +0000 (06:05 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
filer: replace "file as" prompt with combobox opened in fancybox
filer: info() on item filed
template: field_combobox
* master:
Simon [Wed, 28 Mar 2012 10:03:47 +0000 (03:03 -0700)]
Merge pull request #180 from simonlnu/master
duh...
Simon L'nu [Wed, 28 Mar 2012 10:03:04 +0000 (06:03 -0400)]
doh fix
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
fabrixxm [Wed, 28 Mar 2012 10:00:24 +0000 (03:00 -0700)]
Merge pull request #179 from fabrixxm/master
new field_combobox template and some eyecandy to "file as" function
Simon [Wed, 28 Mar 2012 09:55:15 +0000 (02:55 -0700)]
Merge pull request #178 from simonlnu/master
i fixed the worst but ...
Simon L'nu [Wed, 28 Mar 2012 09:52:28 +0000 (05:52 -0400)]
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>
Simon L'nu [Wed, 28 Mar 2012 09:42:47 +0000 (05:42 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
support autocomplete @-tags in plaintext mode
vier navbar messed up after default theme template move
profile_tabs hook
use theme directory for page templates, not language directory
turn on gecko spellcheck in tinymce
small fix in diabook
fixes in diabook
provide a close-option for boxes in right_aside and store info via js and cookies
provide a close-option for boxes in right_aside and store info via js and cookies
form security error when using existing photo
* master:
Fabio Comuni [Wed, 28 Mar 2012 09:42:04 +0000 (11:42 +0200)]
viewsrc: return only body if page is requested via ajax
Fabio Comuni [Wed, 28 Mar 2012 08:49:34 +0000 (10:49 +0200)]
filer: replace "file as" prompt with combobox opened in fancybox
Fabio Comuni [Wed, 28 Mar 2012 08:45:16 +0000 (10:45 +0200)]
filer: info() on item filed
Fabio Comuni [Wed, 28 Mar 2012 08:43:52 +0000 (10:43 +0200)]
template: field_combobox
a text input plus a select wich updates text input value on change.
html5 version commented out for poor browsers support.
friendica [Wed, 28 Mar 2012 07:44:45 +0000 (00:44 -0700)]
support autocomplete @-tags in plaintext mode
friendica [Wed, 28 Mar 2012 07:16:22 +0000 (00:16 -0700)]
vier navbar messed up after default theme template move
friendica [Wed, 28 Mar 2012 03:15:15 +0000 (20:15 -0700)]
profile_tabs hook
friendica [Wed, 28 Mar 2012 01:39:52 +0000 (18:39 -0700)]
use theme directory for page templates, not language directory
friendica [Tue, 27 Mar 2012 22:21:30 +0000 (15:21 -0700)]
Merge branch 'pull'
friendica [Tue, 27 Mar 2012 22:20:36 +0000 (15:20 -0700)]
turn on gecko spellcheck in tinymce
tommy tomson [Tue, 27 Mar 2012 21:41:19 +0000 (23:41 +0200)]
small fix in diabook
tommy tomson [Tue, 27 Mar 2012 21:27:43 +0000 (23:27 +0200)]
fixes in diabook
tomtom84 [Tue, 27 Mar 2012 17:05:32 +0000 (10:05 -0700)]
Merge pull request #177 from tomtom84/master
fixes in theme diabook
tommy tomson [Tue, 27 Mar 2012 17:02:07 +0000 (19:02 +0200)]
provide a close-option for boxes in right_aside and store info via js and cookies
tomtom84 [Tue, 27 Mar 2012 13:32:30 +0000 (06:32 -0700)]
Merge pull request #176 from tomtom84/master
fixes in theme diabook-blue
tommy tomson [Tue, 27 Mar 2012 13:29:46 +0000 (15:29 +0200)]
provide a close-option for boxes in right_aside and store info via js and cookies
friendica [Tue, 27 Mar 2012 11:52:39 +0000 (04:52 -0700)]
Merge branch 'pull'
friendica [Tue, 27 Mar 2012 11:51:20 +0000 (04:51 -0700)]
form security error when using existing photo
Simon [Tue, 27 Mar 2012 08:43:01 +0000 (01:43 -0700)]
Merge pull request #175 from simonlnu/master
various fixes for dispys
Simon L'nu [Tue, 27 Mar 2012 08:40:42 +0000 (04:40 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
profile wall privacy
don't expire filed items
* master:
Simon L'nu [Tue, 27 Mar 2012 08:40:31 +0000 (04:40 -0400)]
more fixes for dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
friendica [Tue, 27 Mar 2012 08:31:47 +0000 (01:31 -0700)]
profile wall privacy
Simon L'nu [Tue, 27 Mar 2012 07:57:47 +0000 (03:57 -0400)]
add dispy-dark snapshot; fix toolbar
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
friendica [Tue, 27 Mar 2012 07:55:25 +0000 (00:55 -0700)]
Merge branch 'pull'
friendica [Tue, 27 Mar 2012 07:54:34 +0000 (00:54 -0700)]
don't expire filed items
Simon L'nu [Tue, 27 Mar 2012 07:23:50 +0000 (03:23 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
add "find friends" to right_aside to diabook, fixes in css in diabook
fixed Umlaute in de strings.php
* master:
tommy tomson [Tue, 27 Mar 2012 06:28:47 +0000 (08:28 +0200)]
add "find friends" to right_aside to diabook, fixes in css in diabook
Tobias Diekershoff [Tue, 27 Mar 2012 05:18:20 +0000 (07:18 +0200)]
fixed Umlaute in de strings.php
Simon L'nu [Tue, 27 Mar 2012 04:54:47 +0000 (00:54 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
@-completion bug
qcomment enhancements
theme description with preview (non-translatable unfortunately)
preparation for some possibly killer features
translate br with extra elements
revup
Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK.
* master:
friendica [Tue, 27 Mar 2012 04:48:04 +0000 (21:48 -0700)]
@-completion bug
friendica [Tue, 27 Mar 2012 03:13:03 +0000 (20:13 -0700)]
qcomment enhancements
friendica [Tue, 27 Mar 2012 01:15:10 +0000 (18:15 -0700)]
theme description with preview (non-translatable unfortunately)
friendica [Tue, 27 Mar 2012 00:57:27 +0000 (17:57 -0700)]
preparation for some possibly killer features
friendica [Mon, 26 Mar 2012 23:56:44 +0000 (16:56 -0700)]
translate br with extra elements
friendica [Mon, 26 Mar 2012 21:55:35 +0000 (14:55 -0700)]
Merge branch 'pull'
friendica [Mon, 26 Mar 2012 21:54:30 +0000 (14:54 -0700)]
revup
friendica [Mon, 26 Mar 2012 21:40:47 +0000 (14:40 -0700)]
Merge pull request #174 from beardy-unixer/master
Fixed regions