]> git.mxchange.org Git - friendica.git/log
friendica.git
9 years agoScrape now contains the number of contacts as well.
Michael Vogel [Sun, 8 Feb 2015 22:35:29 +0000 (23:35 +0100)]
Scrape now contains the number of contacts as well.

9 years agoMerge pull request #1375 from annando/1502-altpager-default
Tobias Diekershoff [Sun, 8 Feb 2015 12:37:26 +0000 (13:37 +0100)]
Merge pull request #1375 from annando/1502-altpager-default

"altpager" is now the standard value and can be disabled.

9 years agoMerge remote-tracking branch 'upstream/develop' into 1502-altpager-default
Michael Vogel [Sun, 8 Feb 2015 12:26:28 +0000 (13:26 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default

Conflicts:
mod/admin.php

9 years agoMerge pull request #1374 from annando/1502-noscrape-always-active
Tobias Diekershoff [Sun, 8 Feb 2015 11:48:13 +0000 (12:48 +0100)]
Merge pull request #1374 from annando/1502-noscrape-always-active

Noscrape is now enabled all the time

9 years agoMerge pull request #1373 from annando/1502-bugfix-admin-aside
Tobias Diekershoff [Sun, 8 Feb 2015 11:47:46 +0000 (12:47 +0100)]
Merge pull request #1373 from annando/1502-bugfix-admin-aside

Bad HTML in the admin side menu for webfinger and probe

9 years agoMerge pull request #1372 from tobiasd/20150207fr
Michael Vogel [Sun, 8 Feb 2015 11:32:03 +0000 (12:32 +0100)]
Merge pull request #1372 from tobiasd/20150207fr

FR update for the strings

9 years agoBad HTML in the admin side menu for webfinger and probe
Michael Vogel [Sun, 8 Feb 2015 11:12:19 +0000 (12:12 +0100)]
Bad HTML in the admin side menu for webfinger and probe

9 years agoNoscrape is now enabled all the time.
Michael Vogel [Sun, 8 Feb 2015 11:07:35 +0000 (12:07 +0100)]
Noscrape is now enabled all the time.

9 years ago"altpager" is now the standard value and can be disabled. Depending upon the user...
Michael Vogel [Sun, 8 Feb 2015 10:54:42 +0000 (11:54 +0100)]
"altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version.

9 years agoFR update for the strings
Tobias Diekershoff [Sun, 8 Feb 2015 09:44:47 +0000 (10:44 +0100)]
FR update for the strings

9 years agoMerge branch 'release-3.3.3' into develop
fabrixxm [Sat, 7 Feb 2015 11:57:12 +0000 (12:57 +0100)]
Merge branch 'release-3.3.3' into develop

9 years agoMerge pull request #1369 from annando/1502-title-in-diaspora-bookmarklet
Tobias Diekershoff [Fri, 6 Feb 2015 21:03:54 +0000 (22:03 +0100)]
Merge pull request #1369 from annando/1502-title-in-diaspora-bookmarklet

The title in the bookmarklet had several asterisk in the title.

9 years agoMerge pull request #1368 from annando/1502-contact-correction
Tobias Diekershoff [Fri, 6 Feb 2015 21:03:00 +0000 (22:03 +0100)]
Merge pull request #1368 from annando/1502-contact-correction

Correct the contact data if it was changed although the system don't thinks so

9 years agoThe title in the bookmarklet had several asterisk in the title. This had no use for...
Michael Vogel [Fri, 6 Feb 2015 20:10:49 +0000 (21:10 +0100)]
The title in the bookmarklet had several asterisk in the title. This had no use for friendica.

9 years agoCorrect the contact data if it was changed although the system don't thinks so.
Michael Vogel [Fri, 6 Feb 2015 20:02:33 +0000 (21:02 +0100)]
Correct the contact data if it was changed although the system don't thinks so.

9 years agoMerge pull request #1366 from ddorian1/release-3.3.3
fabrixxm [Fri, 6 Feb 2015 16:38:55 +0000 (17:38 +0100)]
Merge pull request #1366 from ddorian1/release-3.3.3

fix urls for pager

9 years agofix urls for pager
Johannes Schwab [Fri, 6 Feb 2015 15:56:09 +0000 (16:56 +0100)]
fix urls for pager

9 years agoMerge pull request #1357 from annando/1502-html-poco-2
fabrixxm [Thu, 5 Feb 2015 10:21:23 +0000 (11:21 +0100)]
Merge pull request #1357 from annando/1502-html-poco-2

html to bbcode convertion in poco - 2nd try

9 years agoMerge pull request #1360 from tobiasd/20150205lng
Tobias Diekershoff [Thu, 5 Feb 2015 10:09:00 +0000 (11:09 +0100)]
Merge pull request #1360 from tobiasd/20150205lng

CS DE FR: update to the strings

9 years agoCS DE FR: update to the strings
Tobias Diekershoff [Thu, 5 Feb 2015 10:06:23 +0000 (11:06 +0100)]
CS DE FR: update to the strings

9 years agoMerge pull request #1359 from annando/1502-more-detailled-location
Tobias Diekershoff [Thu, 5 Feb 2015 07:31:15 +0000 (08:31 +0100)]
Merge pull request #1359 from annando/1502-more-detailled-location

More details in the location field for poco

9 years agoMerge pull request #1358 from annando/1502-relocate-set-nurl
Tobias Diekershoff [Wed, 4 Feb 2015 19:39:31 +0000 (20:39 +0100)]
Merge pull request #1358 from annando/1502-relocate-set-nurl

The relocate message hadn't changed the "nurl" value.

9 years agoThe relocate message hadn't changed the "nurl" value.
Michael Vogel [Wed, 4 Feb 2015 19:22:05 +0000 (20:22 +0100)]
The relocate message hadn't changed the "nurl" value.

9 years agoDue to some git problems, just the same stuff again (html to bbcode conversation...
Michael Vogel [Wed, 4 Feb 2015 18:49:43 +0000 (19:49 +0100)]
Due to some git problems, just the same stuff again (html to bbcode conversation in poco)

9 years agoMerge pull request #1355 from tobiasd/20150204_fr
Tobias Diekershoff [Wed, 4 Feb 2015 10:55:26 +0000 (11:55 +0100)]
Merge pull request #1355 from tobiasd/20150204_fr

FR: some more updates to the strings

9 years agoFR: some more updates to the strings
Tobias Diekershoff [Wed, 4 Feb 2015 10:54:13 +0000 (11:54 +0100)]
FR: some more updates to the strings

9 years agoMerge pull request #1354 from tobiasd/20150204_defr
Tobias Diekershoff [Wed, 4 Feb 2015 10:42:39 +0000 (11:42 +0100)]
Merge pull request #1354 from tobiasd/20150204_defr

DE FR: update to the strings

9 years agoDE FR: update to the strings
Tobias Diekershoff [Wed, 4 Feb 2015 10:41:06 +0000 (11:41 +0100)]
DE FR: update to the strings

9 years agoMerge pull request #1353 from tobiasd/20150205_typo
Tobias Diekershoff [Wed, 4 Feb 2015 10:39:20 +0000 (11:39 +0100)]
Merge pull request #1353 from tobiasd/20150205_typo

typo in side panel link

9 years agoregenerated master message.po
Tobias Diekershoff [Wed, 4 Feb 2015 10:38:34 +0000 (11:38 +0100)]
regenerated master message.po

9 years agotypo in side panel link
Tobias Diekershoff [Wed, 4 Feb 2015 10:27:54 +0000 (11:27 +0100)]
typo in side panel link

9 years agoMore details in the location field for poco.
Michael Vogel [Wed, 4 Feb 2015 09:43:30 +0000 (10:43 +0100)]
More details in the location field for poco.

9 years agoMerge pull request #1352 from tobiasd/20150204_red
fabrixxm [Wed, 4 Feb 2015 08:01:17 +0000 (09:01 +0100)]
Merge pull request #1352 from tobiasd/20150204_red

adopting red matrix iconography for red#

9 years agoadopting red matrix iconography for red#
Tobias Diekershoff [Wed, 4 Feb 2015 07:47:57 +0000 (08:47 +0100)]
adopting red matrix iconography for red#

9 years agoMerge remote-tracking branch 'friendica/release-3.3.3' into develop
Fabrixxm [Wed, 4 Feb 2015 07:32:44 +0000 (08:32 +0100)]
Merge remote-tracking branch 'friendica/release-3.3.3' into develop

9 years agoMerge pull request #1337 from annando/1501-html-in-poco
fabrixxm [Wed, 4 Feb 2015 07:29:21 +0000 (08:29 +0100)]
Merge pull request #1337 from annando/1501-html-in-poco

Bugfix: The portable contacts send data as html

9 years agoMerge pull request #1351 from annando/1501-central-item-storage
Tobias Diekershoff [Tue, 3 Feb 2015 19:38:25 +0000 (20:38 +0100)]
Merge pull request #1351 from annando/1501-central-item-storage

Diaspora: Storing of original posts of reshared posts

9 years agoMerge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
Michael Vogel [Tue, 3 Feb 2015 19:08:47 +0000 (20:08 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage

9 years agoMerge pull request #1346 from tobiasd/20150202-strings
Tobias Diekershoff [Tue, 3 Feb 2015 19:05:11 +0000 (20:05 +0100)]
Merge pull request #1346 from tobiasd/20150202-strings

updated master string file

9 years agoMerge pull request #1350 from annando/1502-diabook-disable-features
Tobias Diekershoff [Tue, 3 Feb 2015 19:05:01 +0000 (20:05 +0100)]
Merge pull request #1350 from annando/1502-diabook-disable-features

Some diabook features can dramatically slow down the system.

9 years agoMerge pull request #1347 from silke/vagrant
Tobias Diekershoff [Tue, 3 Feb 2015 19:04:27 +0000 (20:04 +0100)]
Merge pull request #1347 from silke/vagrant

Vagrant

9 years agoSome diabook features can dramatically slow down the system. There is a new switch...
Michael Vogel [Tue, 3 Feb 2015 18:59:47 +0000 (19:59 +0100)]
Some diabook features can dramatically slow down the system. There is a new switch to disable this.

9 years agoOnly some code beautification.
Michael Vogel [Tue, 3 Feb 2015 06:00:01 +0000 (07:00 +0100)]
Only some code beautification.

9 years agoMerge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
Michael Vogel [Mon, 2 Feb 2015 23:30:37 +0000 (00:30 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage

9 years agoLook for links to diaspora posts and try to fetch them if they aren't on the system.
Michael Vogel [Mon, 2 Feb 2015 23:29:21 +0000 (00:29 +0100)]
Look for links to diaspora posts and try to fetch them if they aren't on the system.

9 years agoDocumented the Vagrant test data.
Silke Meyer [Mon, 2 Feb 2015 22:14:01 +0000 (23:14 +0100)]
Documented the Vagrant test data.

9 years agoAdded mysql dump with some test data. Not imported by default.
Silke Meyer [Mon, 2 Feb 2015 21:58:08 +0000 (22:58 +0100)]
Added mysql dump with some test data. Not imported by default.

9 years agoFixed missing sudo, improved local mail in vagrant.
Silke Meyer [Mon, 2 Feb 2015 21:57:10 +0000 (22:57 +0100)]
Fixed missing sudo, improved local mail in vagrant.

9 years agoupdated master string file
Tobias Diekershoff [Mon, 2 Feb 2015 21:41:38 +0000 (22:41 +0100)]
updated master string file

9 years agoMerge pull request #1345 from annando/1501-api-speedup
Tobias Diekershoff [Mon, 2 Feb 2015 21:35:56 +0000 (22:35 +0100)]
Merge pull request #1345 from annando/1501-api-speedup

API post increase speed

9 years agoRevert some stuff from another pull request. I like git ...
Michael Vogel [Mon, 2 Feb 2015 21:24:21 +0000 (22:24 +0100)]
Revert some stuff from another pull request. I like git ...

9 years agoMerge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
Michael Vogel [Mon, 2 Feb 2015 21:15:39 +0000 (22:15 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage

9 years agoMerge remote-tracking branch 'upstream/develop' into 1501-api-speedup
Michael Vogel [Mon, 2 Feb 2015 21:08:40 +0000 (22:08 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup

9 years agoMerge pull request #1343 from annando/1502-diaspora-guid-links
Tobias Diekershoff [Mon, 2 Feb 2015 21:03:09 +0000 (22:03 +0100)]
Merge pull request #1343 from annando/1502-diaspora-guid-links

Diaspora internal GUID links are now converted correctly

9 years agoMerge pull request #1338 from annando/1501-global-contacts
Tobias Diekershoff [Mon, 2 Feb 2015 20:52:09 +0000 (21:52 +0100)]
Merge pull request #1338 from annando/1501-global-contacts

Added "about" to noscrape

9 years agoMerge pull request #1339 from annando/1502-bugfix-friend-notification-diaspora
Tobias Diekershoff [Mon, 2 Feb 2015 20:51:35 +0000 (21:51 +0100)]
Merge pull request #1339 from annando/1502-bugfix-friend-notification-diaspora

Improvement for the "new friend" notification with Diaspora and "remote self"

9 years agoMerge pull request #1344 from annando/1502-new-vier-version
Tobias Diekershoff [Mon, 2 Feb 2015 20:50:54 +0000 (21:50 +0100)]
Merge pull request #1344 from annando/1502-new-vier-version

New version for "Vier"

9 years agoMerge pull request #1342 from tobiasd/20150202_admin
Michael Vogel [Mon, 2 Feb 2015 20:14:41 +0000 (21:14 +0100)]
Merge pull request #1342 from tobiasd/20150202_admin

added diagnostics tools to the admin side panel

9 years agoAdded Beanow as author, since he did most of the last changes.
Michael Vogel [Mon, 2 Feb 2015 20:03:14 +0000 (21:03 +0100)]
Added Beanow as author, since he did most of the last changes.

9 years agoNew version for "Vier". The navigation was restructured and several other stuff was...
Michael Vogel [Mon, 2 Feb 2015 20:00:32 +0000 (21:00 +0100)]
New version for "Vier". The navigation was restructured and several other stuff was changed as well, thanks to Beanow!

9 years agomake strings translate able
Tobias Diekershoff [Mon, 2 Feb 2015 19:37:05 +0000 (20:37 +0100)]
make strings translate able

9 years agoDiaspora internal GUID links are now converted correctly.
Michael Vogel [Mon, 2 Feb 2015 19:26:05 +0000 (20:26 +0100)]
Diaspora internal GUID links are now converted correctly.

9 years agoJust an added to-do comment
Michael Vogel [Mon, 2 Feb 2015 19:24:19 +0000 (20:24 +0100)]
Just an added to-do comment

9 years agoadded diagnostics tools to the admin side panel
Tobias Diekershoff [Mon, 2 Feb 2015 17:26:38 +0000 (18:26 +0100)]
added diagnostics tools to the admin side panel

9 years agopreps to read mail in vagrant
Silke Meyer [Mon, 2 Feb 2015 15:05:47 +0000 (16:05 +0100)]
preps to read mail in vagrant

9 years agoNew function to fetch and store an item based on the guid.
Michael Vogel [Sun, 1 Feb 2015 20:54:44 +0000 (21:54 +0100)]
New function to fetch and store an item based on the guid.

9 years agoMerge pull request #1333 from tobiasd/20150131_ptbr
Michael Vogel [Sun, 1 Feb 2015 15:40:24 +0000 (16:40 +0100)]
Merge pull request #1333 from tobiasd/20150131_ptbr

PT-BR: update to the strings

9 years agoMerge pull request #1335 from silke/issue1329
Michael Vogel [Sun, 1 Feb 2015 15:40:00 +0000 (16:40 +0100)]
Merge pull request #1335 from silke/issue1329

Issue1329

9 years agoThe alias can - or can not - be an SSL link.
Michael Vogel [Sun, 1 Feb 2015 15:32:58 +0000 (16:32 +0100)]
The alias can - or can not - be an SSL link.

9 years agoLet the browser check if it's a valid email address
Silke Meyer [Sun, 1 Feb 2015 15:25:49 +0000 (16:25 +0100)]
Let the browser check if it's a valid email address

9 years agoDiaspora: The "new friend" notification now respects the corresponding setting/"new...
Michael Vogel [Sun, 1 Feb 2015 15:04:16 +0000 (16:04 +0100)]
Diaspora: The "new friend" notification now respects the corresponding setting/"new friend" notification isn't send via "remote self" anymore.

9 years agoMerge remote-tracking branch 'upstream/develop' into 1501-api-speedup
Michael Vogel [Sun, 1 Feb 2015 12:33:26 +0000 (13:33 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup

9 years agoAliases are now handled correctly. The public item copy gets a "real" contact id...
Michael Vogel [Sun, 1 Feb 2015 12:32:05 +0000 (13:32 +0100)]
Aliases are now handled correctly. The public item copy gets a "real" contact id as well.

9 years agoMerge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
Michael Vogel [Sun, 1 Feb 2015 12:28:32 +0000 (13:28 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage

9 years agoReshared diaspora items that aren't on this server are now stored with uid=0
Michael Vogel [Sun, 1 Feb 2015 09:26:35 +0000 (10:26 +0100)]
Reshared diaspora items that aren't on this server are now stored with uid=0

9 years agoThe query after an API post was improved to make it faster.
Michael Vogel [Sat, 31 Jan 2015 22:13:21 +0000 (23:13 +0100)]
The query after an API post was improved to make it faster.

9 years agoBugfix: The portable contacts send data as html but was expected to be bbcode. Now...
Michael Vogel [Sat, 31 Jan 2015 21:57:05 +0000 (22:57 +0100)]
Bugfix: The portable contacts send data as html but was expected to be bbcode. Now the html is converted to bbcode.

9 years agoChanged the "From" field for system emails from product to sitename.
Silke Meyer [Sat, 31 Jan 2015 17:44:30 +0000 (18:44 +0100)]
Changed the "From" field for system emails from product to sitename.

9 years agodeleted my comment of the original line
Silke Meyer [Sat, 31 Jan 2015 17:41:05 +0000 (18:41 +0100)]
deleted my comment of the original line

9 years agoAdded a description to the help field
Silke Meyer [Sat, 31 Jan 2015 15:09:59 +0000 (16:09 +0100)]
Added a description to the help field

9 years agoadded setting for server's sender email address
Silke Meyer [Sat, 31 Jan 2015 14:54:12 +0000 (15:54 +0100)]
added setting for server's sender email address

9 years agofixed a typo
Silke Meyer [Sat, 31 Jan 2015 14:23:36 +0000 (15:23 +0100)]
fixed a typo

9 years agoAdded setting to customize system notifications' sender email address
Silke Meyer [Sat, 31 Jan 2015 07:46:05 +0000 (08:46 +0100)]
Added setting to customize system notifications' sender email address

9 years agoPT-BR: update to the strings
Tobias Diekershoff [Sat, 31 Jan 2015 07:42:36 +0000 (08:42 +0100)]
PT-BR: update to the strings

9 years agoMerge pull request #1332 from silke/develop
Tobias Diekershoff [Fri, 30 Jan 2015 21:56:39 +0000 (22:56 +0100)]
Merge pull request #1332 from silke/develop

Added local mail delivery for vagrant (postfix).

9 years agoAdded local mail delivery for vagrant (postfix).
Silke Meyer [Fri, 30 Jan 2015 16:03:42 +0000 (17:03 +0100)]
Added local mail delivery for vagrant (postfix).

9 years agoMerge pull request #1328 from friendica/release-3.3.3
fabrixxm [Thu, 29 Jan 2015 09:18:46 +0000 (10:18 +0100)]
Merge pull request #1328 from friendica/release-3.3.3

Update version to 3.3.3-RC

9 years agoUpdate FRIENDICA_VERSION
fabrixxm [Thu, 29 Jan 2015 08:44:48 +0000 (09:44 +0100)]
Update FRIENDICA_VERSION

9 years agoMerge pull request #1327 from annando/1501-more-stuff-to-proxy
Tobias Diekershoff [Thu, 29 Jan 2015 07:19:20 +0000 (08:19 +0100)]
Merge pull request #1327 from annando/1501-more-stuff-to-proxy

And yet another two places where pictures have to be sent through the proxy

9 years agoAnd yet another two places where pictures have to be sent through the proxy.
Michael Vogel [Wed, 28 Jan 2015 22:34:46 +0000 (23:34 +0100)]
And yet another two places where pictures have to be sent through the proxy.

9 years agoMerge pull request #1325 from annando/1501-more-stuff-to-proxy
Tobias Diekershoff [Wed, 28 Jan 2015 10:16:50 +0000 (11:16 +0100)]
Merge pull request #1325 from annando/1501-more-stuff-to-proxy

Just two more places where pictures have to be send through the proxy

9 years agoJust two more places where pictures have to be send through the proxy function.
Michael Vogel [Wed, 28 Jan 2015 09:09:16 +0000 (10:09 +0100)]
Just two more places where pictures have to be send through the proxy function.

9 years agoMerge pull request #1320 from tobiasd/20150127adminpanel
fabrixxm [Wed, 28 Jan 2015 07:24:29 +0000 (08:24 +0100)]
Merge pull request #1320 from tobiasd/20150127adminpanel

add links to the plugin config pages for active plugins

9 years agoMerge pull request #1322 from tugelbend/develop
Tobias Diekershoff [Wed, 28 Jan 2015 07:04:04 +0000 (08:04 +0100)]
Merge pull request #1322 from tugelbend/develop

bug fix: syntax error #1321

9 years agoMerge pull request #1324 from annando/issue-1323
Tobias Diekershoff [Wed, 28 Jan 2015 07:03:38 +0000 (08:03 +0100)]
Merge pull request #1324 from annando/issue-1323

Issue 1323: Contact pictures from the acl selector weren't proxied.

9 years agoIssue 1323: Contact pictures from the acl selector weren't proxied.
Michael Vogel [Wed, 28 Jan 2015 00:22:42 +0000 (01:22 +0100)]
Issue 1323: Contact pictures from the acl selector weren't proxied.

9 years agoAdded "about" to noscrape.
Michael Vogel [Tue, 27 Jan 2015 18:52:54 +0000 (19:52 +0100)]
Added "about" to noscrape.

9 years agobug fix: syntax error #1321
hauke [Tue, 27 Jan 2015 17:21:32 +0000 (18:21 +0100)]
bug fix: syntax error #1321

9 years agoMerge pull request #1319 from annando/1501-better-contact-list
Tobias Diekershoff [Tue, 27 Jan 2015 13:36:56 +0000 (14:36 +0100)]
Merge pull request #1319 from annando/1501-better-contact-list

In private mails the contact list now contains the user address as well

9 years agoadd links to the plugin config pages for active plugins
Tobias Diekershoff [Tue, 27 Jan 2015 13:34:11 +0000 (14:34 +0100)]
add links to the plugin config pages for active plugins