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

11 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Mon, 18 Feb 2013 08:51:39 +0000 (09:51 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

11 years agoPL: update to the strings
Tobias Diekershoff [Mon, 18 Feb 2013 08:18:45 +0000 (09:18 +0100)]
PL: update to the strings

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

11 years agorev update
friendica [Mon, 18 Feb 2013 01:23:19 +0000 (17:23 -0800)]
rev update

11 years agoadded robots.txt to the igmnored files
Michael Vogel [Sun, 17 Feb 2013 17:46:39 +0000 (18:46 +0100)]
added robots.txt to the igmnored files

11 years agoplugin: orphaned hooks weren't deleted.
Michael Vogel [Sun, 17 Feb 2013 17:05:30 +0000 (18:05 +0100)]
plugin: orphaned hooks weren't deleted.
update: fixing update job for tags.

11 years agoadd multi vs. single user config to the admin panel
Tobias Diekershoff [Sun, 17 Feb 2013 16:42:32 +0000 (17:42 +0100)]
add multi vs. single user config to the admin panel

11 years agoadd 'hide_help' to admin panel
Tobias Diekershoff [Sun, 17 Feb 2013 11:37:45 +0000 (12:37 +0100)]
add 'hide_help' to admin panel

11 years agoUpdated from master
Michael Vogel [Sun, 17 Feb 2013 11:36:54 +0000 (12:36 +0100)]
Updated from master

11 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Sun, 17 Feb 2013 11:35:40 +0000 (12:35 +0100)]
Merge remote-tracking branch 'upstream/master'

Conflicts:
boot.php
database.sql
library/fancybox/jquery.fancybox-1.3.4.css
mod/search.php
update.php

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

11 years agoDE; update to the strings, fixing #476
Tobias Diekershoff [Sun, 17 Feb 2013 10:19:12 +0000 (11:19 +0100)]
DE; update to the strings, fixing #476

11 years agouse enotify to send CC mails
Tobias Diekershoff [Sun, 17 Feb 2013 07:20:29 +0000 (08:20 +0100)]
use enotify to send CC mails

11 years agoMerge pull request #618 from tobiasd/master
friendica [Sat, 16 Feb 2013 23:56:31 +0000 (15:56 -0800)]
Merge pull request #618 from tobiasd/master

use item title (if set) as mail subject

11 years agoMerge pull request #619 from fermionic/20130216-redir-with-contact-url
friendica [Sat, 16 Feb 2013 23:56:18 +0000 (15:56 -0800)]
Merge pull request #619 from fermionic/20130216-redir-with-contact-url

add support for doing a redir/ based on contact url

11 years agoadd support for doing a redir/ based on contact url
Zach Prezkuta [Sat, 16 Feb 2013 18:38:41 +0000 (11:38 -0700)]
add support for doing a redir/ based on contact url

