Commit graph

11531 commits

Author SHA1 Message Date
Tobias Diekershoff
3ac75eebbc Merge pull request #2163 from annando/1512-rendertime-css
Do a linebreak before the output of rendertime
2015-12-08 21:05:05 +01:00
Michael Vogel
57576e09ed Avoid problems with wrong configured server variables 2015-12-08 19:53:01 +01:00
Michael Vogel
59b2bde9a7 Do a linebreak before the output of rendertime 2015-12-08 19:41:27 +01:00
Johannes Schwab
2f866fecf9 fix path for photo and proxy 2015-12-08 11:31:50 +01:00
fabrixxm
f97e20acd3 add support to schema modification with multi-column primary key 2015-12-08 10:35:08 +01:00
fabrixxm
5d04818df7 Merge pull request #2162 from annando/1512-basepath
Add an additional way to fetch the basepath (See pull request 2161)
2015-12-08 09:08:48 +01:00
Michael Vogel
d7fc8d7c12 Add an additional way to fetch the basepath (See pull request 2161) 2015-12-08 08:17:29 +01:00
Michael Vogel
a2fa791bbd Always include the direct parent in the mentions 2015-12-07 23:35:33 +01:00
fabrixxm
29e9a7947e Update FRIENDICA_VERSION 2015-12-07 23:24:55 +01:00
fabrixxm
f359731fc1 Merge pull request #2159 from annando/1512-worker-processes
Better control for the number of workers
2015-12-07 23:20:02 +01:00
fabrixxm
e5a6d91cc4 Merge pull request #2158 from annando/1512-vier-fonts
Vier: The line-height seems to make problems with windows
2015-12-07 23:06:50 +01:00
Michael Vogel
88da58ed3e OStatus: Deactivated The resharing until it is tested completely. 2015-12-07 23:06:28 +01:00
gerhard6380
1d3b61c3b9 Update api.md
changed from api/users/group_* to api/friendica/group_*
2015-12-07 22:42:43 +01:00
root
e1c6d80c01 change api/user/group_* to api/friendica/group_* 2015-12-07 22:18:55 +01:00
gerhard6380
77f1357123 Update api.md
add documentation for new API calls for Managing groups
2015-12-07 22:07:20 +01:00
Michael Vogel
bfc0857953 OStatus: Send even Friendica comments to OStatus 2015-12-07 21:52:42 +01:00
Michael Vogel
1fb636ba1e Vier: The line-height seems to make problems with windows 2015-12-07 21:45:33 +01:00
Gerhard Seeber
8128a28a6c new API calls for managing contact groups 2015-12-07 19:38:11 +01:00
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