Commit graph

13143 commits

Author SHA1 Message Date
Tobias Diekershoff
03943cb4c0 Merge pull request #2924 from rabuzarus/1611_fix_comment_edit
Frio Bugfix: clear float at the end of comment-edit
2016-11-16 14:32:05 +01:00
rabuzarus
02a0269a67 Frio Bugfix: clear float at the end of comment-edit 2016-11-16 14:19:09 +01:00
Tobias Diekershoff
1f9469b5e3 Merge pull request #2923 from rabuzarus/1611_fix_NotificationsManager_unseen
Bugfix: avatar images for activty like was not shown on notifications page
2016-11-16 14:09:18 +01:00
rabuzarus
0f81411b26 Bugfix: avatar images for activty like was not shown notifications page 2016-11-16 13:21:13 +01:00
Michael Vogel
a63e060b51 Merge pull request #2921 from rabuzarus/1611_fix_NotificationsManager_unseen
Bugfix: seen status was not handled correcty on the notifications page
2016-11-16 07:02:06 +01:00
Michael Vogel
cffdca2b1a Merge pull request #2920 from rabuzarus/1611_fix_remove_baseurl
Bugfix: "remove_baseurl" wasn't work correct if called statically
2016-11-16 06:57:28 +01:00
rabuzarus
e4a625ad12 Bugfix: seen status was not handled correcty on the notifications page 2016-11-16 04:57:55 +01:00
rabuzarus
262a149cab Bugfix: "remove_baseurl" wasn't work correct if called statically 2016-11-16 01:14:14 +01:00
rabuzarus
7729e6cfb4 Merge pull request #2919 from annando/1611-ssl-plink
Bugfix: "remove_baseurl" accidentally normalized all links
2016-11-16 00:33:39 +01:00
Michael
740aaa69f5 Bugfix: "remove_baseurl" accidentally normalized all links 2016-11-15 21:56:28 +00:00
fabrixxm
4eccdd7251 Merge pull request #2917 from annando/issue-2914
Bugfix: Avoid warning when posting items and the worker isn't active
2016-11-15 14:14:00 +01:00
Michael
85875fc07f Bugfix: Avoid warning when posting items and the worker isn't active 2016-11-15 11:52:01 +00:00
Tobias Diekershoff
b628e82465 Merge pull request #2910 from annando/1611-slinky
Several shorteners doesn't work anymore
2016-11-15 09:53:38 +01:00
Tobias Diekershoff
44d79cbc27 Merge pull request #2911 from annando/1611-well-formatted-uri
URI of "remote self" are looking better now.
2016-11-15 09:53:14 +01:00
Michael
d4e3bc1924 Added documentation 2016-11-15 07:05:43 +00:00
Tobias Diekershoff
2ecf2723c8 Merge pull request #2913 from rabuzarus/1411_fix_photo_permissions
fix photos page permissions
2016-11-14 20:22:48 +01:00
rabuzarus
9878974e1f fix photos page permissions 2016-11-14 18:49:51 +01:00
Michael Vogel
b7dbecd5e3 Merge pull request #2912 from sesom42/develop
fixes an sql syntax error in NotificationsManager
2016-11-14 10:37:22 +01:00
Jens Tautenhahn
31ad26aae2 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-14 09:52:01 +01:00
Jens Tautenhahn
d92c9a444f Revert "count only version numbers starting with "numbers / dot or dash / numbers" in federation statistics"
This reverts commit 7b5c5c0fa2.
2016-11-14 09:48:19 +01:00
Michael
88d073f3d9 URI of "remote self" are looking better now. 2016-11-14 06:55:17 +00:00
Michael
5ef688f1d2 Case correction 2016-11-14 05:44:18 +00:00
Tobias Diekershoff
717997b14f Merge pull request #2906 from annando/1611-parseurl
Improvements to page_info (bad ssl, bad formatted url)
2016-11-14 06:41:04 +01:00
Michael
3de7b6d6ce Several shorteners doesn't work anymore 2016-11-13 19:19:35 +00:00
Michael
1aa9b7242d Merge remote-tracking branch 'upstream/develop' into 1611-parseurl 2016-11-13 19:12:11 +00:00
Michael
6dfaa5a95f Some more standard stuff 2016-11-13 19:09:47 +00:00
rabuzarus
fa7f0cac71 Merge pull request #2909 from annando/1611-diaspora-location
Bugfix: Locations without coordinates aren't good for Diaspora
2016-11-13 19:50:51 +01:00
Michael
e925c4139c Some documentation 2016-11-13 18:28:55 +00:00
Michael Vogel
fe46533e3f Merge pull request #2908 from tobiasd/20161113-de
DE translation of the core THX Andreas
2016-11-13 19:16:30 +01:00
Michael
26936755d9 Bugfix: Locations without coordinates aren't good for Diaspora 2016-11-13 17:42:26 +00:00
Tobias Diekershoff
deaf82cfd0 DE translation of the core THX Andreas 2016-11-13 11:23:19 +01:00
Michael
2937df21ad Standard stuff 2016-11-13 08:50:01 +00:00
Michael Vogel
ce96624452 Merge pull request #2899 from tobiasd/20161109-stats
prepare for Mastodon in the federation stats and include BlaBlaNet
2016-11-13 09:42:42 +01:00
Tobias Diekershoff
df3c776e1b shorter foreach loop 2016-11-13 09:03:22 +01:00
Tobias Diekershoff
772d33342c add unkown to empty version strings 2016-11-13 08:12:09 +01:00
Tobias Diekershoff
32b2d9952b some platforms don't provide version information 2016-11-13 07:03:38 +01:00
Michael
e5f55a5919 Improved handling with wrong formatted urls and fetchinfo 2016-11-12 20:23:00 +00:00
Tobias Diekershoff
724f9c80e7 Merge pull request #2905 from annando/1611-performance-again
Performance improvements when storing items (via API)
2016-11-12 19:06:36 +01:00
Michael
d24e3a6a92 Removed "&" 2016-11-12 17:20:26 +00:00
Michael
e6148f4c1c Performance improvements when storing items (via API) 2016-11-12 13:17:28 +00:00
Tobias Diekershoff
8f6e9fa65e Merge pull request #2902 from tobiasd/20161110-lng
ES and DE translations of friendica core
2016-11-12 12:36:04 +01:00
Tobias Diekershoff
d0488f25be Merge pull request #2904 from silke/vagrant
For Vagrant dev machine
2016-11-12 12:34:57 +01:00
Silke Meyer
09c2e1c0a1 Increased memory of vagrant machine to 1024 MB 2016-11-12 10:16:56 +01:00
Silke Meyer
7886de5c39 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2016-11-12 10:05:46 +01:00
rabuzarus
74ca1faa32 Merge pull request #2903 from tobiasd/20161110-messagespo
regenerated master messages.po file
2016-11-10 15:51:16 +01:00
Tobias Diekershoff
0e1b13f3dd regenerated master messages.po file 2016-11-10 15:43:47 +01:00
fabrixxm
e13b822e1e Merge pull request #2901 from tobiasd/20161110-helptxt
help text for settings should be translateable
2016-11-10 15:27:23 +01:00
Tobias Diekershoff
6657302602 DE translation of the core 2016-11-10 10:28:20 +01:00
Tobias Diekershoff
af214e317d ES translation of the core THX Alberto Díaz Tormo! 2016-11-10 10:27:58 +01:00
Tobias Diekershoff
f9911637e3 help text for settings should be translateable 2016-11-10 10:21:24 +01:00