]> git.mxchange.org Git - friendica.git/log
friendica.git
10 years agoAdded exact time to items after 24 hours
effex7 [Sat, 25 Oct 2014 14:44:24 +0000 (16:44 +0200)]
Added exact time to items after 24 hours

10 years agoMerge pull request #1187 from tobiasd/20141013
fabrixxm [Mon, 13 Oct 2014 17:52:29 +0000 (19:52 +0200)]
Merge pull request #1187 from tobiasd/20141013

noscrape by default

10 years agouse noscrape by default, add opt-out option to disable it
Tobias Diekershoff [Mon, 13 Oct 2014 17:19:54 +0000 (19:19 +0200)]
use noscrape by default, add opt-out option to disable it

10 years agoMerge pull request #1175 from fabrixxm/master
fabrixxm [Mon, 6 Oct 2014 08:18:36 +0000 (10:18 +0200)]
Merge pull request #1175 from fabrixxm/master

Friendica 'Ginger' 3.3

10 years agoadd codename to useragent string
Fabrixxm [Mon, 6 Oct 2014 08:06:53 +0000 (10:06 +0200)]
add codename to useragent string

10 years agoMerge pull request #1177 from annando/1410-feed-with-tags
fabrixxm [Mon, 6 Oct 2014 07:54:36 +0000 (09:54 +0200)]
Merge pull request #1177 from annando/1410-feed-with-tags

Importing feed with hashtags from keywords

10 years agoMerge pull request #1176 from annando/1409-diaspora-repeated-twitter-cleanup
fabrixxm [Mon, 6 Oct 2014 07:53:16 +0000 (09:53 +0200)]
Merge pull request #1176 from annando/1409-diaspora-repeated-twitter-cleanup

1409 diaspora repeated twitter cleanup

10 years agoFriendica 'Ginger' 3.3
Fabrixxm [Mon, 6 Oct 2014 06:56:55 +0000 (08:56 +0200)]
Friendica 'Ginger' 3.3

10 years agoCreated hashtags from keywords now are links. URL are cleaned from tracking data.
Michael Vogel [Fri, 3 Oct 2014 11:02:15 +0000 (13:02 +0200)]
Created hashtags from keywords now are links. URL are cleaned from tracking data.

10 years agoCreating hashtags from keywords of a feed, when additional data should be fetched.
Michael Vogel [Fri, 3 Oct 2014 10:18:33 +0000 (12:18 +0200)]
Creating hashtags from keywords of a feed, when additional data should be fetched.

10 years agoMerge pull request #1171 from fabrixxm/issue_1169
fabrixxm [Thu, 2 Oct 2014 12:34:55 +0000 (14:34 +0200)]
Merge pull request #1171 from fabrixxm/issue_1169

comment out multidomain config support

10 years agoUpdate doc/FAQ. Also remove Friendica Red references from FAQ
Fabrixxm [Wed, 1 Oct 2014 07:19:37 +0000 (09:19 +0200)]
Update doc/FAQ. Also remove Friendica Red references from FAQ

10 years agocomment out multidomain config support
Fabrixxm [Wed, 1 Oct 2014 07:04:06 +0000 (09:04 +0200)]
comment out multidomain config support

10 years agoMerge remote-tracking branch 'upstream/master' into 1409-diaspora-repeated-twitter...
Michael Vogel [Mon, 29 Sep 2014 07:42:47 +0000 (09:42 +0200)]
Merge remote-tracking branch 'upstream/master' into 1409-diaspora-repeated-twitter-cleanup

10 years agoMerge pull request #1168 from annando/1409-application-source-name
fabrixxm [Mon, 29 Sep 2014 07:24:41 +0000 (09:24 +0200)]
Merge pull request #1168 from annando/1409-application-source-name

API: Detecting the source name of the application

10 years agoMerge pull request #1166 from annando/1409-issue-1158
fabrixxm [Mon, 29 Sep 2014 07:23:09 +0000 (09:23 +0200)]
Merge pull request #1166 from annando/1409-issue-1158

issue #1158 - and other stuff that I didn't wanted to merge (I hate GIT)

10 years agoAPI: Fetching the application name of the client.
Michael Vogel [Sun, 28 Sep 2014 15:23:01 +0000 (17:23 +0200)]
API: Fetching the application name of the client.

10 years agoMerge pull request #1167 from tobiasd/20140928
tobiasd [Sun, 28 Sep 2014 13:08:58 +0000 (15:08 +0200)]
Merge pull request #1167 from tobiasd/20140928

