]> git.mxchange.org Git - friendica.git/log
friendica.git
11 years agoremove stub code
friendica [Thu, 9 May 2013 08:17:11 +0000 (01:17 -0700)]
remove stub code

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 9 May 2013 08:15:40 +0000 (01:15 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Thu, 9 May 2013 08:15:22 +0000 (01:15 -0700)]
rev update

11 years ago modified: view/theme/smoothly/default.php
pixelroot [Wed, 8 May 2013 12:46:42 +0000 (14:46 +0200)]
modified:   view/theme/smoothly/default.php
modified:   view/theme/smoothly/style.css
new file:   view/theme/smoothly/templates/tools.tpl
modified:   view/theme/smoothly/theme.php

11 years agoMerge remote branch 'upstream/master'
pixelroot [Wed, 8 May 2013 09:09:39 +0000 (11:09 +0200)]
Merge remote branch 'upstream/master'

11 years ago new file: view/theme/smoothly/images/power.png
pixelroot [Wed, 8 May 2013 09:09:08 +0000 (11:09 +0200)]
new file:   view/theme/smoothly/images/power.png
new file:   view/theme/smoothly/images/up.png

11 years ago modified: view/theme/smoothly/default.php
pixelroot [Wed, 8 May 2013 09:08:21 +0000 (11:08 +0200)]
modified:   view/theme/smoothly/default.php
modified:   view/theme/smoothly/images/down.png
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
view/theme/smoothly/images/power.png
view/theme/smoothly/images/up.png

11 years agofix smarty3 folder not writable message
fabrixxm [Wed, 8 May 2013 08:34:30 +0000 (11:34 +0300)]
fix smarty3 folder not writable message

11 years agoMerge pull request #675 from fabrixxm/templateengine
fabrixxm [Wed, 8 May 2013 07:29:02 +0000 (00:29 -0700)]
Merge pull request #675 from fabrixxm/templateengine

check if view/smarty3 folder is writable by webserver

11 years agocheck if view/smarty3 folder is writable by webserver
Fabrixxm [Wed, 8 May 2013 07:26:20 +0000 (03:26 -0400)]
check if view/smarty3 folder is writable by webserver

11 years ago modified: view/theme/smoothly/css/typography.css
pixelroot [Tue, 7 May 2013 12:30:04 +0000 (14:30 +0200)]
modified:   view/theme/smoothly/css/typography.css

11 years ago modified: view/theme/smoothly/style.css
pixelroot [Tue, 7 May 2013 12:01:54 +0000 (14:01 +0200)]
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

11 years ago modified: view/theme/smoothly/default.php
pixelroot [Tue, 7 May 2013 07:39:14 +0000 (09:39 +0200)]
modified:   view/theme/smoothly/default.php
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

11 years agospelling
friendica [Fri, 3 May 2013 05:21:06 +0000 (22:21 -0700)]
spelling

11 years agobad checkin
friendica [Fri, 3 May 2013 05:19:16 +0000 (22:19 -0700)]
bad checkin

