]> git.mxchange.org Git - friendica.git/log
friendica.git
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 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 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

11 years agoMerge pull request #635 from fabrixxm/addonlangs
fabrixxm [Thu, 28 Feb 2013 15:16:18 +0000 (07:16 -0800)]
Merge pull request #635 from fabrixxm/addonlangs

fix bug in run_xgettext, update messages.po

11 years agofix bug in run_xgettext, update messages.po
Fabrixxm [Thu, 28 Feb 2013 15:14:40 +0000 (10:14 -0500)]
fix bug in run_xgettext, update messages.po

11 years agoZH-CN: update to the strings
Tobias Diekershoff [Thu, 28 Feb 2013 07:59:06 +0000 (08:59 +0100)]
ZH-CN: update to the strings

11 years agoPL: update to the strings
Tobias Diekershoff [Thu, 28 Feb 2013 07:55:38 +0000 (08:55 +0100)]
PL: update to the strings

11 years agoexp account info in decaf-mobile
Tobias Diekershoff [Thu, 28 Feb 2013 07:10:05 +0000 (08:10 +0100)]
exp account info in decaf-mobile

11 years agoexp account info in frost-mobile
Tobias Diekershoff [Thu, 28 Feb 2013 07:07:41 +0000 (08:07 +0100)]
exp account info in frost-mobile

11 years agoexp account info in frost
Tobias Diekershoff [Thu, 28 Feb 2013 07:03:34 +0000 (08:03 +0100)]
exp account info in frost

11 years agoexp accounts info in diabook
Tobias Diekershoff [Thu, 28 Feb 2013 07:01:37 +0000 (08:01 +0100)]
exp accounts info in diabook

11 years agoMerge pull request #631 from fabrixxm/addonlangs
friendica [Thu, 28 Feb 2013 00:53:08 +0000 (16:53 -0800)]
Merge pull request #631 from fabrixxm/addonlangs

Per addon translation

11 years agoMerge pull request #632 from beardy-unixer/master
friendica [Thu, 28 Feb 2013 00:51:56 +0000 (16:51 -0800)]
Merge pull request #632 from beardy-unixer/master

Add support for members-only apps menu

11 years agoAdd support for members-only addons
Thomas Willingham [Thu, 28 Feb 2013 00:29:06 +0000 (00:29 +0000)]
Add support for members-only addons

11 years agoadd check for false returned by query in load_translation_table
Fabrixxm [Wed, 27 Feb 2013 15:16:05 +0000 (10:16 -0500)]
add check for false returned by query in load_translation_table

11 years agomove load_traslation_table after db setup
Fabrixxm [Wed, 27 Feb 2013 15:15:09 +0000 (10:15 -0500)]
move load_traslation_table after db setup

11 years agoupdate util/messages.po
Fabrixxm [Wed, 27 Feb 2013 14:44:05 +0000 (09:44 -0500)]
update util/messages.po

11 years agorun_xgettext: check for dir before run xgettext
Fabrixxm [Wed, 27 Feb 2013 14:42:20 +0000 (09:42 -0500)]
run_xgettext: check for dir before run xgettext

11 years agoupdate strings, add plural select function definition check
Fabrixxm [Wed, 27 Feb 2013 14:36:25 +0000 (09:36 -0500)]
update strings, add plural select function definition check

11 years ago new file: view/theme/smoothly/images/larrow.gif
pixelroot [Wed, 27 Feb 2013 13:27:41 +0000 (14:27 +0100)]
new file:   view/theme/smoothly/images/larrow.gif
new file:   view/theme/smoothly/images/rarrow.gif

11 years ago modified: view/theme/smoothly/login.tpl
pixelroot [Wed, 27 Feb 2013 13:27:06 +0000 (14:27 +0100)]
modified:   view/theme/smoothly/login.tpl
modified:   view/theme/smoothly/smarty3/login.tpl
modified:   view/theme/smoothly/smarty3/wall_thread.tpl
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
modified:   view/theme/smoothly/wall_thread.tpl

11 years agoupdate translation utils:
Fabrixxm [Wed, 27 Feb 2013 13:25:03 +0000 (08:25 -0500)]
update translation utils:
po2php: add "if function_exists" around plural select function
run_xgettext: add option to extract strings from addon folder

