]> git.mxchange.org Git - friendica.git/log
friendica.git
11 years agoDE: update to the strings
Tobias Diekershoff [Sat, 6 Apr 2013 06:25:33 +0000 (08:25 +0200)]
DE: update to the strings

11 years agoMerge pull request #661 from fermionic/20130404-update-frost-decaf
fermionic [Thu, 4 Apr 2013 22:43:47 +0000 (15:43 -0700)]
Merge pull request #661 from fermionic/20130404-update-frost-decaf

update admin options for frost, frost mobile, and decaf mobile

11 years agoupdate admin options for frost, frost mobile, and decaf mobile
Zach Prezkuta [Thu, 4 Apr 2013 22:42:39 +0000 (16:42 -0600)]
update admin options for frost, frost mobile, and decaf mobile

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 4 Apr 2013 22:13:06 +0000 (15:13 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agosync username when changed in either the default profile or the settings page
friendica [Thu, 4 Apr 2013 22:10:14 +0000 (15:10 -0700)]
sync username when changed in either the default profile or the settings page

11 years agoDE: update to the strings
Tobias Diekershoff [Thu, 4 Apr 2013 15:27:49 +0000 (17:27 +0200)]
DE: update to the strings

11 years agoMerge pull request #660 from fabrixxm/moveme
friendica [Thu, 4 Apr 2013 00:36:40 +0000 (17:36 -0700)]
Merge pull request #660 from fabrixxm/moveme

uimport: check table columns before import

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 3 Apr 2013 23:29:13 +0000 (16:29 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Wed, 3 Apr 2013 23:28:49 +0000 (16:28 -0700)]
rev update

11 years agoPL: update to the strings
Tobias Diekershoff [Wed, 3 Apr 2013 07:28:37 +0000 (09:28 +0200)]
PL: update to the strings

11 years agouimport: fix file formatting
Fabrixxm [Tue, 2 Apr 2013 13:44:19 +0000 (09:44 -0400)]
uimport: fix file formatting

11 years agouimport: check table columns before import
Fabrixxm [Tue, 2 Apr 2013 13:16:24 +0000 (09:16 -0400)]
uimport: check table columns before import

11 years agoMerge pull request #659 from mexon/fetch_url_content_type
tobiasd [Tue, 2 Apr 2013 07:17:28 +0000 (00:17 -0700)]
Merge pull request #659 from mexon/fetch_url_content_type

Make the content type available after calling fetch_url

11 years ago modified: view/theme/smoothly/style.css
pixelroot [Mon, 1 Apr 2013 17:36:22 +0000 (19:36 +0200)]
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

11 years agoMake the content type available after calling fetch_url
Matthew Exon [Mon, 1 Apr 2013 04:26:11 +0000 (12:26 +0800)]
Make the content type available after calling fetch_url

11 years agoMerge pull request #658 from annando/master
tobiasd [Sat, 30 Mar 2013 08:46:13 +0000 (01:46 -0700)]
Merge pull request #658 from annando/master

Mail importing problems, a small "vier" change

11 years agovier: The background color of the right area is now white.
Michael Vogel [Fri, 29 Mar 2013 10:18:20 +0000 (11:18 +0100)]
vier: The background color of the right area is now white.

11 years agoDE: update to the strings
Tobias Diekershoff [Thu, 28 Mar 2013 06:49:58 +0000 (07:49 +0100)]
DE: update to the strings

11 years agoMerge pull request #656 from fabrixxm/master
friendica [Thu, 28 Mar 2013 02:44:24 +0000 (19:44 -0700)]
Merge pull request #656 from fabrixxm/master

phpdocs for include/text.php

11 years agoMerge pull request #657 from mexon/cron_lock
friendica [Thu, 28 Mar 2013 02:41:59 +0000 (19:41 -0700)]
Merge pull request #657 from mexon/cron_lock

Add separate lock file for cronhooks, which might also take a long time ...

11 years agoRemove debug line added by mistake
Matthew Exon [Thu, 28 Mar 2013 02:29:27 +0000 (10:29 +0800)]
Remove debug line added by mistake

11 years agoAdd separate lock file for cronhooks, which might also take a long time and shouldn...
Matthew Exon [Tue, 12 Mar 2013 13:41:41 +0000 (14:41 +0100)]
Add separate lock file for cronhooks, which might also take a long time and shouldn't be allowed to interfere with itself

11 years ago modified: view/theme/smoothly/style.css
pixelroot [Wed, 27 Mar 2013 19:08:06 +0000 (20:08 +0100)]
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

11 years agomore phpdocs
Fabrixxm [Wed, 27 Mar 2013 09:28:56 +0000 (10:28 +0100)]
more phpdocs

11 years agoadd phpdoc
Fabrixxm [Wed, 27 Mar 2013 09:11:40 +0000 (05:11 -0400)]
add phpdoc

11 years agoMerge pull request #654 from mexon/filter_var
tobiasd [Tue, 26 Mar 2013 18:31:11 +0000 (11:31 -0700)]
Merge pull request #654 from mexon/filter_var

Use filter_var instead of parse_url to validate URLs, since the latter r...

11 years ago modified: view/theme/smoothly/style.css
pixelroot [Tue, 26 Mar 2013 16:10:58 +0000 (17:10 +0100)]
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

11 years ago modified: view/theme/smoothly/style.css
pixelroot [Tue, 26 Mar 2013 14:47:17 +0000 (15:47 +0100)]
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

11 years ago modified: view/theme/smoothly/css/typography.css
pixelroot [Tue, 26 Mar 2013 10:28:22 +0000 (11:28 +0100)]
modified:   view/theme/smoothly/css/typography.css
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

11 years agoPL: update to the strings
Tobias Diekershoff [Tue, 26 Mar 2013 06:27:09 +0000 (07:27 +0100)]
PL: update to the strings

11 years agoMerge pull request #655 from tobiasd/admin_ostatus_poll
tobiasd [Tue, 26 Mar 2013 06:16:49 +0000 (23:16 -0700)]
Merge pull request #655 from tobiasd/admin_ostatus_poll

Admin ostatus poll

11 years agotemplate additions for the options
Tobias Diekershoff [Mon, 25 Mar 2013 10:01:54 +0000 (11:01 +0100)]
template additions for the options

11 years agoOStatus conversation poll option in the admin panel
Tobias Diekershoff [Mon, 25 Mar 2013 10:00:13 +0000 (11:00 +0100)]
OStatus conversation poll option in the admin panel

11 years agoMerge pull request #652 from mexon/edited_timestamp
fermionic [Sun, 24 Mar 2013 14:30:07 +0000 (07:30 -0700)]
Merge pull request #652 from mexon/edited_timestamp

items.php edited timestamp logic

11 years agoMerge pull request #653 from tobiasd/typo_itemphp
fermionic [Sun, 24 Mar 2013 14:29:44 +0000 (07:29 -0700)]
Merge pull request #653 from tobiasd/typo_itemphp

typo found in the php logs

11 years agotypo found in the php.logs
Tobias Diekershoff [Sun, 24 Mar 2013 08:37:11 +0000 (09:37 +0100)]
typo found in the php.logs

11 years agoPL: update to the strings
Tobias Diekershoff [Sun, 24 Mar 2013 06:26:28 +0000 (07:26 +0100)]
PL: update to the strings

11 years agoRU: update to the strings
Tobias Diekershoff [Sat, 23 Mar 2013 07:49:40 +0000 (08:49 +0100)]
RU: update to the strings

11 years agoRU: update to the strings
Tobias Diekershoff [Fri, 22 Mar 2013 06:25:08 +0000 (07:25 +0100)]
RU: update to the strings

11 years agoPL: update to the strings
Tobias Diekershoff [Thu, 21 Mar 2013 15:01:02 +0000 (16:01 +0100)]
PL: update to the strings

11 years agoDE: update to the strings
Tobias Diekershoff [Thu, 21 Mar 2013 14:57:52 +0000 (15:57 +0100)]
DE: update to the strings

11 years agoUse filter_var instead of parse_url to validate URLs, since the latter returns true...
Matthew Exon [Thu, 14 Mar 2013 05:58:01 +0000 (13:58 +0800)]
Use filter_var instead of parse_url to validate URLs, since the latter returns true even for invalid URLs, in particular the empty string

11 years agoMerge pull request #651 from tobiasd/admin_logs_wording
fermionic [Thu, 21 Mar 2013 02:08:56 +0000 (19:08 -0700)]
Merge pull request #651 from tobiasd/admin_logs_wording

Admin logging UI string clarification

11 years agoConvert received "edited" timestamp to UTC before comparing to what's in the database...
Matthew Exon [Wed, 20 Mar 2013 01:00:12 +0000 (09:00 +0800)]
Convert received "edited" timestamp to UTC before comparing to what's in the database, and don't overwrite with older items.

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 19 Mar 2013 10:31:37 +0000 (03:31 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agorm addon.old
friendica [Tue, 19 Mar 2013 10:30:50 +0000 (03:30 -0700)]
rm addon.old

11 years agouse _Enable Debugging_ instead of only _Debugging_ in the interface
Tobias Diekershoff [Tue, 19 Mar 2013 06:01:34 +0000 (07:01 +0100)]
use _Enable Debugging_ instead of only _Debugging_ in the interface

11 years agoMerge pull request #649 from mexon/redirect_fix
fermionic [Tue, 19 Mar 2013 01:06:41 +0000 (18:06 -0700)]
Merge pull request #649 from mexon/redirect_fix

Restore redirect functionality removed by change 452ff19d

11 years agodon't allow deleted accounts to appear on "manage" page
friendica [Tue, 19 Mar 2013 00:31:21 +0000 (17:31 -0700)]
don't allow deleted accounts to appear on "manage" page

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 18 Mar 2013 23:41:56 +0000 (16:41 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agodouble encode any text that is destined for meta fields.
friendica [Mon, 18 Mar 2013 23:40:33 +0000 (16:40 -0700)]
double encode any text that is destined for meta fields.

11 years agoMerge pull request #650 from fermionic/20130316-network-infinite-redirect
fermionic [Sat, 16 Mar 2013 16:12:35 +0000 (09:12 -0700)]
Merge pull request #650 from fermionic/20130316-network-infinite-redirect

prevent infinite redirect on network page for non-existant group

11 years agoprevent infinite redirect on network page for non-existant group
Zach Prezkuta [Sat, 16 Mar 2013 16:11:32 +0000 (10:11 -0600)]
prevent infinite redirect on network page for non-existant group

11 years agoImported mails were deleted the second time the poller ran - when moving or deleting...
Michael Vogel [Thu, 14 Mar 2013 22:15:15 +0000 (23:15 +0100)]
Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated.

11 years agoRestore redirect functionality removed by change 452ff19d
Matthew Exon [Thu, 14 Mar 2013 05:50:45 +0000 (13:50 +0800)]
Restore redirect functionality removed by change 452ff19d

11 years ago modified: view/theme/smoothly/style.css
pixelroot [Tue, 12 Mar 2013 09:06:19 +0000 (10:06 +0100)]
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

11 years ago modified: view/theme/smoothly/style.css
pixelroot [Mon, 11 Mar 2013 18:59:49 +0000 (19:59 +0100)]
modified:   view/theme/smoothly/style.css

11 years ago deleted: view/theme/smoothly/login.tpl
pixelroot [Mon, 11 Mar 2013 18:19:33 +0000 (19:19 +0100)]
deleted:    view/theme/smoothly/login.tpl
deleted:    view/theme/smoothly/smarty3/login.tpl
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

11 years agoMerge pull request #648 from mexon/mailstream-prerequisites
fermionic [Sun, 10 Mar 2013 22:34:54 +0000 (15:34 -0700)]
Merge pull request #648 from mexon/mailstream-prerequisites

Mailstream prerequisites

11 years agoMerge pull request #646 from annando/master
fermionic [Sun, 10 Mar 2013 22:24:27 +0000 (15:24 -0700)]
Merge pull request #646 from annando/master

OStatus conversations, "vier" and diaspora android client

11 years agoThe post_remote_end hook was being called with an escaped version of the item, not...
Matthew Exon [Fri, 8 Mar 2013 02:08:47 +0000 (03:08 +0100)]
The post_remote_end hook was being called with an escaped version of the item, not very useful.  This change moves the hook to the end of item_store and gets all data fresh from the database.

11 years agoExplicitly list protocols that are allowed, rather than using their initials. Also...
Matthew Exon [Fri, 8 Mar 2013 07:38:25 +0000 (08:38 +0100)]
Explicitly list protocols that are allowed, rather than using their initials.  Also, add cid, which I need for my mailstream plugin to work.

11 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Thu, 7 Mar 2013 19:20:12 +0000 (20:20 +0100)]
Merge remote-tracking branch 'upstream/master'

11 years agoVier: The change from blue to black in links is now faded as well.
Michael Vogel [Thu, 7 Mar 2013 18:34:54 +0000 (19:34 +0100)]
Vier: The change from blue to black in links is now faded as well.

11 years agoMerge pull request #647 from fabrixxm/issue-552
fabrixxm [Thu, 7 Mar 2013 13:21:36 +0000 (05:21 -0800)]
Merge pull request #647 from fabrixxm/issue-552

remove authentication from api help/test. fix issue 552.

11 years agoremove authentication from api help/test. fix issue 552.
Fabrixxm [Thu, 7 Mar 2013 13:16:53 +0000 (08:16 -0500)]
remove authentication from api help/test. fix issue 552.
identi.ca don't ask for auth on help/test.

11 years agoOStatus conversations: Fixed a bug when a message hadn't got an id.
Michael Vogel [Wed, 6 Mar 2013 22:23:04 +0000 (23:23 +0100)]
OStatus conversations: Fixed a bug when a message hadn't got an id.
vier: Some more changes to make the side menu static.
In the index.php I did a small change to make friendica compatible with the android client for diaspora.

11 years agoMerge pull request #643 from annando/master
tobiasd [Wed, 6 Mar 2013 06:06:39 +0000 (22:06 -0800)]
Merge pull request #643 from annando/master

Vier - many changes

11 years agoMerge pull request #645 from tobiasd/master
tobiasd [Tue, 5 Mar 2013 03:17:10 +0000 (19:17 -0800)]
Merge pull request #645 from tobiasd/master

change twitter API path

11 years agoTwitter API 1.1
Tobias Diekershoff [Tue, 5 Mar 2013 02:48:29 +0000 (03:48 +0100)]
Twitter API 1.1

11 years agoMerge pull request #644 from fermionic/20130303-no-embedding-private-images-option
fermionic [Mon, 4 Mar 2013 23:57:57 +0000 (15:57 -0800)]
Merge pull request #644 from fermionic/20130303-no-embedding-private-images-option

fix disable embedding option description

11 years agofix disable embedding option description
Zach Prezkuta [Mon, 4 Mar 2013 23:55:07 +0000 (16:55 -0700)]
fix disable embedding option description

11 years agoVier: Some more changes to the theme.
Michael Vogel [Mon, 4 Mar 2013 23:46:11 +0000 (00:46 +0100)]
Vier: Some more changes to the theme.
Added a switch to suppress displaying of the tags.

11 years agoVier: Some more transition effects
Michael Vogel [Mon, 4 Mar 2013 20:11:31 +0000 (21:11 +0100)]
Vier: Some more transition effects

11 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Sun, 3 Mar 2013 23:05:17 +0000 (00:05 +0100)]
Merge remote-tracking branch 'upstream/master'

11 years agoVier: Further changes: profile border is rounded.
Michael Vogel [Sun, 3 Mar 2013 23:04:06 +0000 (00:04 +0100)]
Vier: Further changes: profile border is rounded.

11 years agoOStatus conversation: now the creation date of the item is store with the conversation
Michael Vogel [Sun, 3 Mar 2013 22:44:50 +0000 (23:44 +0100)]
OStatus conversation: now the creation date of the item is store with the conversation
vier: The link color and the color of the top bar is changed.

11 years agoMerge pull request #642 from oohlaf/master
friendica [Sun, 3 Mar 2013 22:38:17 +0000 (14:38 -0800)]
Merge pull request #642 from oohlaf/master

Ignore invalid tokens when scraping an URL

11 years agoIgnore invalid tokens when scraping an URL
Olaf Conradi [Sun, 3 Mar 2013 20:41:27 +0000 (21:41 +0100)]
Ignore invalid tokens when scraping an URL

11 years agoMerge pull request #639 from annando/master
friendica [Sun, 3 Mar 2013 20:07:52 +0000 (12:07 -0800)]
Merge pull request #639 from annando/master

Community/Open Graph

11 years agoMerge pull request #640 from fermionic/20130303-no-embedding-private-images-option
friendica [Sun, 3 Mar 2013 20:07:35 +0000 (12:07 -0800)]
Merge pull request #640 from fermionic/20130303-no-embedding-private-images-option

allow admin to prevent private image embedding on hub

11 years agoMerge pull request #641 from oohlaf/master
friendica [Sun, 3 Mar 2013 20:06:10 +0000 (12:06 -0800)]
Merge pull request #641 from oohlaf/master

Fix SQL error

11 years agoFix SQL error for missing AND operator
Olaf Conradi [Sun, 3 Mar 2013 19:44:52 +0000 (20:44 +0100)]
Fix SQL error for missing AND operator

AND operator was missing from WHERE clause

11 years agoOStatus conversation: Prevent posting loops
Michael Vogel [Sun, 3 Mar 2013 16:58:35 +0000 (17:58 +0100)]
OStatus conversation: Prevent posting loops

11 years agoallow admin to prevent private image embedding on hub
Zach Prezkuta [Sun, 3 Mar 2013 16:44:41 +0000 (09:44 -0700)]
allow admin to prevent private image embedding on hub

11 years agoMerge pull request #636 from fabrixxm/installer/checkphpcli
fermionic [Sun, 3 Mar 2013 15:51:51 +0000 (07:51 -0800)]
Merge pull request #636 from fabrixxm/installer/checkphpcli

install: add check for php-cli

11 years agoMerge pull request #638 from tobiasd/issue_197
fermionic [Sun, 3 Mar 2013 15:48:51 +0000 (07:48 -0800)]
Merge pull request #638 from tobiasd/issue_197

put edited meta info in item object to give theme developers the chance ...

11 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Sun, 3 Mar 2013 15:30:18 +0000 (16:30 +0100)]
Merge remote-tracking branch 'upstream/master'

