Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-09-27 02:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
16425 commits 2 branches 64 tags 236 MiB
Commit graph

16425 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
b1999459af Removed commented code 2016-11-16 06:29:30 +00:00
Michael
126c4774c3 Merge remote-tracking branch 'upstream/develop' into 1607-performance 
Conflicts:
	include/dbstructure.php
	mod/item.php
	mod/nodeinfo.php
 2016-11-16 06:27:21 +00: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
efa54d1509 close issue 1613 2016-11-15 10:04:15 +01: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
Tobias Diekershoff
78d8846fef new contributor 2016-11-15 08:33:47 +01:00
Tobias Diekershoff
05f71f4a70 addon stuff 2016-11-15 08:19:24 +01:00
Tobias Diekershoff
0dcc3c99a1 Diaspora communication 2016-11-15 08:19:24 +01:00
Tobias Diekershoff
80d2670650 issue closed 2016-11-15 08:19:24 +01:00
Tobias Diekershoff
dc313ebfd4 Friendica core received ES translations 2016-11-15 08:19:24 +01:00
Tobias Diekershoff
74912a3b24 double contributor name filtered out for the credits generator 2016-11-15 08:19:24 +01:00
Tobias Diekershoff
9ad2d61477 Vagrant settings adjustments, and release dates for Friendica sind 3.3 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
0210187ecf language selection works now, reflect it in the CHANGELOG 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
e95e304b57 updating the CHANGELOG 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
f30f335cb3 work on the calendar (typo) 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
56a114086e work on the calendar 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
77a26d3a1d new translator 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
114d686a2b improvements on the addons 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
c3bc061955 improvements to the workers 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
9c79d2b58a bug closed, new translator 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
4808425657 2816 is closed now 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
8f0531cb57 Mastodon is now supported 2016-11-15 08:19:23 +01:00
Tobias Diekershoff
fa77df0acc updating the CHANGELOG 2016-11-15 08:19:23 +01:00
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
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