updating the translations from transifex

10 years agoupdating core translations from transifex
Tobias Diekershoff [Sun, 28 Sep 2014 13:04:54 +0000 (15:04 +0200)]
updating core translations from transifex

10 years agoIssue 1158: muting of threads now works with the API as well.
Michael Vogel [Sat, 27 Sep 2014 22:42:27 +0000 (00:42 +0200)]
Issue 1158: muting of threads now works with the API as well.

10 years agoDiaspora: Repeated items from twitter to Diaspora now only include a link, since...
Michael Vogel [Sat, 27 Sep 2014 21:39:06 +0000 (23:39 +0200)]
Diaspora: Repeated items from twitter to Diaspora now only include a link, since Diaspora is showing the whole tweet.

10 years agoAPI: Set the application name to "api" (if not defined), "remote_self" has an applica...
Michael Vogel [Sat, 27 Sep 2014 21:37:05 +0000 (23:37 +0200)]
API: Set the application name to "api" (if not defined), "remote_self" has an application name as well.

10 years agoMerge pull request #1165 from annando/1409-issue-1157
fabrixxm [Sat, 27 Sep 2014 17:03:20 +0000 (19:03 +0200)]
Merge pull request #1165 from annando/1409-issue-1157

Issue 1157: Unused javascript function is removed.

10 years agoMerge pull request #1161 from annando/master
fabrixxm [Sat, 27 Sep 2014 16:20:39 +0000 (18:20 +0200)]
Merge pull request #1161 from annando/master

Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID.

10 years agoIssue 1157: Unused javascript function is removed.
Michael Vogel [Sat, 27 Sep 2014 12:17:50 +0000 (14:17 +0200)]
Issue 1157: Unused javascript function is removed.

10 years agoSecurity issue: Encoding of GUID in itemcache to avoid directory bypassing with a...
Michael Vogel [Sat, 27 Sep 2014 10:49:00 +0000 (12:49 +0200)]
Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID.

10 years agoMerge pull request #1157 from tugelbend/master
fabrixxm [Mon, 22 Sep 2014 15:12:34 +0000 (17:12 +0200)]
Merge pull request #1157 from tugelbend/master

bug fix #1135, "show more" is usable again

10 years agobug fix #1135, show more is usable again
hauke [Mon, 22 Sep 2014 11:53:16 +0000 (13:53 +0200)]
bug fix #1135, show more is usable again

10 years agoMerge pull request #1155 from fabrixxm/master
fabrixxm [Sat, 20 Sep 2014 10:18:48 +0000 (12:18 +0200)]
Merge pull request #1155 from fabrixxm/master

fix #1151, fix #1150

10 years agoremove unneeded htconfig templates
fabrixxm [Sat, 20 Sep 2014 10:14:59 +0000 (12:14 +0200)]
remove unneeded htconfig templates

10 years agoremove uneeded email templates
fabrixxm [Sat, 20 Sep 2014 10:10:24 +0000 (12:10 +0200)]
remove uneeded email templates

10 years agoallow mod/view in install mode to load pcss files. Fix unstiled install
fabrixxm [Sat, 20 Sep 2014 10:09:10 +0000 (12:09 +0200)]
allow mod/view in install mode to load pcss files. Fix unstiled install

10 years agoSet internal PuSH server as default
fabrixxm [Sat, 20 Sep 2014 10:08:10 +0000 (12:08 +0200)]
Set internal PuSH server as default

10 years agoCleanup mods folder and remove privacy_image_cache from docs. fix #1151
fabrixxm [Sat, 20 Sep 2014 09:41:44 +0000 (11:41 +0200)]
Cleanup mods folder and remove privacy_image_cache from docs. fix #1151

10 years agoMerge pull request #1154 from fabrixxm/master
fabrixxm [Sat, 20 Sep 2014 09:26:44 +0000 (11:26 +0200)]
Merge pull request #1154 from fabrixxm/master

fix residual curCSS, should fix #1153

10 years agofix residual curCSS, should fix #1153
fabrixxm [Sat, 20 Sep 2014 09:24:06 +0000 (11:24 +0200)]
fix residual curCSS, should fix #1153

10 years agoMerge pull request #1149 from fabrixxm/quattro_fixs
fabrixxm [Wed, 17 Sep 2014 09:09:54 +0000 (11:09 +0200)]
Merge pull request #1149 from fabrixxm/quattro_fixs

Quattro fix and other

10 years agofix oembed video template
Fabrixxm [Wed, 17 Sep 2014 09:02:58 +0000 (11:02 +0200)]
fix oembed video template

