MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11306 commits 3 branches 0 tags 96 MiB
Commit graph

11306 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel ab317b8e83 Merge pull request #2289 from mexon/mat/pullrequests 
Only proxy URLs using HTTP or HTTPS
 2016-01-25 10:24:57 +01:00
fabrixxm d4bb150b49 Merge pull request #2294 from tobiasd/20160125-de 
DE update to the strings
 2016-01-25 09:27:33 +01:00
Tobias Diekershoff 662a9f5b16 Merge pull request #2287 from annando/1601-duplicate-contacts 
Remove duplicated contacts with uid=0
 2016-01-25 07:33:55 +01:00
Tobias Diekershoff 27fe3e7160 Merge pull request #2292 from mexon/mat/pullrequest2 
Report errors during cURL fetch
 2016-01-25 07:16:58 +01:00
Tobias Diekershoff d395959e41 DE update to the strings 2016-01-25 07:13:29 +01:00
Matthew Exon 677903b316 Report errors during cURL fetch 2016-01-25 02:56:47 +01:00
Matthew Exon 2aa0c6d00d Only proxy URLs using HTTP or HTTPS 2016-01-25 02:50:57 +01:00
fabrixxm 09622ad593 Merge pull request #2288 from annando/1601-warning-forumlist 
Avoid a warning if a user hadn't subscribed to any forum.
 2016-01-24 18:15:31 +01:00
Michael Vogel b409132f86 Avoid a warning if a user hadn't subscribed to any forum. 2016-01-24 17:56:34 +01:00
Michael Vogel 16b3758deb Removed to do bullet point 2016-01-24 17:42:47 +01:00
Michael Vogel ca64c7f7cd Remove duplicated contacts with uid=0 2016-01-24 17:40:31 +01:00
Tobias Diekershoff a447839c50 Merge pull request #2281 from annando/1601-repair-database 
Frequently repair of database entries
 2016-01-24 08:08:50 +01:00
Michael Vogel 079b7bb602 Merge pull request #2284 from tobiasd/20160124-messages 
Update to the strings
 2016-01-24 08:00:02 +01:00
Michael Vogel 41dacf4b37 To-Do bullets can now be listed in doxygen 2016-01-24 07:57:36 +01:00
Tobias Diekershoff 3108406c9f Update to the strings 2016-01-24 06:52:09 +01:00
Tobias Diekershoff b77dfb5737 Merge pull request #2283 from annando/1601-worker-stuff 
The worker now kills processes that run longer than 3 hours
 2016-01-24 06:42:06 +01:00
Tobias Diekershoff e511808faf Merge pull request #2282 from annando/1601-gcontact-updates 
New handling for filling the gcontact table / duplicate prevention
 2016-01-24 06:41:21 +01:00
Michael Vogel 275f7b2660 The worker now kills processes that run longer than 3 hours 2016-01-24 02:53:21 +01:00
Michael Vogel 60470cfafa New handling for filling the gcontact table / duplicate prevention 2016-01-23 22:36:15 +01:00
Michael Vogel b76dc8b129 Frequently repair of database entries 2016-01-23 22:05:27 +01:00
Tobias Diekershoff e18bb43918 Merge pull request #2280 from annando/1601-no-contact 
Workaround for the case when items are stored without a contact id
 2016-01-23 14:15:16 +01:00
Michael Vogel 61cebdb75e Workaround for the case when items are stored without a contact id 2016-01-23 12:39:37 +01:00
fabrixxm ea82bb19a2 Merge pull request #2278 from tobiasd/20160122-doc 
docs
 2016-01-23 10:12:58 +01:00
fabrixxm ff60f6b941 Merge pull request #2279 from tobiasd/20160123-admin 
FedStats: a total number count would be nice
 2016-01-23 10:12:09 +01:00
Tobias Diekershoff 39099b56d1 a total number count would be nice 2016-01-23 08:01:54 +01:00
Tobias Diekershoff 924bf238df typos 2016-01-22 09:02:21 +01:00
Tobias Diekershoff 76d588f929 typos 2016-01-22 09:00:12 +01:00
Tobias Diekershoff b02008a6a7 README.translate updated as well 2016-01-22 08:56:53 +01:00
Tobias Diekershoff 420e3021f9 clarification to the forum docs 2016-01-22 07:42:03 +01:00
Tobias Diekershoff 15febca93d Update to the translation docs (email templates and language selection problems in Safari) 2016-01-22 07:36:01 +01:00
Tobias Diekershoff 0ed7a2376a Merge pull request #2276 from annando/1601-gs-discovery 
Search for GNU Social users in the background
 2016-01-21 19:32:33 +01:00
Michael Vogel 1d502116a8 Search for GNU Social users in the background 2016-01-21 19:00:08 +01:00
Tobias Diekershoff 6174017048 Merge pull request #2275 from rabuzarus/2101_event_reminder 
fix events_reminder popup
 2016-01-21 16:18:36 +01:00
Tobias Diekershoff 478053dafe Merge pull request #2274 from annando/1601-hubzilla-comments 
Hubzilla comments are now federated
 2016-01-21 16:17:59 +01:00
Michael Vogel e1bc0b4ff8 Likes are now federated again through Diaspora 2016-01-21 16:01:46 +01:00
Michael Vogel e00c091540 Small fix for empty signatures 2016-01-21 13:57:21 +01:00
Michael Vogel 718949a0bf Merge pull request #2273 from tobiasd/20160121-de 
DE update to the strings
 2016-01-21 13:45:38 +01:00
rabuzarus 03bef2c8f8 fix events_reminder popup 2016-01-21 13:44:38 +01:00
Michael Vogel 54f42cb706 removed some test code 2016-01-21 13:38:30 +01:00
Michael Vogel d768074afd Comments from Hubzilla weren't federated properly 2016-01-21 13:21:47 +01:00
Tobias Diekershoff c012017023 DE update to the strings 2016-01-21 11:56:19 +01:00
Tobias Diekershoff 94dc1ef195 Merge pull request #2272 from annando/1601-queue 
Queue delivery should be now more reliable
 2016-01-21 07:15:39 +01:00
Michael Vogel 1c84054322 Queue delivery should be now more reliable 2016-01-21 03:21:33 +01:00
Michael Vogel 5953cb8c8a Merge pull request #2271 from tobiasd/20160120 
strings
 2016-01-20 20:20:32 +01:00
Tobias Diekershoff f635e81d94 NL update to the strings THX Dasrakel 2016-01-20 17:54:40 +01:00
Tobias Diekershoff 080319d82d issue #2270 2016-01-20 17:52:58 +01:00
Tobias Diekershoff 2c410a93ff Merge pull request #2269 from annando/1601-signatures2 
Reworked check for double encoded Diaspora signatures
 2016-01-20 16:39:19 +01:00
Michael Vogel 98ccefebcf Reworked check for double encoded Diaspora signatures 2016-01-20 16:00:43 +01:00
Fabrixxm 7e83ba090f Merge branch 'hotfix_diaspora' into develop 2016-01-20 08:50:18 +01:00
Michael Vogel c6b0e57aa4 Bugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change 2016-01-20 08:40:04 +01:00