11 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Sat, 16 Feb 2013 10:03:56 +0000 (11:03 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

11 years agouse entry title (if set) as subject when send by email
Tobias Diekershoff [Sat, 16 Feb 2013 10:03:46 +0000 (11:03 +0100)]
use entry title (if set) as subject when send by email

11 years agoMerge pull request #617 from fabrixxm/master
fabrixxm [Sat, 16 Feb 2013 09:03:46 +0000 (01:03 -0800)]
Merge pull request #617 from fabrixxm/master

Update IT strings

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

11 years ago2012 is long gone
friendica [Sat, 16 Feb 2013 01:40:58 +0000 (17:40 -0800)]
2012 is long gone

11 years agoAPI: beautify the output of repeated items
Michael Vogel [Fri, 15 Feb 2013 19:14:45 +0000 (20:14 +0100)]
API: beautify the output of repeated items
Vier: Birthday reminder looks better

11 years agoupdate it strings
Fabrixxm [Fri, 15 Feb 2013 16:23:49 +0000 (11:23 -0500)]
update it strings

11 years agoMerge pull request #616 from fabrixxm/master
fabrixxm [Fri, 15 Feb 2013 11:39:00 +0000 (03:39 -0800)]
Merge pull request #616 from fabrixxm/master

small fix and feature

11 years agodelete item page respond with json if called via ajax.
Fabrixxm [Fri, 15 Feb 2013 11:34:32 +0000 (06:34 -0500)]
delete item page respond with json if called via ajax.

11 years agoMerge remote branch 'friendica/master'
Fabrixxm [Fri, 15 Feb 2013 08:17:59 +0000 (03:17 -0500)]
Merge remote branch 'friendica/master'

11 years agoZH-CN: update to the strings to 100% thx Matthew
Tobias Diekershoff [Mon, 11 Feb 2013 05:23:55 +0000 (06:23 +0100)]
ZH-CN: update to the strings to 100% thx Matthew

11 years agoCA: update to the strings
Tobias Diekershoff [Mon, 11 Feb 2013 05:21:10 +0000 (06:21 +0100)]
CA: update to the strings

11 years agoMerge pull request #611 from fermionic/20130209-cant-select-individual-contacts
fermionic [Mon, 11 Feb 2013 03:29:39 +0000 (19:29 -0800)]
Merge pull request #611 from fermionic/20130209-cant-select-individual-contacts

don't change to string in prune_deadguys()

11 years agoMerge pull request #615 from fermionic/20130210-update-frost-mobile
fermionic [Mon, 11 Feb 2013 00:12:50 +0000 (16:12 -0800)]
Merge pull request #615 from fermionic/20130210-update-frost-mobile

add new Smarty3 templates

11 years agoadd new Smarty3 templates
Zach Prezkuta [Mon, 11 Feb 2013 00:11:55 +0000 (17:11 -0700)]
add new Smarty3 templates

11 years agoMerge pull request #613 from fermionic/20130210-update-frost
fermionic [Sun, 10 Feb 2013 22:02:53 +0000 (14:02 -0800)]
Merge pull request #613 from fermionic/20130210-update-frost

update to Frost v0.4

11 years agoMerge pull request #614 from fermionic/20130210-update-frost-mobile
fermionic [Sun, 10 Feb 2013 22:02:40 +0000 (14:02 -0800)]
Merge pull request #614 from fermionic/20130210-update-frost-mobile

added files for Frost Mobile v0.3

11 years agoadded files for Frost Mobile v0.3
Zach Prezkuta [Sun, 10 Feb 2013 22:00:20 +0000 (15:00 -0700)]
added files for Frost Mobile v0.3

11 years agoupdate to Frost v0.4
Zach Prezkuta [Sun, 10 Feb 2013 21:57:44 +0000 (14:57 -0700)]
update to Frost v0.4

11 years agoMerge pull request #612 from fermionic/20130210-update-frost-mobile
tobiasd [Sun, 10 Feb 2013 19:04:03 +0000 (11:04 -0800)]
Merge pull request #612 from fermionic/20130210-update-frost-mobile

Update Frost-mobile to v0.3

11 years agoUpdate Frost-mobile to v0.3
Zach Prezkuta [Sun, 10 Feb 2013 17:21:52 +0000 (10:21 -0700)]
Update Frost-mobile to v0.3

11 years agodon't change to string in prune_deadguys()
Zach Prezkuta [Sun, 10 Feb 2013 00:52:29 +0000 (17:52 -0700)]
don't change to string in prune_deadguys()

11 years agoZH-CN: update to the strings
Tobias Diekershoff [Fri, 8 Feb 2013 16:26:08 +0000 (17:26 +0100)]
ZH-CN: update to the strings

11 years agoMerge pull request #610 from fermionic/20130208-duepuntozero-install-crash
fermionic [Fri, 8 Feb 2013 16:09:30 +0000 (08:09 -0800)]
Merge pull request #610 from fermionic/20130208-duepuntozero-install-crash

move all commands inside the duepuntozero_init() function

11 years agomove all commands inside the duepuntozero_init() function
Zach Prezkuta [Fri, 8 Feb 2013 16:03:50 +0000 (09:03 -0700)]
move all commands inside the duepuntozero_init() function

11 years agoadd .gif to fix_private_photos checking, try another tactic to reduce notification...
friendica [Fri, 8 Feb 2013 07:43:55 +0000 (23:43 -0800)]
add .gif to fix_private_photos checking, try another tactic to reduce notification duplication - check for duplicates after storage rather than before. This tactic worked out well to reduce item duplication.

11 years agoMerge pull request #601 from fermionic/20130204-100-percent-CPU-usage-on-xmlify
fermionic [Thu, 7 Feb 2013 05:38:15 +0000 (21:38 -0800)]
Merge pull request #601 from fermionic/20130204-100-percent-CPU-usage-on-xmlify

move mb_strlen call out of for loop definition

11 years agouse mb_ereg_replace for xmlify and unxmlify
Zach Prezkuta [Thu, 7 Feb 2013 05:30:27 +0000 (22:30 -0700)]
use mb_ereg_replace for xmlify and unxmlify

11 years agoparsing multi-byte strings with xmlify
Zach Prezkuta [Wed, 6 Feb 2013 07:37:15 +0000 (00:37 -0700)]
parsing multi-byte strings with xmlify

11 years agoThe community page is speeded up.
Michael Vogel [Wed, 6 Feb 2013 07:01:46 +0000 (08:01 +0100)]
The community page is speeded up.
Photos will be compressed before the output.

11 years agobetter unicode support in xmlify
Zach Prezkuta [Wed, 6 Feb 2013 06:02:13 +0000 (23:02 -0700)]
better unicode support in xmlify

11 years agoMerge pull request #605 from fermionic/20130204-events-request-too-many-dates
friendica [Wed, 6 Feb 2013 01:36:58 +0000 (17:36 -0800)]
Merge pull request #605 from fermionic/20130204-events-request-too-many-dates

limit event queries to one month even if no finish date is specified

11 years agoMerge pull request #608 from fermionic/20130204-diabook-reduce-css
friendica [Wed, 6 Feb 2013 01:36:33 +0000 (17:36 -0800)]
Merge pull request #608 from fermionic/20130204-diabook-reduce-css

Try to start reducing Diabook CSS

11 years agoMerge pull request #602 from fermionic/20130204-permissions-bug-on-profile-page
friendica [Wed, 6 Feb 2013 01:36:06 +0000 (17:36 -0800)]
Merge pull request #602 from fermionic/20130204-permissions-bug-on-profile-page

fix bug that wouldn't show posts to a user who was in an allowed group

11 years agoMerge pull request #603 from fermionic/20130204-info-message-shown-on-redir
friendica [Wed, 6 Feb 2013 01:35:39 +0000 (17:35 -0800)]
Merge pull request #603 from fermionic/20130204-info-message-shown-on-redir

add 'quiet' paramter to redir and dfrn_poll to allow calls

11 years agoMerge pull request #600 from fermionic/20130204-message-button-on-own-profile
friendica [Wed, 6 Feb 2013 01:22:25 +0000 (17:22 -0800)]
Merge pull request #600 from fermionic/20130204-message-button-on-own-profile

don't show Message button to user on own profile page

11 years agoMerge pull request #604 from fermionic/20130204-db-debugging-in-mod-display
friendica [Wed, 6 Feb 2013 01:22:05 +0000 (17:22 -0800)]
Merge pull request #604 from fermionic/20130204-db-debugging-in-mod-display

take debugging commands out of mod/display

11 years agoMerge pull request #606 from fermionic/20130204-themes-cant-use-plugin-hooks
friendica [Wed, 6 Feb 2013 01:21:42 +0000 (17:21 -0800)]
Merge pull request #606 from fermionic/20130204-themes-cant-use-plugin-hooks

allow themes to use plugin hooks

11 years agoMerge pull request #607 from fermionic/20130204-attach-types-are-too-coarse
friendica [Wed, 6 Feb 2013 01:19:53 +0000 (17:19 -0800)]
Merge pull request #607 from fermionic/20130204-attach-types-are-too-coarse

add support for more file attachment types

11 years agoMerge pull request #609 from fermionic/20130204-move-tpl-scripts-to-util
friendica [Wed, 6 Feb 2013 01:19:23 +0000 (17:19 -0800)]
Merge pull request #609 from fermionic/20130204-move-tpl-scripts-to-util

move tpl scripts to util

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 5 Feb 2013 23:10:23 +0000 (15:10 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Tue, 5 Feb 2013 23:09:28 +0000 (15:09 -0800)]
rev update

11 years agoMerge pull request #599 from fermionic/20130129-colorbox
fermionic [Tue, 5 Feb 2013 15:55:07 +0000 (07:55 -0800)]
Merge pull request #599 from fermionic/20130129-colorbox

Switch to Colorbox

11 years agomove tpl scripts to util
Zach Prezkuta [Tue, 5 Feb 2013 05:55:15 +0000 (22:55 -0700)]
move tpl scripts to util