1
0
Fork 0
Commit graph

11880 commits

Author SHA1 Message Date
Michael Vogel
f0d5c97c08 Merge remote-tracking branch 'upstream/develop' into 1604-cookie 2016-04-25 16:44:06 +02:00
af37fa8293 Merge pull request #2478 from annando/1604-bookmarks
Bugfix DFRN and bookmark detection
2016-04-25 14:52:03 +02:00
Michael Vogel
8c2a4fe02a We now work with a hash to avoid cookie manipulation 2016-04-25 11:19:42 +02:00
Michael Vogel
a214fc798a "Remember Me" should work now but needs more fine tuning 2016-04-25 07:10:40 +02:00
Michael Vogel
b4369d51f5 Improved "remember me" functionality 2016-04-25 00:02:43 +02:00
Michael Vogel
93347d3279 Bugfix DFRN and bookmark detection 2016-04-24 17:00:19 +02:00
1756ecaba3 Merge pull request #2476 from annando/1604-poller-maxlevel
Value to define the maximum level of database connections for the worker
2016-04-23 11:35:43 +02:00
c7bf440a2c Merge pull request #2477 from annando/1604-gcontact-update
Check the global contacts every 90 days/Better handling in item creation
2016-04-23 11:09:12 +02:00
Michael Vogel
5711e561fc Check the global contacts every 90 days/Better handling in item creation 2016-04-23 10:46:16 +02:00
Michael Vogel
76b24f61a9 New (experimental) value to define the maximum level of database connections for the worker 2016-04-23 10:11:09 +02:00
76c04e6782 Merge pull request #2474 from annando/1604-hubzilla-quickfix
Quickfix for Hubzilla systems with enabled OStatus addon
2016-04-23 06:49:29 +02:00
aac046c91b Merge pull request #2475 from annando/1604-avoid-write-operations
Avoid write operations if not needed
2016-04-23 06:48:45 +02:00
Michael Vogel
68bff2707e Merge pull request #2473 from tobiasd/20160422-es
ES translations thx TupambaeNet
2016-04-23 00:21:48 +02:00
Michael Vogel
ca2454eeb4 Avoid write operations if not needed 2016-04-23 00:06:34 +02:00
Michael Vogel
e76475d81f Quickfix for Hubzilla systems with enabled OStatus addon 2016-04-22 23:58:06 +02:00
031f6cbf64 ES translations thx TupambaeNet 2016-04-22 17:33:39 +02:00
19a24d6ada Merge pull request #2470 from annando/1604-gprobe
Some gcontact stuff and DDoS/Spam prevention
2016-04-21 08:40:52 +02:00
778935eb48 Merge pull request #2471 from annando/1604-diaspora-always-on
Diaspora: Comments and Likes are now signed at any time
2016-04-21 08:39:42 +02:00
Michael Vogel
5eb6b75645 Clean the url at "poco" 2016-04-21 07:24:00 +02:00
Michael Vogel
ee72f1e4bd Merge pull request #2468 from tobiasd/2242-and-htconfig
stuff for the installer and htconfig template
2016-04-21 06:41:02 +02:00
Michael Vogel
e333efc9aa Diaspora: Comments and Likes are now signed at any time 2016-04-20 23:27:33 +02:00
Michael Vogel
8da91a2298 Improved DDoS detection 2016-04-20 22:10:05 +02:00
Michael Vogel
0434b0485a Start a gcontact probing for new gcontacts 2016-04-20 21:47:57 +02:00
caa541f939 make doxygen a bit more happy 2016-04-20 16:08:17 +02:00
6601582a12 make doxygen a bit more happy 2016-04-20 16:06:39 +02:00
f075c8d410 Merge pull request #2469 from rabuzarus/2004_rss_poll
fix: contact edit poll_interval wasn't submitted
2016-04-20 15:47:05 +02:00
rabuzarus
7ee9c536ee fix: contact edit poll_interval wasn't submitted 2016-04-20 15:37:34 +02:00
7c6ebae5c0 reorganize the htconfig template 2016-04-20 14:30:22 +02:00
d3293dfcf2 during installation choose the highest RINO version possible 2016-04-20 14:17:48 +02:00
8c8e635d2e Merge pull request #2467 from annando/1604-gcontact-cleanup
Some more checks that the gcontact table contains valid data
2016-04-20 14:14:35 +02:00
Michael Vogel
378d444fc3 Only do the cleaning on specific networks 2016-04-20 09:38:06 +02:00
Michael Vogel
7f8aee2baa Don't clean the contact url of feeds 2016-04-20 09:31:36 +02:00
Michael Vogel
ea3ecd83ea We have to store feeds in the gcontact table ... 2016-04-20 08:27:11 +02:00
Michael Vogel
919728126a Bugfix: We checked in the wrong array ... 2016-04-20 07:58:52 +02:00
Michael Vogel
c6fb6c559a Improved logging 2016-04-20 07:48:21 +02:00
Michael Vogel
bc0ba8a0d7 Added description 2016-04-20 07:26:18 +02:00
Michael Vogel
28f97845ca Some more checks that the gcontact table contains valid data 2016-04-20 07:00:55 +02:00
1dd73dce80 Merge pull request #2466 from annando/1604-remove-attachment
Bugfix: The function to remove parts of attachments forgot the rest
2016-04-20 06:22:18 +02:00
Michael Vogel
bb5421d925 Bugfix: The function to remove parts of attachments forgot about the rest 2016-04-20 00:12:27 +02:00
7509934922 Merge pull request #2462 from annando/1604-gcontact-search
Use "like" instead of "regexp" for the gcontact search
2016-04-19 21:35:59 +02:00
f7548b87c6 Merge pull request #2463 from annando/1604-diaspora-again
Some small Diaspora changes
2016-04-19 21:35:33 +02:00
fd8df4c4d6 Merge pull request #2465 from annando/1604-no-unknown
Don't store unknown networks
2016-04-19 21:35:01 +02:00
Michael Vogel
53d8c21d3c Don't store unknown networks 2016-04-19 20:39:12 +02:00
31868af45d Merge pull request #2464 from annando/1604-scrape-cache
Don't cache account probing for empty networks
2016-04-19 16:48:01 +02:00
Michael Vogel
cb12e145a7 Don't cache account probing for empty networks 2016-04-19 16:19:23 +02:00
Michael Vogel
ea8cfed6a9 Some small Diaspora changes 2016-04-19 07:39:17 +02:00
Michael Vogel
e1ca622b27 Use "like" instead of "regexp" for the gcontact search 2016-04-19 07:27:26 +02:00
8126683552 Merge pull request #2461 from annando/1604-attach-preview
Attachments: Better handling of preview pictures
2016-04-19 06:16:56 +02:00
Michael Vogel
432c1ec5e4 Now we are having "after" at the old attach mechanism as well 2016-04-18 21:28:09 +02:00
Michael Vogel
3e76ad7793 Bugfix: ' in titles were a problem. 2016-04-18 20:57:01 +02:00