11 years agotypo
Tobias Diekershoff [Sun, 3 Mar 2013 11:02:45 +0000 (12:02 +0100)]
typo

11 years agoput edited meta info in item object to give theme developers the chance to display...
Tobias Diekershoff [Sun, 3 Mar 2013 10:47:01 +0000 (11:47 +0100)]
put edited meta info in item object to give theme developers the chance to display this in a fancy way

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 2 Mar 2013 23:47:23 +0000 (15:47 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agomerge
friendica [Sat, 2 Mar 2013 23:46:54 +0000 (15:46 -0800)]
merge

11 years agofix util/config
friendica [Sat, 2 Mar 2013 23:44:00 +0000 (15:44 -0800)]
fix util/config

11 years agoSuppoorting Open Graph and Dublin Core when displaying single item
Michael Vogel [Sat, 2 Mar 2013 13:46:06 +0000 (14:46 +0100)]
Suppoorting Open Graph and Dublin Core when displaying single item
Following link shorteners in parse_url

11 years agoAdd sample lighttpd config, from the mailing list.
Thomas Willingham [Fri, 1 Mar 2013 19:55:33 +0000 (19:55 +0000)]
Add sample lighttpd config, from the mailing list.

11 years agoMerge pull request #637 from fabrixxm/lang/it
fabrixxm [Fri, 1 Mar 2013 16:29:02 +0000 (08:29 -0800)]
Merge pull request #637 from fabrixxm/lang/it

update IT strings

11 years agoupdate IT strings
Fabrixxm [Fri, 1 Mar 2013 16:27:43 +0000 (11:27 -0500)]
update IT strings

11 years agoDE: update to the strings
Tobias Diekershoff [Fri, 1 Mar 2013 15:24:58 +0000 (16:24 +0100)]
DE: update to the strings

11 years agoinstall: add check for php-cli
Fabrixxm [Fri, 1 Mar 2013 09:43:04 +0000 (04:43 -0500)]
install: add check for php-cli
Check won't pass if $php -v won't return "(cli)"

11 years agoMerge pull request #633 from tobiasd/admin-info-themes
fermionic [Fri, 1 Mar 2013 01:00:56 +0000 (17:00 -0800)]
Merge pull request #633 from tobiasd/admin-info-themes

Admin info themes