Commit Graph

  • b79d98aea5 quattro: fix PM aside template Fabrixxm 2015-12-21 09:43:10 +01:00
  • 185f03f12c Merge pull request #2191 from tobiasd/20151217-fr Michael Vogel 2015-12-20 22:17:26 +01:00
  • 7ee1eb2978 Code clean up. Michael Vogel 2015-12-20 10:44:03 +01:00
  • af587edaa7 Merge pull request #1 from friendica/develop rebeka-catalina 2015-12-19 14:28:28 +01:00
  • 719989249f FR: update to the translation Tobias Diekershoff 2015-12-17 08:27:02 +01:00
  • ca4be3ded3 Don't generate a guid shorter than 13 characters Michael Vogel 2015-12-16 10:47:26 +01:00
  • 8944ad1ac1 Merge pull request #2190 from annando/1512-getload Tobias Diekershoff 2015-12-16 06:21:17 +01:00
  • 33f354a68c Bugfix for the maximum load check in worker. Michael Vogel 2015-12-16 00:14:53 +01:00
  • 6e03477598 Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround. Michael Vogel 2015-12-15 23:26:58 +01:00
  • f19d9aa430 Merge pull request #2189 from rabuzarus/1512_vier_images Michael Vogel 2015-12-15 15:47:09 +01:00
  • 19a72b30b4 vier: fix missing icons rabuzarus 2015-12-15 15:13:46 +01:00
  • 8972c8c219 Merge pull request #2188 from rabuzarus/1512_allfriends_pager Michael Vogel 2015-12-15 14:53:06 +01:00
  • 2cf1aaa791 add pager to common friends and allfriends rabuzarus 2015-12-15 14:31:24 +01:00
  • 791d152b8f Merge pull request #2186 from annando/1512-profile-bbcode Tobias Diekershoff 2015-12-15 08:09:41 +01:00
  • dff9f623b7 Merge pull request #2157 from gerhard6380/patch-1 Michael Vogel 2015-12-15 00:16:40 +01:00
  • f42a7a3469 Just one more place where we had forgotten to use the bbcode function for the about text Michael Vogel 2015-12-15 00:11:19 +01:00
  • d077dbbcde Bugfix: The bbcode conversion of the profile was inconsistent Michael Vogel 2015-12-14 23:53:35 +01:00
  • 2e0ebcd1c8 The "about" in feed has to be rendered as HTML Michael Vogel 2015-12-14 23:02:49 +01:00
  • d02bd08bde Update api.md gerhard6380 2015-12-14 22:53:12 +01:00
  • b9abfd24f0 Rearrangements Michael Vogel 2015-12-14 22:39:52 +01:00
  • ca201476b6 Merge pull request #2185 from tobiasd/20151214-translations fabrixxm 2015-12-14 17:04:02 +01:00
  • 9640eb7c81 IT update to the strings Tobias Diekershoff 2015-12-14 16:56:40 +01:00
  • 053b69eee4 FR update to the strings Tobias Diekershoff 2015-12-14 16:30:28 +01:00
  • e97a6dfb77 DE update to the strings Tobias Diekershoff 2015-12-14 16:27:00 +01:00
  • 7a5ac4490d Merge pull request #2183 from rabuzarus/1412_profile_addr_fix fabrixxm 2015-12-14 15:21:14 +01:00
  • e61d6e030e fix account_type rabuzarus 2015-12-14 14:12:56 +01:00
  • 9bd5be66d3 Merge pull request #2179 from tobiasd/20151214-messages fabrixxm 2015-12-14 08:30:10 +01:00
  • 616477d6a3 Merge pull request #2178 from annando/1512-slapper-400 Tobias Diekershoff 2015-12-14 07:57:44 +01:00
  • c8b6c3bedf regenerated messages.po file, excluding addons-extra stuff Tobias Diekershoff 2015-12-14 07:51:27 +01:00
  • 448be5cfbd exclude addons-extra directory from the translation as well Tobias Diekershoff 2015-12-14 07:51:11 +01:00
  • bc8f753900 Only optical stuff Michael Vogel 2015-12-14 00:42:36 +01:00
  • a1a7bce603 Completely reworked delivery process. Michael Vogel 2015-12-14 00:39:20 +01:00
  • e0b53aa0ac OStatus: Make sure that mentions are always accepted Michael Vogel 2015-12-13 14:10:18 +01:00
  • 15063c8d5b Code cleanup and first steps for a better comment distribition with DFRN and OStatus Michael Vogel 2015-12-13 12:15:45 +01:00
  • 169088b243 Maybe this solves the slapper problems ... Michael Vogel 2015-12-13 12:12:32 +01:00
  • b0f55ca9f2 Merge pull request #2176 from annando/1512-warning Tobias Diekershoff 2015-12-13 10:22:13 +01:00
  • 143e1a4a83 Bugfix: Warning because of undefined constant Michael Vogel 2015-12-13 09:43:47 +01:00
  • 5b5b942325 Merge pull request #2172 from tobiasd/20151212-frosticons fabrixxm 2015-12-13 09:21:03 +01:00
  • f09f07c74a Merge pull request #2175 from tobiasd/20151213-message fabrixxm 2015-12-13 09:20:03 +01:00
  • fb66f27e8f regenerated messages.po Tobias Diekershoff 2015-12-13 08:55:17 +01:00
  • c0c0d62a2e Merge pull request #2173 from annando/1512-optimize-fragmentation Tobias Diekershoff 2015-12-13 08:32:03 +01:00
  • 224ff8c132 Merge pull request #2174 from annando/1512-ostatus-subscribe Tobias Diekershoff 2015-12-13 08:30:43 +01:00
  • 4a7d6eb13c resized icons to 16px Tobias Diekershoff 2015-12-13 08:09:53 +01:00
  • 5a1041578c Bugfix: The subscribe process took the own contact by random ... Michael Vogel 2015-12-12 17:55:57 +01:00
  • ec9b1b7afd There is now a fragmentation level for the table optimisation Michael Vogel 2015-12-12 17:46:24 +01:00
  • 0869cce45f Code cleaning, real changes will follow Michael Vogel 2015-12-12 17:41:25 +01:00
  • 02022b62a4 Some more work to make reshares work. Michael Vogel 2015-12-12 10:41:42 +01:00
  • a7b37faafd added event icons from frost-mobile to frost Tobias Diekershoff 2015-12-12 06:23:54 +01:00
  • 3c55214f28 Merge pull request #2171 from rabuzarus/1212_directory_fix Tobias Diekershoff 2015-12-12 05:56:27 +01:00
  • f513b25f6f fix directory search rabuzarus 2015-12-12 01:27:31 +01:00
  • f479692966 Merge pull request #2170 from fabrixxm/issue_1953 Tobias Diekershoff 2015-12-11 19:45:09 +01:00
  • 8d1af68f44 missing frost-mobile event icons fabrixxm 2015-12-11 19:38:00 +01:00
  • e44b831a21 Merge pull request #2156 from gerhard6380/develop fabrixxm 2015-12-11 12:37:26 +01:00
  • 6bd23721c2 Merge pull request #2169 from tobiasd/20151211-FR Michael Vogel 2015-12-11 11:23:49 +01:00
  • f304ba74fb Merge pull request #2168 from annando/1512-contact-posts Tobias Diekershoff 2015-12-11 08:11:16 +01:00
  • 5f27f509cb Merge pull request #2167 from annando/1512-profile-aside Tobias Diekershoff 2015-12-11 08:10:23 +01:00
  • 49b4be1670 regenerated credits.txt Tobias Diekershoff 2015-12-11 08:04:35 +01:00
  • 36769d77eb FR update to the strings THX Perig Tobias Diekershoff 2015-12-11 08:03:09 +01:00
  • 300007a0cf Bugfix: Posts weren't always shown for feeds that start with "www." Michael Vogel 2015-12-10 22:47:58 +01:00
  • 138d745f5e Sometimes there wasn't a linebreak before the address in the profile Michael Vogel 2015-12-10 21:39:44 +01:00
  • e8b13bacec Merge pull request #2161 from ddorian1/release-3.4.3-rc Michael Vogel 2015-12-10 21:20:37 +01:00
  • 1e0f26da8d Merge pull request #2166 from rabuzarus/1012_vier-forum Michael Vogel 2015-12-10 21:19:16 +01:00
  • 6dd39760ac Support for real repeated messages Michael Vogel 2015-12-10 18:16:16 +01:00
  • 776cbe4a37 vier: fix little misspelling rabuzarus 2015-12-10 13:30:11 +01:00
  • 45f4af66e7 OStatus: Basic support for groups, new function to detect reshared items Michael Vogel 2015-12-10 01:10:54 +01:00
  • 679ae1c035 Merge pull request #2164 from annando/1512-basepath-2 fabrixxm 2015-12-09 19:17:48 +01:00
  • 3ac75eebbc Merge pull request #2163 from annando/1512-rendertime-css Tobias Diekershoff 2015-12-08 21:05:05 +01:00
  • 57576e09ed Avoid problems with wrong configured server variables Michael Vogel 2015-12-08 19:53:01 +01:00
  • 59b2bde9a7 Do a linebreak before the output of rendertime Michael Vogel 2015-12-08 19:41:27 +01:00
  • 2f866fecf9 fix path for photo and proxy Johannes Schwab 2015-12-08 00:10:12 +01:00
  • f97e20acd3 add support to schema modification with multi-column primary key fabrixxm 2015-12-08 10:35:08 +01:00
  • 5d04818df7 Merge pull request #2162 from annando/1512-basepath fabrixxm 2015-12-08 09:08:48 +01:00
  • d7fc8d7c12 Add an additional way to fetch the basepath (See pull request 2161) Michael Vogel 2015-12-08 08:17:29 +01:00
  • a2fa791bbd Always include the direct parent in the mentions Michael Vogel 2015-12-07 23:35:33 +01:00
  • 29e9a7947e Update FRIENDICA_VERSION fabrixxm 2015-12-07 23:24:55 +01:00
  • f359731fc1 Merge pull request #2159 from annando/1512-worker-processes fabrixxm 2015-12-07 23:20:02 +01:00
  • e5a6d91cc4 Merge pull request #2158 from annando/1512-vier-fonts fabrixxm 2015-12-07 23:06:50 +01:00
  • 88da58ed3e OStatus: Deactivated The resharing until it is tested completely. Michael Vogel 2015-12-07 23:06:28 +01:00
  • 1d3b61c3b9 Update api.md gerhard6380 2015-12-07 22:42:43 +01:00
  • e1c6d80c01 change api/user/group_* to api/friendica/group_* root 2015-12-07 22:18:55 +01:00
  • 77f1357123 Update api.md gerhard6380 2015-12-07 22:07:20 +01:00
  • bfc0857953 OStatus: Send even Friendica comments to OStatus Michael Vogel 2015-12-07 21:52:42 +01:00
  • 1fb636ba1e Vier: The line-height seems to make problems with windows Michael Vogel 2015-12-07 21:45:33 +01:00
  • 8128a28a6c new API calls for managing contact groups Gerhard Seeber 2015-12-07 19:37:14 +01:00
  • d944b65253 Merge pull request #2151 from annando/1512-misconfigured-friendica Tobias Diekershoff 2015-12-07 06:37:37 +01:00
  • bd8b5ad881 Merge pull request #2153 from annando/issue-1924 Tobias Diekershoff 2015-12-07 06:32:01 +01:00
  • 6fb5e0a15d Merge pull request #2152 from annando/bugfix-socgraph Tobias Diekershoff 2015-12-07 06:29:38 +01:00
  • bcf7e673c9 Issue 1924: New configuration value for permitting crawler access Michael Vogel 2015-12-06 22:01:20 +01:00
  • 6b0b9481cb Bugfix for pull request #2147 (Fix for issue #2122) Michael Vogel 2015-12-06 20:05:57 +01:00
  • fbbba6828b Some better logging Michael Vogel 2015-12-06 20:04:33 +01:00
  • d06717798b Code beautification Michael Vogel 2015-12-06 18:57:23 +01:00
  • f880bdd33b Workaround for misconfigured Friendica servers Michael Vogel 2015-12-06 18:52:19 +01:00
  • 9f8da37c99 Move the process check at the beginning of the script Michael Vogel 2015-12-06 16:40:31 +01:00
  • 54085508e5 Double check for maximum number of workers Michael Vogel 2015-12-06 16:28:28 +01:00
  • 2dc0b2b731 Merge pull request #2150 from annando/1512-probe-url-caching Tobias Diekershoff 2015-12-06 12:22:43 +01:00
  • 7c7baa77d6 probe_url: Only cache successful results Michael Vogel 2015-12-06 12:15:31 +01:00
  • 6a05112d98 Merge pull request #2149 from annando/issue-1921 Tobias Diekershoff 2015-12-06 07:31:13 +01:00
  • 4680d10559 Merge pull request #2148 from annando/issue-1871 Tobias Diekershoff 2015-12-06 06:43:30 +01:00
  • 48b3d04d81 Merge pull request #2147 from annando/issue-2122 Tobias Diekershoff 2015-12-06 06:42:45 +01:00
  • f406e5ddbd Issue 1921: Disable the auto update Michael Vogel 2015-12-06 00:18:59 +01:00