Commit Graph

11007 Commits

Author SHA1 Message Date
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 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
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
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
Michael Vogel e0b53aa0ac OStatus: Make sure that mentions are always accepted 2015-12-13 14:10:18 +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
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
Tobias Diekershoff 4a7d6eb13c resized icons to 16px 2015-12-13 08:09:53 +01:00
Michael Vogel 5a1041578c Bugfix: The subscribe process took the own contact by random ... 2015-12-12 17:55:57 +01:00
Michael Vogel ec9b1b7afd There is now a fragmentation level for the table optimisation 2015-12-12 17:46:24 +01:00
Michael Vogel 0869cce45f Code cleaning, real changes will follow 2015-12-12 17:41:25 +01:00
Tobias Diekershoff a7b37faafd added event icons from frost-mobile to frost 2015-12-12 06:23:54 +01:00
Tobias Diekershoff 3c55214f28 Merge pull request #2171 from rabuzarus/1212_directory_fix
fix directory search
2015-12-12 05:56:27 +01:00
rabuzarus f513b25f6f fix directory search 2015-12-12 01:27:31 +01:00
Tobias Diekershoff f479692966 Merge pull request #2170 from fabrixxm/issue_1953
missing frost-mobile event icons
2015-12-11 19:45:09 +01:00
fabrixxm 8d1af68f44 missing frost-mobile event icons 2015-12-11 19:38:00 +01:00
Michael Vogel 6bd23721c2 Merge pull request #2169 from tobiasd/20151211-FR
update to the French translation
2015-12-11 11:23:49 +01:00
Tobias Diekershoff f304ba74fb Merge pull request #2168 from annando/1512-contact-posts
Bugfix: Posts weren't always shown for feeds that start with "www."
2015-12-11 08:11:16 +01:00
Tobias Diekershoff 5f27f509cb Merge pull request #2167 from annando/1512-profile-aside
Sometimes there wasn't a linebreak before the address in the profile
2015-12-11 08:10:23 +01:00
Tobias Diekershoff 49b4be1670 regenerated credits.txt 2015-12-11 08:04:35 +01:00
Tobias Diekershoff 36769d77eb FR update to the strings THX Perig 2015-12-11 08:03:09 +01:00
Michael Vogel 300007a0cf Bugfix: Posts weren't always shown for feeds that start with "www." 2015-12-10 22:47:58 +01:00
Michael Vogel 138d745f5e Sometimes there wasn't a linebreak before the address in the profile 2015-12-10 21:39:44 +01:00
Michael Vogel e8b13bacec Merge pull request #2161 from ddorian1/release-3.4.3-rc
fix path for photo and proxy
2015-12-10 21:20:37 +01:00
Michael Vogel 1e0f26da8d Merge pull request #2166 from rabuzarus/1012_vier-forum
vier: fix little misspelling
2015-12-10 21:19:16 +01:00
rabuzarus 776cbe4a37 vier: fix little misspelling 2015-12-10 13:30:11 +01:00
fabrixxm 679ae1c035 Merge pull request #2164 from annando/1512-basepath-2
Avoid problems with wrong configured server variables
2015-12-09 19:17:48 +01:00
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 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
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 1fb636ba1e Vier: The line-height seems to make problems with windows 2015-12-07 21:45:33 +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