10 years agoadd id to album name tag
Fabrixxm [Wed, 17 Sep 2014 09:02:18 +0000 (11:02 +0200)]
add id to album name tag
this should be in template

10 years agoremove messages link from notification tabs bar
Fabrixxm [Wed, 17 Sep 2014 09:01:47 +0000 (11:01 +0200)]
remove messages link from notification tabs bar

10 years agofix settings page aside menu active item
Fabrixxm [Wed, 17 Sep 2014 09:00:34 +0000 (11:00 +0200)]
fix settings page aside menu active item
add aside menu to delegate page

10 years agotweak quattro theme
Fabrixxm [Wed, 17 Sep 2014 08:59:19 +0000 (10:59 +0200)]
tweak quattro theme

10 years agoMerge branch 'Beanow-feature/collapse-menulink' into friendica/master
Fabrixxm [Wed, 17 Sep 2014 06:59:01 +0000 (08:59 +0200)]
Merge branch 'Beanow-feature/collapse-menulink' into friendica/master

10 years agoremove dollar sign
Fabrixxm [Wed, 17 Sep 2014 06:57:53 +0000 (08:57 +0200)]
remove dollar sign

10 years agoMerge branch 'feature/collapse-menulink' of https://github.com/Beanow/friendica into...
Fabrixxm [Wed, 17 Sep 2014 06:54:46 +0000 (08:54 +0200)]
Merge branch 'feature/collapse-menulink' of https://github.com/Beanow/friendica into Beanow-feature/collapse-menulink

10 years agoMerge pull request #1147 from tugelbend/master
fabrixxm [Wed, 17 Sep 2014 06:49:54 +0000 (08:49 +0200)]
Merge pull request #1147 from tugelbend/master

small js bug fix, vagrant works again

10 years agoMenu links now collapse if clicked again.
Beanow [Mon, 15 Sep 2014 23:21:27 +0000 (01:21 +0200)]
Menu links now collapse if clicked again.

10 years agomade vagrant partly work again
hauke [Mon, 15 Sep 2014 17:48:47 +0000 (19:48 +0200)]
made vagrant partly work again

10 years agobug fix: live function is deprecated
hauke [Mon, 15 Sep 2014 17:48:17 +0000 (19:48 +0200)]
bug fix: live function is deprecated

10 years agoMerge pull request #1144 from tobiasd/docs2014
tobiasd [Sun, 14 Sep 2014 19:37:31 +0000 (21:37 +0200)]
Merge pull request #1144 from tobiasd/docs2014

documentation

10 years agomissing ?
Tobias Diekershoff [Sun, 14 Sep 2014 07:17:21 +0000 (09:17 +0200)]
missing ?

10 years agoadded list of clients to the FAQ
Tobias Diekershoff [Sun, 14 Sep 2014 07:06:47 +0000 (09:06 +0200)]
added list of clients to the FAQ

10 years agoadd API docs to home.md
Tobias Diekershoff [Sat, 13 Sep 2014 06:10:03 +0000 (08:10 +0200)]
add API docs to home.md

10 years agoMerge pull request #1143 from annando/master
tobiasd [Fri, 12 Sep 2014 04:58:41 +0000 (06:58 +0200)]
Merge pull request #1143 from annando/master

Bugfix: "nurl" wasn't set/"remoteconnect" was missing in several templates

10 years agoIn the profiles the remote connect field was missing
Michael Vogel [Thu, 11 Sep 2014 21:38:24 +0000 (23:38 +0200)]
In the profiles the remote connect field was missing

10 years agoBugfix: When repairing the url, the nurl wasn't set.
Michael Vogel [Thu, 11 Sep 2014 21:37:55 +0000 (23:37 +0200)]
Bugfix: When repairing the url, the nurl wasn't set.

10 years agoMerge pull request #1142 from fabrixxm/quattro_update
fabrixxm [Thu, 11 Sep 2014 17:01:20 +0000 (19:01 +0200)]
Merge pull request #1142 from fabrixxm/quattro_update

fix quattro scroll and flash and vier flash on display page

10 years agofix quattro scroll and flash and vier flash on display page
fabrixxm [Thu, 11 Sep 2014 16:56:33 +0000 (18:56 +0200)]
fix quattro scroll and flash and vier flash on display page

10 years agoMerge pull request #1140 from fabrixxm/master
fabrixxm [Wed, 10 Sep 2014 17:08:07 +0000 (19:08 +0200)]
Merge pull request #1140 from fabrixxm/master