11 years agooptimise cachefile logic - still not sure why the cachefile profiling was getting...
friendica [Fri, 3 May 2013 04:59:20 +0000 (21:59 -0700)]
optimise cachefile logic - still not sure why the cachefile profiling was getting triggered on a site with no cachefile configured

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 3 May 2013 04:42:54 +0000 (21:42 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agoundefined element
friendica [Fri, 3 May 2013 04:42:34 +0000 (21:42 -0700)]
undefined element

11 years agoMerge pull request #672 from cpfeiffer/email-notification-sitename-fix
friendica [Tue, 30 Apr 2013 05:41:32 +0000 (22:41 -0700)]
Merge pull request #672 from cpfeiffer/email-notification-sitename-fix

fix reading sitename config

11 years agoMerge pull request #673 from cpfeiffer/pgettext_missing_dba
friendica [Tue, 30 Apr 2013 05:41:07 +0000 (22:41 -0700)]
Merge pull request #673 from cpfeiffer/pgettext_missing_dba

pgettext needs dba.php for q()

11 years agopgettext needs dba.php for q()
Carsten Pfeiffer [Mon, 29 Apr 2013 20:44:21 +0000 (22:44 +0200)]
pgettext needs dba.php for q()

11 years agoMerge pull request #670 from fabrixxm/help
tobiasd [Mon, 29 Apr 2013 07:36:26 +0000 (00:36 -0700)]
Merge pull request #670 from fabrixxm/help

doc update

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 29 Apr 2013 04:03:21 +0000 (21:03 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agosystem support for complete blocking
friendica [Mon, 29 Apr 2013 04:02:53 +0000 (21:02 -0700)]
system support for complete blocking

11 years agoZH-CN: update to the strings
Tobias Diekershoff [Sun, 28 Apr 2013 13:35:34 +0000 (15:35 +0200)]
ZH-CN: update to the strings

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 28 Apr 2013 11:31:11 +0000 (04:31 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agobug #540 and hush up a couple of log messages that are way too verbose
friendica [Sun, 28 Apr 2013 11:30:20 +0000 (04:30 -0700)]
bug #540 and hush up a couple of log messages that are way too verbose

11 years agoMerge pull request #671 from cpfeiffer/OAuthException
friendica [Sat, 27 Apr 2013 21:32:57 +0000 (14:32 -0700)]
Merge pull request #671 from cpfeiffer/OAuthException

Wrap class OAuthException with !class_exists

11 years agofix reading sitename config
Carsten Pfeiffer [Sat, 27 Apr 2013 19:40:40 +0000 (21:40 +0200)]
fix reading sitename config

11 years agoWrap class OAuthException with !class_exists
Carsten Pfeiffer [Sat, 27 Apr 2013 19:08:45 +0000 (21:08 +0200)]
Wrap class OAuthException with !class_exists

Same problem and solution as discussed on
https://drupal.org/node/1334528

11 years agoDE: update to the strings
Tobias Diekershoff [Sat, 27 Apr 2013 08:57:06 +0000 (10:57 +0200)]
DE: update to the strings

11 years agorev update
friendica [Thu, 25 Apr 2013 09:36:52 +0000 (02:36 -0700)]
rev update

11 years ago modified: view/theme/smoothly/css/typography.css
pixelroot [Wed, 24 Apr 2013 12:09:24 +0000 (14:09 +0200)]
modified:   view/theme/smoothly/css/typography.css
modified:   view/theme/smoothly/default.php
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/templates/nav.tpl
modified:   view/theme/smoothly/theme.php

11 years agodoc update
Fabrixxm [Wed, 24 Apr 2013 11:59:06 +0000 (07:59 -0400)]
doc update
add BBCode reference
update 'Creating posts', change screenshot (use duepuntozero theme)
update 'Install', add point on create view/smarty3 folder
update 'Plugins', add section on templates

11 years agohttp status for disallowed feeds
friendica [Wed, 24 Apr 2013 03:12:49 +0000 (20:12 -0700)]
http status for disallowed feeds

11 years agoissue546 via Tobias
friendica [Wed, 24 Apr 2013 01:58:52 +0000 (18:58 -0700)]
issue546 via Tobias

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 24 Apr 2013 01:51:50 +0000 (18:51 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Wed, 24 Apr 2013 01:51:35 +0000 (18:51 -0700)]
rev update

11 years agoMerge pull request #669 from fabrixxm/templateengine
friendica [Tue, 23 Apr 2013 11:56:39 +0000 (04:56 -0700)]
Merge pull request #669 from fabrixxm/templateengine

Use smarty3 as default template engine

11 years agoremove unneeded files
Fabrixxm [Tue, 23 Apr 2013 11:50:32 +0000 (07:50 -0400)]
remove unneeded files

11 years agomissing "templates" folders
Fabrixxm [Tue, 23 Apr 2013 11:47:57 +0000 (07:47 -0400)]
missing "templates" folders

11 years agotemplate: set smarty3 as default template engine in theme info array.
Fabrixxm [Thu, 28 Mar 2013 08:07:51 +0000 (09:07 +0100)]
template: set smarty3 as default template engine in theme info array.
remove commented code from get_markup_template.
add check for $root/$filename in get_template_file.

11 years agotemplate: remove old 'internal' template files, move smarty3 templates into 'template...
Fabrixxm [Wed, 27 Mar 2013 14:41:23 +0000 (10:41 -0400)]
template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir

11 years agotemplate engine rework
Fabrixxm [Wed, 27 Mar 2013 14:37:59 +0000 (10:37 -0400)]
template engine rework
- use smarty3 as default engine
- new pluggable template engine system

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 21 Apr 2013 23:07:26 +0000 (16:07 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Sun, 21 Apr 2013 23:07:02 +0000 (16:07 -0700)]
rev update

11 years agoMerge pull request #667 from fabrixxm/bug557
fabrixxm [Sat, 20 Apr 2013 07:45:44 +0000 (00:45 -0700)]
Merge pull request #667 from fabrixxm/bug557

drop items to group pages if no mentions in it. should fix bug 557

11 years agodrop items to group pages if no mentions in it. should fix bug 557
Fabrixxm [Fri, 19 Apr 2013 13:55:07 +0000 (09:55 -0400)]
drop items to group pages if no mentions in it. should fix bug 557

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 19 Apr 2013 11:52:20 +0000 (04:52 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Fri, 19 Apr 2013 11:51:43 +0000 (04:51 -0700)]
rev update

11 years agoMerge pull request #666 from fermionic/20130418-frost-mobile-password-check
fermionic [Fri, 19 Apr 2013 01:48:38 +0000 (18:48 -0700)]
Merge pull request #666 from fermionic/20130418-frost-mobile-password-check

update mobile theme settings pages

11 years agoupdate mobile theme settings pages
Zach Prezkuta [Fri, 19 Apr 2013 01:47:27 +0000 (19:47 -0600)]
update mobile theme settings pages

11 years agoMerge pull request #665 from tobiasd/foreach_arg
fermionic [Fri, 19 Apr 2013 01:37:39 +0000 (18:37 -0700)]
Merge pull request #665 from tobiasd/foreach_arg

invalid arguments for a foreach loop found

11 years agoMerge pull request #664 from tobiasd/issue_554
fermionic [Fri, 19 Apr 2013 01:37:11 +0000 (18:37 -0700)]
Merge pull request #664 from tobiasd/issue_554

Issue 554

11 years agoinvalid arguments for a foreach loop found
Tobias Diekershoff [Wed, 17 Apr 2013 15:32:31 +0000 (17:32 +0200)]
invalid arguments for a foreach loop found

11 years agotabwidth
Tobias Diekershoff [Sun, 14 Apr 2013 16:19:01 +0000 (18:19 +0200)]
tabwidth

11 years agocheck password when changing users email
Tobias Diekershoff [Sun, 14 Apr 2013 15:58:16 +0000 (17:58 +0200)]
check password when changing users email

11 years agoDE: update to the strings
Tobias Diekershoff [Sun, 14 Apr 2013 15:26:23 +0000 (17:26 +0200)]
DE: update to the strings

11 years agocheck current password before changing the password
Tobias Diekershoff [Sun, 14 Apr 2013 15:22:42 +0000 (17:22 +0200)]
check current password before changing the password

11 years agoMerge pull request #663 from fabrixxm/moveme
fabrixxm [Mon, 8 Apr 2013 13:17:51 +0000 (06:17 -0700)]
Merge pull request #663 from fabrixxm/moveme

uimport: remove db scheme version check

11 years agouimport remove db scheme version check
Fabrixxm [Mon, 8 Apr 2013 13:03:31 +0000 (09:03 -0400)]
uimport remove db scheme version check

11 years agoMerge pull request #662 from fermionic/20130407-display-own-post
friendica [Sun, 7 Apr 2013 23:05:10 +0000 (16:05 -0700)]
Merge pull request #662 from fermionic/20130407-display-own-post

allow visiting other people's display/ links if I have a copy of the post

11 years agoallow visiting other people's display/ links if I have a copy of the post
Zach Prezkuta [Sun, 7 Apr 2013 17:38:37 +0000 (11:38 -0600)]
allow visiting other people's display/ links if I have a copy of the post

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