1
0
Fork 0
Commit graph

10310 commits

Author SHA1 Message Date
26a2d49d98 Merge pull request #1891 from tobiasd/20150917-de
DE update to the strings
2015-09-17 14:25:34 +02:00
dbc9d87156 DE update to the strings 2015-09-17 14:24:07 +02:00
bca4d31410 Merge pull request #1890 from annando/1509-directory
There is now only one central parameter for the global directory.
2015-09-15 22:48:34 +02:00
Michael Vogel
5ac38b7f99 There is now only one central parameter for the global directory. 2015-09-15 22:29:02 +02:00
7a432a6739 Merge pull request #1889 from annando/1509-diaspora-images
Bugfix: Picture import from Diaspora often failed
2015-09-15 06:21:19 +02:00
Michael Vogel
345b0d81dd Picture import from Diaspora often failed 2015-09-14 23:14:21 +02:00
89c38cccd1 Merge pull request #1887 from annando/issue-1886
Issue 1886: Some speedup for poco
2015-09-11 20:58:41 +02:00
Michael Vogel
91d5c31656 Issue 1886: Some speedup for poco 2015-09-11 20:46:55 +02:00
6b744aa71c Merge pull request #1883 from annando/1509-addon-remote-self
Bugfix: "remote self" items weren't posted by connectors
2015-09-08 06:47:27 +02:00
Michael Vogel
f2cb9b889e Only set a prefix for the guid if it is a locally stored item 2015-09-07 23:33:02 +02:00
Michael Vogel
6088f59c33 Bugfix: "remote self" items weren't posted by connectors 2015-09-07 23:14:18 +02:00
1c19bcd322 Merge pull request #1882 from annando/1509-poco-federation
Include the server list from the-federation.info
2015-09-06 13:48:59 +02:00
Michael Vogel
92a15d9178 Include the server list from the-federation.info 2015-09-06 12:20:31 +02:00
c9faec49c1 Merge pull request #1881 from annando/1509-diaspora-import
Diaspora: Improved duplicate check, check if post should be imported
2015-09-06 10:21:28 +02:00
Michael Vogel
d20dbedddd Merge remote-tracking branch 'upstream/develop' into 1509-diaspora-import 2015-09-06 09:15:23 +02:00
c67fbc89c4 Merge pull request #1879 from annando/1509-fixing-ostatus
Improvements to OStatus subscriptions
2015-09-06 09:03:28 +02:00
8504cf4f05 Merge pull request #1880 from annando/1509-performance
Some settings to control the system load
2015-09-06 09:02:27 +02:00
Michael Vogel
f918109351 We forgot to include the title ... 2015-09-06 08:18:55 +02:00
Michael Vogel
c555b1b5cb Only look for the GUID when checking for duplicates. 2015-09-06 07:34:51 +02:00
Michael Vogel
988f32dfc8 Rearranged the dispatcher 2015-09-05 13:26:14 +02:00
Michael Vogel
6aac9dfc9c Merge branch '1509-diaspora-import' of github.com:annando/friendica into 1509-diaspora-import 2015-09-05 12:13:38 +02:00
Michael Vogel
4b858650ce Check if the author should be ignored when fetching missing posts 2015-09-05 12:11:14 +02:00
Michael Vogel
c6d9b2da23 New setting for requery days 2015-09-05 10:54:39 +02:00
Michael Vogel
cecbc58729 Mass-subscribing to OStatus contacts is enabled again 2015-09-05 10:32:10 +02:00
7dbd8ed473 Merge pull request #1878 from annando/1509-nodeinfo
The links for nodeinfo in "well-known" need to be an array of objects.
2015-09-05 07:39:49 +02:00
Michael Vogel
3cccb5ecb1 The repair option is added to the settings 2015-09-05 04:54:48 +02:00
Michael Vogel
30e7ce2e2a The links for nodeinfo in "well-known" need to be an array of objects. 2015-09-05 04:33:18 +02:00
Michael Vogel
d9f23dbb20 New switch that restricts the search only for registered users 2015-09-05 04:29:37 +02:00
Michael Vogel
635e92249a Bugfix: The first contact was never repaired 2015-09-03 22:24:57 +02:00
Michael Vogel
fd239ebf7b Try to repair OStatus subscriptions 2015-09-03 22:18:25 +02:00
Michael Vogel
94dcccd1b9 Increase the discover timeframe 2015-09-03 22:16:29 +02:00
dc4e42c98e Merge pull request #1876 from tobiasd/20150901-trans
DE, ES, IT: update to the translations
2015-09-01 15:13:41 +02:00
4db21f85c4 DE, ES, IT: update to the translations 2015-09-01 15:12:09 +02:00
ffc9f94149 Merge pull request #1875 from tobiasd/20150901-messagespo
#1873 added new translateable strings so regenerating core messages.po
2015-09-01 07:12:09 +02:00
d867f97dea #1873added new translateable strings so regenerating core messages.po 2015-09-01 07:10:29 +02:00
658c99dcf3 Merge pull request #1874 from annando/1509-pubsub
Bugfix: pubsub tend to unsubscribe subscriptions in the past
2015-09-01 07:07:22 +02:00
bc92b922b4 Merge pull request #1873 from annando/1508-admin-settings
Some admin settings hadn't been made translatable.
2015-09-01 07:06:34 +02:00
Michael Vogel
389738b1c1 Bugfix: pubsub tend to unsubscribe subscriptions in the past 2015-09-01 00:12:15 +02:00
Michael Vogel
4d4ad0f2e7 Merge pull request #1872 from tobiasd/20150831-lang
update to the translation ES, FR, IT
2015-08-31 20:10:40 +02:00
Michael Vogel
3614df650f Some admin settings hadn't been made translatable. 2015-08-31 19:32:01 +02:00
32c063b9a5 IT update to the translations 2015-08-31 19:02:12 +02:00
3665ab3de0 FR update to the translations 2015-08-31 19:01:56 +02:00
fe5a5c72f5 ES update to the translations 2015-08-31 19:01:42 +02:00
af48217465 Merge pull request #1870 from annando/1508-soapbox
Soapbox-Improvements
2015-08-31 06:53:54 +02:00
daf27055b9 Merge pull request #1867 from annando/1508-vier-popup-menu
Vier: The popup menus now popup automatically
2015-08-31 06:53:20 +02:00
Michael Vogel
56ae056f1d The "manage" option list is now larger. 2015-08-30 22:45:48 +02:00
Michael Vogel
d1e3ea7b46 Soapbox-Improvements 2015-08-30 19:07:30 +02:00
Michael Vogel
cc3419f101 Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu
Conflicts:
	mod/dfrn_notify.php
2015-08-30 10:44:29 +02:00
3d614a0fcd Merge pull request #1869 from tobiasd/20150830-CS
CS update to the strings
2015-08-30 07:26:44 +02:00
9aa1e22047 CS update to the strings 2015-08-30 07:24:39 +02:00