]>
git.mxchange.org Git - friendica.git/log
Michael Vogel [Wed, 11 Feb 2015 06:07:31 +0000 (07:07 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1502-cleaned-item-storage-code
Michael Vogel [Wed, 11 Feb 2015 06:02:10 +0000 (07:02 +0100)]
Merge pull request #1387 from mexon/mat/mergerequest
Close cURL object earlier in fetch_url
Matthew Exon [Sun, 14 Sep 2014 03:00:33 +0000 (05:00 +0200)]
Close cURL handle before recursing, so that cookie file is flushed
Fabrixxm [Tue, 10 Feb 2015 15:04:22 +0000 (16:04 +0100)]
Merge branch 'release-3.3.3' into develop
Fabrixxm [Tue, 10 Feb 2015 10:00:02 +0000 (11:00 +0100)]
Merge branch 'mexon-mat/mergerequest' into develop
Fabrixxm [Tue, 10 Feb 2015 09:57:26 +0000 (10:57 +0100)]
Merge branch 'mat/mergerequest' of https://github.com/mexon/friendica into mexon-mat/mergerequest
fabrixxm [Tue, 10 Feb 2015 07:31:55 +0000 (08:31 +0100)]
Merge pull request #1385 from mexon/mat/caseheaders
Accept lowercase location header
Michael Vogel [Tue, 10 Feb 2015 07:22:21 +0000 (08:22 +0100)]
Relocated the cache code.
Tobias Diekershoff [Tue, 10 Feb 2015 06:49:09 +0000 (07:49 +0100)]
Merge pull request #1386 from tobiasd/20150210zh
ZH-CN update to the strings
Tobias Diekershoff [Tue, 10 Feb 2015 06:47:26 +0000 (07:47 +0100)]
ZH-CN update to the strings
Matthew Exon [Tue, 10 Feb 2015 03:14:08 +0000 (03:14 +0000)]
Accept lowercase location header
Michael Vogel [Mon, 9 Feb 2015 22:04:18 +0000 (23:04 +0100)]
Removed cache code, since it was superfluous.
Michael Vogel [Mon, 9 Feb 2015 20:52:08 +0000 (21:52 +0100)]
Rearranged code in item storage.
Tobias Diekershoff [Mon, 9 Feb 2015 18:59:02 +0000 (19:59 +0100)]
Merge pull request #1383 from tobiasd/20150209csit
CS, IT: update to the strings
Tobias Diekershoff [Mon, 9 Feb 2015 18:53:35 +0000 (19:53 +0100)]
CS, IT: update to the strings
Tobias Diekershoff [Mon, 9 Feb 2015 12:25:50 +0000 (13:25 +0100)]
Merge pull request #1382 from fabrixxm/localize-activity-poke
Fix localization of poke activity + update IT strings
Fabrixxm [Mon, 9 Feb 2015 10:55:14 +0000 (11:55 +0100)]
update IT strings
Fabrixxm [Mon, 9 Feb 2015 10:54:50 +0000 (11:54 +0100)]
fix translation of poke activity body
Tobias Diekershoff [Mon, 9 Feb 2015 10:38:20 +0000 (11:38 +0100)]
Merge pull request #1380 from fabrixxm/plain-text-mail-option
Emailer: fix text-only email
Matthew Exon [Tue, 3 Feb 2015 01:30:03 +0000 (02:30 +0100)]
Support feeds without XML headers
Tobias Diekershoff [Mon, 9 Feb 2015 10:21:17 +0000 (11:21 +0100)]
Merge pull request #1379 from tobiasd/
20150209de
DE update to the strings
Fabrixxm [Mon, 9 Feb 2015 10:21:10 +0000 (11:21 +0100)]
Emailer: fix text-only email
Tobias Diekershoff [Mon, 9 Feb 2015 10:19:56 +0000 (11:19 +0100)]
DE update to the strings
Tobias Diekershoff [Mon, 9 Feb 2015 08:02:55 +0000 (09:02 +0100)]
Merge pull request #1378 from tobiasd/20150209newstrings
regenerated master strings
Tobias Diekershoff [Mon, 9 Feb 2015 07:58:22 +0000 (08:58 +0100)]
regenerated master strings
Tobias Diekershoff [Mon, 9 Feb 2015 07:45:48 +0000 (08:45 +0100)]
Merge pull request #1377 from tobiasd/20150209cs
CS update to the strings
Tobias Diekershoff [Mon, 9 Feb 2015 07:44:06 +0000 (08:44 +0100)]
Merge pull request #1376 from annando/1502-central-item-storage
Moved several configuration values to the admin page
Michael Vogel [Mon, 9 Feb 2015 07:25:12 +0000 (08:25 +0100)]
Bugfix: The value for "global community" wasn't read.
Tobias Diekershoff [Mon, 9 Feb 2015 06:57:03 +0000 (07:57 +0100)]
CS update to the strings
Michael Vogel [Sun, 8 Feb 2015 22:50:45 +0000 (23:50 +0100)]
Enhanced SQL query so that the search is faster.
Michael Vogel [Sun, 8 Feb 2015 20:27:57 +0000 (21:27 +0100)]
Merge pull request #1371 from fabrixxm/release-3.3.3
Update CHANGELOG
Michael Vogel [Sun, 8 Feb 2015 20:03:04 +0000 (21:03 +0100)]
Just a little bit more code clean up.
Michael Vogel [Sun, 8 Feb 2015 19:55:48 +0000 (20:55 +0100)]
Just cleaning up the code.
fabrixxm [Sun, 8 Feb 2015 19:53:30 +0000 (20:53 +0100)]
Update CHANGELOG
fix spelling
Michael Vogel [Sun, 8 Feb 2015 19:35:40 +0000 (20:35 +0100)]
Moved several settings from .htconfig.php to the admin settings page.
Michael Vogel [Sun, 8 Feb 2015 15:03:23 +0000 (16:03 +0100)]
Added thread update for central item storage in the update procedure.
Michael Vogel [Sun, 8 Feb 2015 14:59:22 +0000 (15:59 +0100)]
Searching for items now always searches public entries from the central item storage with uid=0.
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.
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
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
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
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
Michael Vogel [Sun, 8 Feb 2015 11:12:19 +0000 (12:12 +0100)]
Bad HTML in the admin side menu for webfinger and probe
Michael Vogel [Sun, 8 Feb 2015 11:07:35 +0000 (12:07 +0100)]
Noscrape is now enabled all the time.
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.
Tobias Diekershoff [Sun, 8 Feb 2015 09:44:47 +0000 (10:44 +0100)]
FR update for the strings
fabrixxm [Sat, 7 Feb 2015 14:50:16 +0000 (15:50 +0100)]
Update CHANGELOG
fabrixxm [Sat, 7 Feb 2015 11:57:12 +0000 (12:57 +0100)]
Merge branch 'release-3.3.3' into develop
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.
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
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.
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.
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
Johannes Schwab [Fri, 6 Feb 2015 15:56:09 +0000 (16:56 +0100)]
fix urls for pager
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
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
Tobias Diekershoff [Thu, 5 Feb 2015 10:06:23 +0000 (11:06 +0100)]
CS DE FR: update to the strings
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
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.
Michael Vogel [Wed, 4 Feb 2015 19:22:05 +0000 (20:22 +0100)]
The relocate message hadn't changed the "nurl" value.
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)
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
Tobias Diekershoff [Wed, 4 Feb 2015 10:54:13 +0000 (11:54 +0100)]
FR: some more updates to the strings
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
Tobias Diekershoff [Wed, 4 Feb 2015 10:41:06 +0000 (11:41 +0100)]
DE FR: update to the strings
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
Tobias Diekershoff [Wed, 4 Feb 2015 10:38:34 +0000 (11:38 +0100)]
regenerated master message.po
Tobias Diekershoff [Wed, 4 Feb 2015 10:27:54 +0000 (11:27 +0100)]
typo in side panel link
Michael Vogel [Wed, 4 Feb 2015 09:43:30 +0000 (10:43 +0100)]
More details in the location field for poco.
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#
Tobias Diekershoff [Wed, 4 Feb 2015 07:47:57 +0000 (08:47 +0100)]
adopting red matrix iconography for red#
Fabrixxm [Wed, 4 Feb 2015 07:32:44 +0000 (08:32 +0100)]
Merge remote-tracking branch 'friendica/release-3.3.3' into develop
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
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
Michael Vogel [Tue, 3 Feb 2015 19:08:47 +0000 (20:08 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
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
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.
Tobias Diekershoff [Tue, 3 Feb 2015 19:04:27 +0000 (20:04 +0100)]
Merge pull request #1347 from silke/vagrant
Vagrant
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.
Michael Vogel [Tue, 3 Feb 2015 06:00:01 +0000 (07:00 +0100)]
Only some code beautification.
Michael Vogel [Mon, 2 Feb 2015 23:30:37 +0000 (00:30 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
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.
Silke Meyer [Mon, 2 Feb 2015 22:14:01 +0000 (23:14 +0100)]
Documented the Vagrant test data.
Silke Meyer [Mon, 2 Feb 2015 21:58:08 +0000 (22:58 +0100)]
Added mysql dump with some test data. Not imported by default.
Silke Meyer [Mon, 2 Feb 2015 21:57:10 +0000 (22:57 +0100)]
Fixed missing sudo, improved local mail in vagrant.
Tobias Diekershoff [Mon, 2 Feb 2015 21:41:38 +0000 (22:41 +0100)]
updated master string file
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
Michael Vogel [Mon, 2 Feb 2015 21:24:21 +0000 (22:24 +0100)]
Revert some stuff from another pull request. I like git ...
Michael Vogel [Mon, 2 Feb 2015 21:15:39 +0000 (22:15 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
Michael Vogel [Mon, 2 Feb 2015 21:08:40 +0000 (22:08 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup
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
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
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"
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"
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
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.
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!
Tobias Diekershoff [Mon, 2 Feb 2015 19:37:05 +0000 (20:37 +0100)]
make strings translate able
Michael Vogel [Mon, 2 Feb 2015 19:26:05 +0000 (20:26 +0100)]
Diaspora internal GUID links are now converted correctly.
Michael Vogel [Mon, 2 Feb 2015 19:24:19 +0000 (20:24 +0100)]
Just an added to-do comment
projects / friendica.git / log