Commit graph

10300 commits

Author SHA1 Message Date
Michael Vogel c33957a6e9 Internationalisation of events/Move events to the navigation bar 2015-09-27 14:00:15 +02:00
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff c67fbc89c4 Merge pull request #1879 from annando/1509-fixing-ostatus
Improvements to OStatus subscriptions
2015-09-06 09:03:28 +02:00
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff dc4e42c98e Merge pull request #1876 from tobiasd/20150901-trans
DE, ES, IT: update to the translations
2015-09-01 15:13:41 +02:00
Tobias Diekershoff 4db21f85c4 DE, ES, IT: update to the translations 2015-09-01 15:12:09 +02:00
Tobias Diekershoff 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
Tobias Diekershoff d867f97dea #1873added new translateable strings so regenerating core messages.po 2015-09-01 07:10:29 +02:00
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 32c063b9a5 IT update to the translations 2015-08-31 19:02:12 +02:00
Tobias Diekershoff 3665ab3de0 FR update to the translations 2015-08-31 19:01:56 +02:00
Tobias Diekershoff fe5a5c72f5 ES update to the translations 2015-08-31 19:01:42 +02:00
Tobias Diekershoff af48217465 Merge pull request #1870 from annando/1508-soapbox
Soapbox-Improvements
2015-08-31 06:53:54 +02:00
Tobias Diekershoff 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
Tobias Diekershoff 3d614a0fcd Merge pull request #1869 from tobiasd/20150830-CS
CS update to the strings
2015-08-30 07:26:44 +02:00
Tobias Diekershoff 9aa1e22047 CS update to the strings 2015-08-30 07:24:39 +02:00
Tobias Diekershoff 2465d56b1a Merge pull request #1868 from annando/1508-rino
RINO: More logging and a bugfix
2015-08-29 20:53:08 +02:00
Michael Vogel 31fffcf281 Accidentally removed a file 2015-08-29 17:09:25 +02:00
Michael Vogel 3246352ba8 More detailled log entries 2015-08-29 16:55:25 +02:00
Michael Vogel 38c8431527 Rino Bugfix: A variable was used that never was fetched 2015-08-29 11:38:40 +02:00
Michael Vogel 82e682ef45 The click behaviour of the top menu bar is now changed completely 2015-08-29 10:14:41 +02:00
Michael Vogel e25457ab68 Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu 2015-08-28 14:16:52 +02:00
fabrixxm ba6741932a Merge pull request #1865 from annando/issue-1864
See issue 1864. Bugfix for the Oembed handling.
2015-08-28 11:45:40 +02:00
Michael Vogel 1dad181acb See issue 1864. Bugfix for the Oembed handling. 2015-08-28 11:39:52 +02:00
Michael Vogel 319df2ed66 The menu bar isn't clickable anymore 2015-08-28 11:36:43 +02:00
Tobias Diekershoff 50dce314b2 Merge pull request #1863 from tobiasd/20150826-lang
DE update to the strings
2015-08-27 09:51:39 +02:00