keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13132 commits 4 branches 0 tags 179 MiB
Commit graph

13132 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
8d7548b013 updating the CHANGELOG 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
87def163c7 updating the CHANGELOG 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
7311094730 updating the CHANGELOG 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
eda54ba49b updating the CHANGELOG with DFRN and API things 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
d44627fb50 DE translations for the addons added to the CHANGELOG 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
dc28011ff0 Issues 2791 and 2792 into the CHANGELOG 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
ca55b048ac updateing chredits and CHANGELOG 2016-11-15 08:19:22 +01: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
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
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
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