11 years agoload_translation_table: load translation strings from enabled plugins
Fabrixxm [Wed, 27 Feb 2013 13:23:00 +0000 (08:23 -0500)]
load_translation_table: load translation strings from enabled plugins

11 years agoMerge pull request #630 from mexon/bbcode-regex-fix
friendica [Wed, 27 Feb 2013 09:55:59 +0000 (01:55 -0800)]
Merge pull request #630 from mexon/bbcode-regex-fix

For very large posts (~18k) with lots of markup, these regexes were caus...

11 years agoFor very large posts (~18k) with lots of markup, these regexes were causing enough...
Matthew Exon [Tue, 26 Feb 2013 23:34:40 +0000 (07:34 +0800)]
For very large posts (~18k) with lots of markup, these regexes were causing enough backtracking for php to run out of memory, silently generating an empty entry.  This tightens up the regexes so they do less backtracking.

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 27 Feb 2013 01:33:47 +0000 (17:33 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agoblock injection vector
friendica [Wed, 27 Feb 2013 01:33:18 +0000 (17:33 -0800)]
block injection vector

11 years agoMerge pull request #629 from tobiasd/admin-info
fabrixxm [Mon, 25 Feb 2013 13:04:58 +0000 (05:04 -0800)]
Merge pull request #629 from tobiasd/admin-info

Admin info

11 years agokill some newlines
Tobias Diekershoff [Mon, 25 Feb 2013 12:05:30 +0000 (13:05 +0100)]
kill some newlines

11 years agoAdmin panel: show if an account has expired
Tobias Diekershoff [Mon, 25 Feb 2013 12:02:17 +0000 (13:02 +0100)]
Admin panel: show if an account has expired

11 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Sun, 24 Feb 2013 17:19:55 +0000 (18:19 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

11 years agoMerge pull request #628 from fermionic/20130223-limit-body-size-on-email-imports
fermionic [Sun, 24 Feb 2013 15:13:21 +0000 (07:13 -0800)]
Merge pull request #628 from fermionic/20130223-limit-body-size-on-email-imports

run limit_body_size on imported emails, which don't go through consume_feed

11 years agocommunity: Only show top postings, no comments
Michael Vogel [Sun, 24 Feb 2013 11:54:53 +0000 (12:54 +0100)]
community: Only show top postings, no comments
parse_url: Follow location in "meta"-header

11 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Sun, 24 Feb 2013 11:31:25 +0000 (12:31 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

11 years agoMerge pull request #625 from tobiasd/master
tobiasd [Sun, 24 Feb 2013 07:27:21 +0000 (23:27 -0800)]
Merge pull request #625 from tobiasd/master

make sure conv_as->items is an array or don't proceed

11 years agoMerge pull request #627 from fermionic/20130223-quattro-vier-smarty-updates
tobiasd [Sun, 24 Feb 2013 07:26:48 +0000 (23:26 -0800)]
Merge pull request #627 from fermionic/20130223-quattro-vier-smarty-updates

some smarty templates needed updating

11 years agoMerge pull request #626 from fermionic/20130223-disable-content-in-notifications
tobiasd [Sun, 24 Feb 2013 07:25:49 +0000 (23:25 -0800)]
Merge pull request #626 from fermionic/20130223-disable-content-in-notifications

admin option to disable content in email notifications

11 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Sat, 23 Feb 2013 18:57:31 +0000 (19:57 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

11 years agoDE: update to the strings
Tobias Diekershoff [Sat, 23 Feb 2013 18:56:21 +0000 (19:56 +0100)]
DE: update to the strings

11 years agorun limit_body_size on imported emails, which don't go through consume_feed
Zach Prezkuta [Sat, 23 Feb 2013 17:06:59 +0000 (10:06 -0700)]
run limit_body_size on imported emails, which don't go through consume_feed

11 years agosome smarty templates needed updating
Zach Prezkuta [Sat, 23 Feb 2013 16:36:00 +0000 (09:36 -0700)]
some smarty templates needed updating

11 years agobetter description
Zach Prezkuta [Sat, 23 Feb 2013 16:33:29 +0000 (09:33 -0700)]
better description

11 years agoadmin option to disable post content in email notifications for the site
Zach Prezkuta [Sat, 23 Feb 2013 16:31:34 +0000 (09:31 -0700)]
admin option to disable post content in email notifications for the site

11 years agomake sure conv_as->items is an array or don't proceed
Tobias Diekershoff [Sat, 23 Feb 2013 11:42:55 +0000 (12:42 +0100)]
make sure conv_as->items is an array or don't proceed

11 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Sat, 23 Feb 2013 07:25:12 +0000 (08:25 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 23 Feb 2013 01:12:14 +0000 (17:12 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Sat, 23 Feb 2013 01:12:03 +0000 (17:12 -0800)]
rev update

11 years agoMerge pull request #624 from fabrixxm/quattrofixs
fabrixxm [Fri, 22 Feb 2013 16:29:29 +0000 (08:29 -0800)]
Merge pull request #624 from fabrixxm/quattrofixs

Some fixs to Quattro theme

11 years agoMerge pull request #623 from fabrixxm/master
fabrixxm [Fri, 22 Feb 2013 16:26:52 +0000 (08:26 -0800)]
Merge pull request #623 from fabrixxm/master

IT strings update

11 years agoupdate IT strings.php
Fabrixxm [Fri, 22 Feb 2013 16:21:34 +0000 (11:21 -0500)]
update IT strings.php

11 years agoquattro: autocomplete private message To field
Fabrixxm [Fri, 22 Feb 2013 16:02:01 +0000 (11:02 -0500)]
quattro: autocomplete private message To field

11 years agoquattro: fix item max-width, fix contact serarch autocomplete popup style
Fabrixxm [Fri, 22 Feb 2013 15:45:40 +0000 (10:45 -0500)]
quattro: fix item max-width, fix contact serarch autocomplete popup style

11 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Fri, 22 Feb 2013 15:05:11 +0000 (16:05 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

11 years agoMerge pull request #622 from zzottel/master
zzottel [Fri, 22 Feb 2013 12:27:49 +0000 (04:27 -0800)]
Merge pull request #622 from zzottel/master

reorder iteam table update

11 years agoreorder the update of the item table as instructed by Michael Vogel
zottel [Fri, 22 Feb 2013 12:26:11 +0000 (13:26 +0100)]
reorder the update of the item table as instructed by Michael Vogel

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 22 Feb 2013 00:43:01 +0000 (16:43 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Fri, 22 Feb 2013 00:42:34 +0000 (16:42 -0800)]
rev update

11 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Thu, 21 Feb 2013 21:47:06 +0000 (22:47 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

11 years agoMerge pull request #621 from annando/master
fermionic [Thu, 21 Feb 2013 18:16:50 +0000 (10:16 -0800)]
Merge pull request #621 from annando/master

Using "term" table to improve performance, OStatus autocomplete, some more performance stuff

11 years ago modified: view/theme/smoothly/style.css
pixelroot [Thu, 21 Feb 2013 07:46:30 +0000 (08:46 +0100)]
modified:   view/theme/smoothly/style.css

11 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Wed, 20 Feb 2013 20:57:26 +0000 (21:57 +0100)]
Merge remote-tracking branch 'upstream/master'

Conflicts:
mod/admin.php

11 years agosupressing warning when importing items. Speeding up community. Changed query for...
Michael Vogel [Wed, 20 Feb 2013 20:47:36 +0000 (21:47 +0100)]
supressing warning when importing items. Speeding up community. Changed query for the search.

11 years agoMerge remote branch 'upstream/master'
pixelroot [Wed, 20 Feb 2013 20:03:36 +0000 (21:03 +0100)]
Merge remote branch 'upstream/master'

11 years ago modified: view/theme/smoothly/style.css
pixelroot [Wed, 20 Feb 2013 20:03:02 +0000 (21:03 +0100)]
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

11 years agono more googlegroups
23n [Wed, 20 Feb 2013 20:01:19 +0000 (21:01 +0100)]
no more googlegroups

googlegroup links deleted, librelist mail list archive added

11 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Tue, 19 Feb 2013 06:27:17 +0000 (07:27 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

11 years agoMerge pull request #620 from tobiasd/master
tobiasd [Tue, 19 Feb 2013 06:26:09 +0000 (22:26 -0800)]
Merge pull request #620 from tobiasd/master

CC mails