Update IT strings

10 years agoUpdate IT strings
fabrixxm [Wed, 10 Sep 2014 17:05:43 +0000 (19:05 +0200)]
Update IT strings

10 years agoMerge pull request #1139 from fabrixxm/notifix
fabrixxm [Wed, 10 Sep 2014 16:33:01 +0000 (18:33 +0200)]
Merge pull request #1139 from fabrixxm/notifix

Override 'enotify_no_content' system option if type is SYSTEM_EMAIL

10 years agoOverride 'enotify_no_content' system option if type is SYSTEM_EMAIL
fabrixxm [Wed, 10 Sep 2014 16:30:30 +0000 (18:30 +0200)]
Override 'enotify_no_content' system option if type is SYSTEM_EMAIL

10 years agoMerge pull request #1138 from fabrixxm/notifix
fabrixxm [Tue, 9 Sep 2014 20:10:16 +0000 (22:10 +0200)]
Merge pull request #1138 from fabrixxm/notifix

fix some emails

10 years agofix email for
fabrixxm [Tue, 9 Sep 2014 20:07:47 +0000 (22:07 +0200)]
fix email for
- registration request
- registration approval
- account created by admin

add a reditect after registration approval or deny

10 years agocurrent API documentation from the github wiki
Tobias Diekershoff [Tue, 9 Sep 2014 06:41:58 +0000 (08:41 +0200)]
current API documentation from the github wiki

10 years agocopy of the Home.md so github has an index file to show
Tobias Diekershoff [Tue, 9 Sep 2014 06:41:35 +0000 (08:41 +0200)]
copy of the Home.md so github has an index file to show

10 years agoMerge pull request #1136 from tobiasd/33rc
tobiasd [Sun, 7 Sep 2014 18:43:29 +0000 (20:43 +0200)]
Merge pull request #1136 from tobiasd/33rc

RC for 3.3

10 years agoRC for 3.3
Tobias Diekershoff [Sun, 7 Sep 2014 18:41:33 +0000 (20:41 +0200)]
RC for 3.3

10 years agoMerge pull request #1133 from tugelbend/master
tobiasd [Sun, 7 Sep 2014 16:08:02 +0000 (18:08 +0200)]
Merge pull request #1133 from tugelbend/master

added cc license to default avatar

10 years agoMerge pull request #1132 from tobiasd/20140907b
tobiasd [Sun, 7 Sep 2014 16:04:49 +0000 (18:04 +0200)]
Merge pull request #1132 from tobiasd/20140907b

missing template file

10 years agoadded cc license to default avatar
hauke [Sun, 7 Sep 2014 16:04:35 +0000 (18:04 +0200)]
added cc license to default avatar

10 years agomissed the settings template for duepunto
Tobias Diekershoff [Sun, 7 Sep 2014 16:02:58 +0000 (18:02 +0200)]
missed the settings template for duepunto

10 years agoMerge pull request #1131 from fabrixxm/master
tobiasd [Sun, 7 Sep 2014 15:52:52 +0000 (17:52 +0200)]
Merge pull request #1131 from fabrixxm/master

Bug fixes!

10 years agofix email to new registerd users.
fabrixxm [Sun, 7 Sep 2014 15:46:31 +0000 (17:46 +0200)]
fix email to new registerd users.
fix notification in case of error sending email.

10 years agofix update routine to support update from 3.2
fabrixxm [Sun, 7 Sep 2014 15:28:38 +0000 (17:28 +0200)]
fix update routine to support update from 3.2
disable PDO support

10 years agoMerge pull request #1128 from Beanow/hotfix/settings-styling
tobiasd [Sun, 7 Sep 2014 15:15:30 +0000 (17:15 +0200)]
Merge pull request #1128 from Beanow/hotfix/settings-styling

Added styling to show settings headers can be clicked.

10 years agoMerge pull request #1130 from tugelbend/master
tobiasd [Sun, 7 Sep 2014 15:13:47 +0000 (17:13 +0200)]
Merge pull request #1130 from tugelbend/master

new default avatar by Andi Stadler

