1
1
Fork 0
Commit graph

11913 commits

Author SHA1 Message Date
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
Michael Vogel
999ef7f679 Attachments: Better handling of preview pictures 2016-04-18 12:13:54 +02:00
1c47ec35b8 Merge pull request #2460 from annando/bugfix-attachments
Bugfix: Missing include added
2016-04-18 08:14:20 +02:00
Michael Vogel
d928928fda Merge remote-tracking branch 'upstream/develop' into bugfix-attachments 2016-04-18 06:15:29 +02:00
Michael Vogel
26f62a97fd Bugfix: Missing include added 2016-04-18 06:11:29 +02:00
a5f97b2d87 Merge pull request #2457 from annando/1604-attachments
Use the "attachment" element instead of a mixture of several elements
2016-04-18 05:53:47 +02:00
93a11cf839 Merge pull request #2458 from annando/1603-smilies
Bugfix: Messages work now again
2016-04-18 05:52:00 +02:00
Michael Vogel
81bcafe28f Improved handling of photos 2016-04-17 23:38:29 +02:00
Michael Vogel
dde600c0f5 Merge pull request #2459 from rabuzarus/patch-1
rework autocompletion: Update mobile.css
2016-04-17 22:38:46 +02:00
rabuzarus
9190380dec rework autocompletion: Update mobile.css 2016-04-17 22:27:49 +02:00
Michael Vogel
0f24f2d9ae Bugfix: Messages work now again 2016-04-17 22:07:01 +02:00
Michael Vogel
502b660ca9 Added documentation 2016-04-17 20:55:19 +02:00
Michael Vogel
49d52faab5 Use the "attachment" element instead of a mixture of several elements 2016-04-17 20:43:41 +02:00
e44bec3c37 Merge pull request #2452 from annando/1604-clean-contact-url
Clean gcontact url before saving in gcontact table
2016-04-17 16:51:06 +02:00
2ac1a2f4ce Merge pull request #2454 from annando/1604-more-elements
More elements for the autocompletion
2016-04-17 16:47:50 +02:00
1e18b6bbb9 Merge pull request #2456 from rabuzarus/1704_vier_cbox_img
vier: colorbox fix (img max-width: 100%)
2016-04-17 16:47:28 +02:00
6da01c1a3d Merge pull request #2455 from annando/1604-completion
Speeding up the gcontact search
2016-04-17 16:46:50 +02:00
Michael Vogel
ae75a46529 the "nurl" index was accidentally dropped 2016-04-17 16:41:28 +02:00