Commit graph

13168 commits

Author SHA1 Message Date
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
Jens Tautenhahn
7b5c5c0fa2 count only version numbers starting with "numbers / dot or dash / numbers" in federation statistics 2016-11-09 21:48:36 +01:00
Jens Tautenhahn
12dd657868 fixes an sql error in NotificationsManager 2016-11-09 21:32:15 +01:00
Tobias Diekershoff
350887f892 prepare for Mastodon in the federation stats and include BlaBlaNet 2016-11-09 14:25:51 +01:00
rabuzarus
9fa0be784a Merge pull request #2898 from tobiasd/20161109-debbcide
DE translation of the BBCode reference, small stuff on the EN version
2016-11-09 14:24:35 +01:00
Tobias Diekershoff
fca72c4996 DE translation of the BBCode reference, small stuff on the EN version 2016-11-09 14:05:33 +01:00
Michael Vogel
d33eeee336 Merge pull request #2897 from rabuzarus/07.11-fix_login
ref_session_write: fix update for entry in the session table
2016-11-07 22:59:27 +01:00
rabuzarus
d025b83c93 ref_session_write: fix update for entry in the session table 2016-11-07 22:25:09 +01:00
Michael Vogel
c1581fd432 Merge pull request #2890 from Hypolite/improvement/misc-performance
Misc performance improvement
2016-11-06 22:38:56 +01:00
rabuzarus
747e53b37b Merge pull request #2891 from tobiasd/20161106-regenmsg
regenerated master messages.po file
2016-11-06 17:52:39 +01:00
Tobias Diekershoff
6472c7292f regenerated master messages.po file 2016-11-06 16:01:07 +01:00
Hypolite Petovan
67cdbe4538 misc performance: restore session write condition, keep 1 query 2016-11-06 01:00:17 -04:00
Hypolite Petovan
7b9470b804 misc performance: remove extraneous session write DB query 2016-11-06 00:52:31 -04:00
Hypolite Petovan
bae9f0852f misc performance: cache contact details by url during script 2016-11-06 00:51:23 -04:00
Tobias Diekershoff
27a2e44d89 Merge pull request #2888 from annando/1610-priority-dbclean
Improved priorities and some more dbclean queries
2016-11-05 08:27:02 +01:00
Tobias Diekershoff
ba1cd57087 Merge pull request #2887 from annando/1611-api-performance
API calls should be much faster than before
2016-11-05 08:25:09 +01:00
Michael
9518785c81 Merge branch '1610-priority-dbclean' of github.com:annando/friendica into 1610-priority-dbclean 2016-11-05 05:26:29 +00:00
Michael
4b33573c20 Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean 2016-11-05 05:25:22 +00:00
Michael Vogel
50651340ce Merge pull request #2886 from rabuzarus/0311_fix_photo_albums
cache: serialize the cache content directly in the cache class
2016-11-05 06:12:29 +01:00
rabuzarus
34596d448f Merge pull request #2889 from Hypolite/bug/wall-thread-error
[frio] Fix wall_thread.tpl error with unstareable items
2016-11-05 02:41:02 +01:00
Hypolite Petovan
98d52bc568 [frio] fix wall_thread.tpl error with unstareable items 2016-11-04 21:19:07 -04:00
Michael
c32b2463b9 Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean 2016-11-04 22:57:43 +00:00
Michael
37985a0d3f Use "micro" 2016-11-04 22:56:50 +00:00
Michael
fbfaef1968 API calls should be much faster than before 2016-11-04 22:45:20 +00:00
rabuzarus
e446e9571f some more coding style correction 2016-11-04 19:26:28 +01:00
Tobias Diekershoff
a6776f0cc1 Merge pull request #2885 from Hypolite/improvement/bbcode-documentation
bbcode documentation: minor style changes
2016-11-04 17:15:17 +01:00