10 years agoMerge branch 'master' of https://github.com/friendica/friendica
hauke [Sun, 7 Sep 2014 15:07:14 +0000 (17:07 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

10 years agonew default icon by Andi Stadler
hauke [Sun, 7 Sep 2014 15:06:21 +0000 (17:06 +0200)]
new default icon by Andi Stadler

10 years agoMerge pull request #1129 from tobiasd/20140907a
tobiasd [Sun, 7 Sep 2014 15:01:13 +0000 (17:01 +0200)]
Merge pull request #1129 from tobiasd/20140907a

typo in dbstructure.php

10 years agofixing a typo
Tobias Diekershoff [Sun, 7 Sep 2014 14:59:01 +0000 (16:59 +0200)]
fixing a typo

10 years agoAdded styling to show settings headers can be clicked.
Beanow [Sun, 7 Sep 2014 14:24:40 +0000 (16:24 +0200)]
Added styling to show settings headers can be clicked.

10 years agoMerge pull request #1127 from Beanow/hotfix/whitespace-issue
tobiasd [Sun, 7 Sep 2014 14:22:37 +0000 (16:22 +0200)]
Merge pull request #1127 from Beanow/hotfix/whitespace-issue

Fixed whitespace issue causing trueish results in templates.

10 years agoFixed whitespace issue causing trueish results in templates.
Beanow [Sun, 7 Sep 2014 13:48:44 +0000 (15:48 +0200)]
Fixed whitespace issue causing trueish results in templates.

For example: profiles would show labels with no content.

10 years agoMerge pull request #1126 from tobiasd/1754
tobiasd [Sun, 7 Sep 2014 13:38:43 +0000 (15:38 +0200)]
Merge pull request #1126 from tobiasd/1754

revup after the Hackathon in Berlin

10 years agorevup after the Hackathon in Berlin
Tobias Diekershoff [Sun, 7 Sep 2014 13:36:23 +0000 (15:36 +0200)]
revup after the Hackathon in Berlin

10 years agoMerge pull request #1123 from fabrixxm/mail_notification_cleanup
fabrixxm [Sun, 7 Sep 2014 13:05:06 +0000 (15:05 +0200)]
Merge pull request #1123 from fabrixxm/mail_notification_cleanup

Mail notification cleanup

10 years agoMerge pull request #1124 from tobiasd/duepuntoderivs
fabrixxm [Sun, 7 Sep 2014 13:04:26 +0000 (15:04 +0200)]
Merge pull request #1124 from tobiasd/duepuntoderivs

added variations of duepuntozero to the theme as options to be selected

10 years agoMerge pull request #1122 from tugelbend/master
fabrixxm [Sun, 7 Sep 2014 12:56:55 +0000 (14:56 +0200)]
Merge pull request #1122 from tugelbend/master

Updated smarty template to 3.1.19

10 years agoremoved fancybox as it is not used anywhere
hauke [Sun, 7 Sep 2014 12:54:10 +0000 (14:54 +0200)]
removed fancybox as it is not used anywhere

10 years agoupdate messages.po
fabrixxm [Sun, 7 Sep 2014 12:32:41 +0000 (14:32 +0200)]
update messages.po

10 years agoremove screenshot for greenzero
Tobias Diekershoff [Sun, 7 Sep 2014 12:31:46 +0000 (14:31 +0200)]
remove screenshot for greenzero

10 years agoupdate of fullcalender to v1.6.4
hauke [Sun, 7 Sep 2014 12:31:01 +0000 (14:31 +0200)]
update of fullcalender to v1.6.4

10 years agoMerge remote-tracking branch 'friendica/master' into mail_notification_cleanup
fabrixxm [Sun, 7 Sep 2014 12:28:03 +0000 (14:28 +0200)]
Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup

10 years agodeleted some editicon.png copies
Tobias Diekershoff [Sun, 7 Sep 2014 12:23:24 +0000 (14:23 +0200)]
deleted some editicon.png copies

10 years agodb update mail via notification()
fabrixxm [Sun, 7 Sep 2014 12:23:03 +0000 (14:23 +0200)]
db update mail via notification()
remove last template

10 years agoupdating config files for duepuntozero
Tobias Diekershoff [Sun, 7 Sep 2014 12:00:09 +0000 (14:00 +0200)]
updating config files for duepuntozero

10 years agoadded slackr to duepuntoderivates
Tobias Diekershoff [Sun, 7 Sep 2014 11:57:51 +0000 (13:57 +0200)]
added slackr to duepuntoderivates

10 years agoregistration request as system notification
fabrixxm [Sun, 7 Sep 2014 11:55:02 +0000 (13:55 +0200)]
registration request as system notification
kill the template
send email to all admins

10 years agoadded purplezero to duepunto as variation
Tobias Diekershoff [Sun, 7 Sep 2014 11:41:02 +0000 (13:41 +0200)]
added purplezero to duepunto as variation