11159 Commits (5ab2786c00b84b3546d6c6c820c0f278baf6fb33)

Author SHA1 Message Date
  Fabrixxm abe0d22784 Update codename 6 years ago
  Michael Vogel 307beb47fd Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment 6 years ago
  Fabrixxm 71255d04a2 Friendica 3.5-dev 6 years ago
  Fabrixxm 7f76c3dd41 Merge branch 'master' into develop 6 years ago
  Fabrixxm 21f044e305 Friendica 3.4.3 6 years ago
  Fabrixxm c007722041 Merge branch 'release-3.4.3-rc' 6 years ago
  Michael Vogel 989d949bd0 Merge pull request #2193 from fabrixxm/changelog 6 years ago
  Fabrixxm 156be7a17b Update CHANGELOG 6 years ago
  Michael Vogel 1b0b4d8c57 Merge pull request #2195 from fabrixxm/last-minute 6 years ago
  Fabrixxm 770bba021e call resizeIframe() function until size is stable 6 years ago
  Fabrixxm d4dd863b4b quattro: style managed unread notification 6 years ago
  Fabrixxm bb7330cf2e Update CHANGELOG 6 years ago
  Tobias Diekershoff 7faa88613d Merge pull request #2192 from fabrixxm/quattro-message-aside 6 years ago
  Fabrixxm b79d98aea5 quattro: fix PM aside template 6 years ago
  Michael Vogel 185f03f12c Merge pull request #2191 from tobiasd/20151217-fr 6 years ago
  Michael Vogel 7ee1eb2978 Code clean up. 6 years ago
  Tobias Diekershoff 719989249f FR: update to the translation 6 years ago
  Michael Vogel ca4be3ded3 Don't generate a guid shorter than 13 characters 6 years ago
  Tobias Diekershoff 8944ad1ac1 Merge pull request #2190 from annando/1512-getload 6 years ago
  Michael Vogel 33f354a68c Bugfix for the maximum load check in worker. 6 years ago
  Michael Vogel 6e03477598 Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround. 6 years ago
  Michael Vogel f19d9aa430 Merge pull request #2189 from rabuzarus/1512_vier_images 6 years ago
  rabuzarus 19a72b30b4 vier: fix missing icons 6 years ago
  Michael Vogel 8972c8c219 Merge pull request #2188 from rabuzarus/1512_allfriends_pager 6 years ago
  rabuzarus 2cf1aaa791 add pager to common friends and allfriends 6 years ago
  Tobias Diekershoff 791d152b8f Merge pull request #2186 from annando/1512-profile-bbcode 6 years ago
  Michael Vogel dff9f623b7 Merge pull request #2157 from gerhard6380/patch-1 6 years ago
  Michael Vogel f42a7a3469 Just one more place where we had forgotten to use the bbcode function for the about text 6 years ago
  Michael Vogel d077dbbcde Bugfix: The bbcode conversion of the profile was inconsistent 6 years ago
  Michael Vogel 2e0ebcd1c8 The "about" in feed has to be rendered as HTML 6 years ago
  gerhard6380 d02bd08bde Update api.md 6 years ago
  Michael Vogel b9abfd24f0 Rearrangements 6 years ago
  fabrixxm ca201476b6 Merge pull request #2185 from tobiasd/20151214-translations 6 years ago
  Tobias Diekershoff 9640eb7c81 IT update to the strings 6 years ago
  Tobias Diekershoff 053b69eee4 FR update to the strings 6 years ago
  Tobias Diekershoff e97a6dfb77 DE update to the strings 6 years ago
  fabrixxm 7a5ac4490d Merge pull request #2183 from rabuzarus/1412_profile_addr_fix 6 years ago
  rabuzarus e61d6e030e fix account_type 6 years ago
  fabrixxm 9bd5be66d3 Merge pull request #2179 from tobiasd/20151214-messages 6 years ago
  Tobias Diekershoff 616477d6a3 Merge pull request #2178 from annando/1512-slapper-400 6 years ago
  Tobias Diekershoff c8b6c3bedf regenerated messages.po file, excluding addons-extra stuff 6 years ago
  Tobias Diekershoff 448be5cfbd exclude addons-extra directory from the translation as well 6 years ago
  Michael Vogel bc8f753900 Only optical stuff 6 years ago
  Michael Vogel a1a7bce603 Completely reworked delivery process. 6 years ago
  Michael Vogel e0b53aa0ac OStatus: Make sure that mentions are always accepted 6 years ago
  Michael Vogel 15063c8d5b Code cleanup and first steps for a better comment distribition with DFRN and OStatus 6 years ago
  Michael Vogel 169088b243 Maybe this solves the slapper problems ... 6 years ago
  Tobias Diekershoff b0f55ca9f2 Merge pull request #2176 from annando/1512-warning 6 years ago
  Michael Vogel 143e1a4a83 Bugfix: Warning because of undefined constant 6 years ago
  fabrixxm 5b5b942325 Merge pull request #2172 from tobiasd/20151212-frosticons 6 years ago