Commit graph

11155 commits

Author SHA1 Message Date
Fabrixxm
21f044e305 Friendica 3.4.3 2015-12-22 10:45:43 +01:00
Fabrixxm
c007722041 Merge branch 'release-3.4.3-rc' 2015-12-22 10:43:57 +01:00
Michael Vogel
989d949bd0 Merge pull request #2193 from fabrixxm/changelog
Update CHANGELOG
2015-12-22 09:52:12 +01:00
Fabrixxm
156be7a17b Update CHANGELOG 2015-12-22 09:08:53 +01:00
Michael Vogel
1b0b4d8c57 Merge pull request #2195 from fabrixxm/last-minute
Last minute
2015-12-21 22:50:51 +01:00
Fabrixxm
770bba021e call resizeIframe() function until size is stable
(iframe content finished to load, hopefully)
should remove scrollbars on rich oembeds
2015-12-21 16:41:55 +01:00
Fabrixxm
d4dd863b4b quattro: style managed unread notification 2015-12-21 16:19:56 +01:00
Fabrixxm
bb7330cf2e Update CHANGELOG 2015-12-21 15:51:21 +01:00
Tobias Diekershoff
7faa88613d Merge pull request #2192 from fabrixxm/quattro-message-aside
quattro: fix PM aside template
2015-12-21 09:57:17 +01:00
Fabrixxm
b79d98aea5 quattro: fix PM aside template
errors was raised with new "show message list in aside" patch
2015-12-21 09:43:10 +01:00
Michael Vogel
185f03f12c Merge pull request #2191 from tobiasd/20151217-fr
FR: update to the translation
2015-12-20 22:17:26 +01:00
Michael Vogel
7ee1eb2978 Code clean up. 2015-12-20 10:44:03 +01:00
Tobias Diekershoff
719989249f FR: update to the translation 2015-12-17 08:27:02 +01:00
Michael Vogel
ca4be3ded3 Don't generate a guid shorter than 13 characters 2015-12-16 10:47:26 +01:00
Tobias Diekershoff
8944ad1ac1 Merge pull request #2190 from annando/1512-getload
Sometimes the function "sys_getloadavg" doesn't return an array.
2015-12-16 06:21:17 +01:00
Michael Vogel
33f354a68c Bugfix for the maximum load check in worker. 2015-12-16 00:14:53 +01:00
Michael Vogel
6e03477598 Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround. 2015-12-15 23:26:58 +01:00
Michael Vogel
f19d9aa430 Merge pull request #2189 from rabuzarus/1512_vier_images
vier: fix missing icons
2015-12-15 15:47:09 +01:00
rabuzarus
19a72b30b4 vier: fix missing icons 2015-12-15 15:13:46 +01:00
Michael Vogel
8972c8c219 Merge pull request #2188 from rabuzarus/1512_allfriends_pager
add pager to common friends and allfriends
2015-12-15 14:53:06 +01:00
rabuzarus
2cf1aaa791 add pager to common friends and allfriends 2015-12-15 14:31:24 +01:00
Tobias Diekershoff
791d152b8f Merge pull request #2186 from annando/1512-profile-bbcode
Bugfix: The bbcode conversion of the profile was inconsistent
2015-12-15 08:09:41 +01:00
Michael Vogel
dff9f623b7 Merge pull request #2157 from gerhard6380/patch-1
Update api.md
2015-12-15 00:16:40 +01:00
Michael Vogel
f42a7a3469 Just one more place where we had forgotten to use the bbcode function for the about text 2015-12-15 00:11:19 +01:00
Michael Vogel
d077dbbcde Bugfix: The bbcode conversion of the profile was inconsistent 2015-12-14 23:53:35 +01:00
Michael Vogel
2e0ebcd1c8 The "about" in feed has to be rendered as HTML 2015-12-14 23:02:49 +01:00
gerhard6380
d02bd08bde Update api.md 2015-12-14 22:53:12 +01:00
Michael Vogel
b9abfd24f0 Rearrangements 2015-12-14 22:39:52 +01:00
fabrixxm
ca201476b6 Merge pull request #2185 from tobiasd/20151214-translations
update to translation for DE, FR; IT
2015-12-14 17:04:02 +01:00
Tobias Diekershoff
9640eb7c81 IT update to the strings 2015-12-14 16:56:40 +01:00
Tobias Diekershoff
053b69eee4 FR update to the strings 2015-12-14 16:30:28 +01:00
Tobias Diekershoff
e97a6dfb77 DE update to the strings 2015-12-14 16:27:00 +01:00
fabrixxm
7a5ac4490d Merge pull request #2183 from rabuzarus/1412_profile_addr_fix
fix displaying forum in hcard
2015-12-14 15:21:14 +01:00
rabuzarus
e61d6e030e fix account_type 2015-12-14 14:12:56 +01:00
fabrixxm
9bd5be66d3 Merge pull request #2179 from tobiasd/20151214-messages
regenerated messages.po and small changes to run_xgettext
2015-12-14 08:30:10 +01:00
Tobias Diekershoff
616477d6a3 Merge pull request #2178 from annando/1512-slapper-400
OStatus: Make sure that mentions are always accepted
2015-12-14 07:57:44 +01:00
Tobias Diekershoff
c8b6c3bedf regenerated messages.po file, excluding addons-extra stuff 2015-12-14 07:51:27 +01:00
Tobias Diekershoff
448be5cfbd exclude addons-extra directory from the translation as well 2015-12-14 07:51:11 +01:00
Michael Vogel
bc8f753900 Only optical stuff 2015-12-14 00:42:36 +01:00
Michael Vogel
a1a7bce603 Completely reworked delivery process. 2015-12-14 00:39:20 +01:00
Michael Vogel
e0b53aa0ac OStatus: Make sure that mentions are always accepted 2015-12-13 14:10:18 +01:00
Michael Vogel
15063c8d5b Code cleanup and first steps for a better comment distribition with DFRN and OStatus 2015-12-13 12:15:45 +01:00
Michael Vogel
169088b243 Maybe this solves the slapper problems ... 2015-12-13 12:12:32 +01:00
Tobias Diekershoff
b0f55ca9f2 Merge pull request #2176 from annando/1512-warning
Bugfix: Notice because of undefined constant
2015-12-13 10:22:13 +01:00
Michael Vogel
143e1a4a83 Bugfix: Warning because of undefined constant 2015-12-13 09:43:47 +01:00
fabrixxm
5b5b942325 Merge pull request #2172 from tobiasd/20151212-frosticons
added event icons from frost-mobile to frost
2015-12-13 09:21:03 +01:00
fabrixxm
f09f07c74a Merge pull request #2175 from tobiasd/20151213-message
regenerated messages.po
2015-12-13 09:20:03 +01:00
Tobias Diekershoff
fb66f27e8f regenerated messages.po 2015-12-13 08:55:17 +01:00
Tobias Diekershoff
c0c0d62a2e Merge pull request #2173 from annando/1512-optimize-fragmentation
There is now a fragmentation level for the table optimization
2015-12-13 08:32:03 +01:00
Tobias Diekershoff
224ff8c132 Merge pull request #2174 from annando/1512-ostatus-subscribe
Bugfix: OStatus subscription worked by random until now ...
2015-12-13 08:30:43 +01:00