clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,318 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

9318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vogel 3c8fc863a8 The "share a post" notification is now sent based upon mentions as well. 2015-02-11 07:19:48 +01:00
Michael Vogel 9287a0521a Merge remote-tracking branch 'upstream/develop' into 1502-cleaned-item-storage-code 2015-02-11 07:07:31 +01:00
Michael Vogel ce8f965e11 Merge pull request #1387 from mexon/mat/mergerequest 
Close cURL object earlier in fetch_url
 2015-02-11 07:02:10 +01:00
Matthew Exon 2bb8b77123 Close cURL handle before recursing, so that cookie file is flushed 2015-02-11 03:42:07 +00:00
Fabrixxm 135869fd1c Merge branch 'release-3.3.3' into develop 2015-02-10 16:04:22 +01:00
Fabrixxm 4d17b2e9e8 Merge branch 'mexon-mat/mergerequest' into develop 2015-02-10 11:00:02 +01:00
Fabrixxm 87f9258834 Merge branch 'mat/mergerequest' of https://github.com/mexon/friendica into mexon-mat/mergerequest 2015-02-10 10:57:26 +01:00
fabrixxm d4e93ee9b4 Merge pull request #1385 from mexon/mat/caseheaders 
Accept lowercase location header
 2015-02-10 08:31:55 +01:00
Michael Vogel 1a75503b1c Relocated the cache code. 2015-02-10 08:22:21 +01:00
Tobias Diekershoff 6e3a236cfc Merge pull request #1386 from tobiasd/20150210zh 
ZH-CN update to the strings
 2015-02-10 07:49:09 +01:00
Tobias Diekershoff 400e11fd9f ZH-CN update to the strings 2015-02-10 07:47:26 +01:00
Matthew Exon d12b929c96 Accept lowercase location header 2015-02-10 03:14:08 +00:00
Michael Vogel 2dc5f1aefc Removed cache code, since it was superfluous. 2015-02-09 23:04:18 +01:00
Michael Vogel 091c3e75ca Rearranged code in item storage. 2015-02-09 21:52:08 +01:00
Tobias Diekershoff fe43f87bda Merge pull request #1383 from tobiasd/20150209csit 
CS, IT: update to the strings
 2015-02-09 19:59:02 +01:00
Tobias Diekershoff 4e4702fb8b CS, IT: update to the strings 2015-02-09 19:53:35 +01:00
Tobias Diekershoff e051da8203 Merge pull request #1382 from fabrixxm/localize-activity-poke 
Fix localization of poke activity + update IT strings
 2015-02-09 13:25:50 +01:00
Fabrixxm f4f0f2bbc7 update IT strings 2015-02-09 11:55:14 +01:00
Fabrixxm 5d19b21298 fix translation of poke activity body 2015-02-09 11:54:50 +01:00
Tobias Diekershoff b383e53927 Merge pull request #1380 from fabrixxm/plain-text-mail-option 
Emailer: fix text-only email
 2015-02-09 11:38:20 +01:00
Matthew Exon 1c31dca5d6 Support feeds without XML headers 2015-02-09 10:21:27 +00:00
Tobias Diekershoff c0c429eb41 Merge pull request #1379 from tobiasd/20150209de 
DE update to the strings
 2015-02-09 11:21:17 +01:00
Fabrixxm ff41cc24bd Emailer: fix text-only email 2015-02-09 11:21:10 +01:00
Tobias Diekershoff 93cb464d79 DE update to the strings 2015-02-09 11:19:56 +01:00
Tobias Diekershoff 88b86bf6f6 Merge pull request #1378 from tobiasd/20150209newstrings 
regenerated master strings
 2015-02-09 09:02:55 +01:00
Tobias Diekershoff e8155a6df0 regenerated master strings 2015-02-09 08:58:22 +01:00
Tobias Diekershoff 18cfb5e726 Merge pull request #1377 from tobiasd/20150209cs 
CS update to the strings
 2015-02-09 08:45:48 +01:00
Tobias Diekershoff 5e51a125a7 Merge pull request #1376 from annando/1502-central-item-storage 
Moved several configuration values to the admin page
 2015-02-09 08:44:06 +01:00
Michael Vogel e7b2c5dbf3 Bugfix: The value for "global community" wasn't read. 2015-02-09 08:25:12 +01:00
Tobias Diekershoff 898d4b2a62 CS update to the strings 2015-02-09 07:57:03 +01:00
Michael Vogel c0411ae25a Enhanced SQL query so that the search is faster. 2015-02-08 23:50:45 +01:00
Michael Vogel 6f78a4dcf2 Merge pull request #1371 from fabrixxm/release-3.3.3 
Update CHANGELOG
 2015-02-08 21:27:57 +01:00
Michael Vogel 136626c199 Just a little bit more code clean up. 2015-02-08 21:03:04 +01:00
Michael Vogel 2a02e1cb9c Just cleaning up the code. 2015-02-08 20:55:48 +01:00
fabrixxm 456b6b17c0 Update CHANGELOG 
fix spelling
 2015-02-08 20:53:30 +01:00
Michael Vogel 7e9ae24511 Moved several settings from .htconfig.php to the admin settings page. 2015-02-08 20:35:40 +01:00
Michael Vogel 10c7ab76a2 Added thread update for central item storage in the update procedure. 2015-02-08 16:03:23 +01:00
Michael Vogel a97d4383a1 Searching for items now always searches public entries from the central item storage with uid=0. 2015-02-08 15:59:22 +01:00
Tobias Diekershoff 7d2da9be02 Merge pull request #1375 from annando/1502-altpager-default 
"altpager" is now the standard value and can be disabled.
 2015-02-08 13:37:26 +01:00
Michael Vogel 8871591a98 Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default 
Conflicts:
	mod/admin.php
 2015-02-08 13:26:28 +01:00
Tobias Diekershoff b4dc344f9c Merge pull request #1374 from annando/1502-noscrape-always-active 
Noscrape is now enabled all the time
 2015-02-08 12:48:13 +01:00
Tobias Diekershoff 1418d6bc27 Merge pull request #1373 from annando/1502-bugfix-admin-aside 
Bad HTML in the admin side menu for webfinger and probe
 2015-02-08 12:47:46 +01:00
Michael Vogel 65e4dc93d5 Merge pull request #1372 from tobiasd/20150207fr 
FR update for the strings
 2015-02-08 12:32:03 +01:00
Michael Vogel 1781fbff13 Bad HTML in the admin side menu for webfinger and probe 2015-02-08 12:12:19 +01:00
Michael Vogel f931eba7f2 Noscrape is now enabled all the time. 2015-02-08 12:07:35 +01:00
Michael Vogel 1d48ab0191 "altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version. 2015-02-08 11:54:42 +01:00
Tobias Diekershoff cea445de2e FR update for the strings 2015-02-08 10:44:47 +01:00
fabrixxm fb6521cca2 Update CHANGELOG 2015-02-07 15:50:16 +01:00
fabrixxm f620834d97 Merge branch 'release-3.3.3' into develop 2015-02-07 12:57:12 +01:00
Tobias Diekershoff dea2e66cdf Merge pull request #1369 from annando/1502-title-in-diaspora-bookmarklet 
The title in the bookmarklet had several asterisk in the title.
 2015-02-06 22:03:54 +01:00