Commit Graph

11713 Commits

Author SHA1 Message Date
Tobias Diekershoff d944b65253 Merge pull request #2151 from annando/1512-misconfigured-friendica
Workaround for misconfigured Friendica servers with probe_url
2015-12-07 06:37:37 +01:00
Tobias Diekershoff bd8b5ad881 Merge pull request #2153 from annando/issue-1924
Issue 1924: New configuration value for permitting crawler access
2015-12-07 06:32:01 +01:00
Tobias Diekershoff 6fb5e0a15d Merge pull request #2152 from annando/bugfix-socgraph
Bugfix for pull request #2147 (Fix for issue #2122)
2015-12-07 06:29:38 +01:00
Michael Vogel bcf7e673c9 Issue 1924: New configuration value for permitting crawler access 2015-12-06 22:01:20 +01:00
Michael Vogel 6b0b9481cb Bugfix for pull request #2147 (Fix for issue #2122) 2015-12-06 20:05:57 +01:00
Michael Vogel fbbba6828b Some better logging 2015-12-06 20:04:33 +01:00
Michael Vogel d06717798b Code beautification 2015-12-06 18:57:23 +01:00
Michael Vogel f880bdd33b Workaround for misconfigured Friendica servers 2015-12-06 18:52:19 +01:00
Michael Vogel 9f8da37c99 Move the process check at the beginning of the script 2015-12-06 16:40:31 +01:00
Michael Vogel 54085508e5 Double check for maximum number of workers 2015-12-06 16:28:28 +01:00
Tobias Diekershoff 2dc0b2b731 Merge pull request #2150 from annando/1512-probe-url-caching
probe_url: Only cache successful results
2015-12-06 12:22:43 +01:00
Michael Vogel 7c7baa77d6 probe_url: Only cache successful results 2015-12-06 12:15:31 +01:00
Tobias Diekershoff 6a05112d98 Merge pull request #2149 from annando/issue-1921
Issue 1921: Disable the auto update
2015-12-06 07:31:13 +01:00
Tobias Diekershoff 4680d10559 Merge pull request #2148 from annando/issue-1871
Issue 1871: Show an information if a group is empty
2015-12-06 06:43:30 +01:00
Tobias Diekershoff 48b3d04d81 Merge pull request #2147 from annando/issue-2122
Issue 2122: Make sure to always return the correct number of entries
2015-12-06 06:42:45 +01:00
Michael Vogel f406e5ddbd Issue 1921: Disable the auto update 2015-12-06 00:18:59 +01:00
Michael Vogel 01c9d13927 Issue 1871: Show an information if a group is empty 2015-12-05 23:29:42 +01:00
Michael Vogel b57ae80206 Issue 2122: Make sure to always return the correct number of entries 2015-12-05 23:05:48 +01:00
Tobias Diekershoff a8ab1bc947 Merge pull request #2146 from annando/1512-ostatus-picture-posts
Enhancements to picture posts to OStatus
2015-12-05 06:47:31 +01:00
fabrixxm 8502ffceb3 Merge pull request #2145 from tobiasd/20151204-sv
SV messages.po regenerated from strings.php
2015-12-04 23:32:37 +01:00
Tobias Diekershoff f849ff0155 SV messages.po regenerated from strings.php 2015-12-04 21:31:33 +01:00
Tobias Diekershoff c50b49d303 Merge pull request #2144 from fabrixxm/quattro
Work on Quattro
2015-12-04 20:52:58 +01:00
root 37a70d3204 modified: include/dbstructure.php removed uneeded break; It causes errors with php 7.0. 2015-12-04 19:49:09 +00:00
fabrixxm 38d46b164a quattro: some love to events pages 2015-12-04 20:43:35 +01:00
Tobias Diekershoff 4e725c3699 Merge pull request #2142 from fabrixxm/issue_1920
Fix contact popup with tinyMCE
2015-12-04 20:29:01 +01:00
Tobias Diekershoff 6015180d4f Merge pull request #2140 from fabrixxm/issue_2046
Rewrite util/php2po.php
2015-12-04 20:25:33 +01:00
fabrixxm f739fdc517 Quattro: Rss icon for atom feed link in profile 2015-12-04 19:57:19 +01:00
root 56a146361c modified: include/dbstructure.php Removed uneeded break; Causes errors with php 7.0, poller error message & white screen of death. 2015-12-04 18:47:12 +00:00
fabrixxm f44846555a quattro: hide acl button in edit post
fix #1780
2015-12-04 19:29:13 +01:00
fabrixxm f3901b99a2 Fix contact popup with tinyMCE
Fix #1920
2015-12-04 18:59:50 +01:00
Fabrixxm 4f06107579 Fix generated po headers 2015-12-04 15:47:41 +01:00
Tobias Diekershoff 4e53df7c71 Merge pull request #2141 from fabrixxm/issue_1953
Add support for attending an event to frost themes
2015-12-04 15:39:53 +01:00
Fabrixxm ddbba521c5 Add support for attending an event to frost themes
fix #1953
2015-12-04 15:01:46 +01:00
Fabrixxm d53b23858a Rewrite util/php2po.php
Fix #2046
2015-12-04 14:09:17 +01:00
Michael Vogel 25c2e219ee Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts 2015-12-04 07:07:34 +01:00
Tobias Diekershoff 7ac7caef08 Merge pull request #2136 from annando/1512-diaspora-retractions
Support for a new Diaspora command for post retraction
2015-12-04 06:54:55 +01:00
Tobias Diekershoff eaf975faae Merge pull request #2130 from annando/1512-contact-rework
Some more contact rework
2015-12-04 06:53:29 +01:00
Michael Vogel 37bd03422b The preview picture can now be remote or local 2015-12-04 06:50:23 +01:00
Michael Vogel 540d217134 Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts 2015-12-04 06:05:12 +01:00
Michael Vogel f82ce0de66 Merge branch '1512-ostatus-picture-posts' of github.com:annando/friendica into 1512-ostatus-picture-posts 2015-12-04 06:00:56 +01:00
Michael Vogel bb45112544 OStatus: Picture posts are reformatted 2015-12-04 05:57:33 +01:00
Michael Vogel dfbc5c39f5 Merge pull request #2139 from rabuzarus/0312_ping_cleanup
moving group_count_unseen to include/group.php
2015-12-04 05:50:49 +01:00
Michael Vogel 25e2a849c4 Merge pull request #2135 from rabuzarus/doxygen
Code reference in help
2015-12-04 05:47:59 +01:00
rabuzarus d94b96e546 ping: docu fix 2015-12-03 22:51:00 +01:00
rabuzarus 4b7f080c46 ping: further work 2015-12-03 22:42:53 +01:00
rabuzarus 5ff9fbb013 doxygen: correct mistake - .gitignore shouldn't be submitted 2015-12-03 21:22:13 +01:00
rabuzarus b4213d0e9e doxygen: delete wrong commited file 2015-12-03 17:30:34 +01:00
rabuzarus c0406918ec ping: cleanup 2015-12-03 17:15:49 +01:00
Fabrixxm 95508bf4bb Allow multicolunn primary keys in dbstructure 2015-12-03 16:39:20 +01:00
rabuzarus 76bb3f6673 doxygen: exclude some more folders 2015-12-03 16:17:25 +01:00