Commit graph

16195 commits

Author SHA1 Message Date
Tobias Diekershoff edb16f8dc8 Merge pull request #3803 from annando/conversation-feed
we now provide a feed for the conversation
2017-10-18 08:29:47 +02:00
Michael 4744d6bf84 we now provide a feed for the conversation 2017-10-18 06:25:22 +00:00
Tobias Diekershoff e555a55be3 Merge pull request #3802 from annando/issue-3801
Issue 3801: Personal notes hadn't been displayed
2017-10-18 08:22:35 +02:00
Michael d675c84051 Issue 3801: Personal notes hadn't been displayed 2017-10-18 04:55:03 +00:00
Michael Vogel e4a2430967 Merge pull request #3799 from tobiasd/20171017-doc
also mention Transifex as tool to use near the translation example
2017-10-17 22:56:44 +02:00
Tobias Diekershoff 55e2f49268 also mention Transifex as tool to use near the translation example 2017-10-17 22:48:33 +02:00
Tobias Diekershoff b06c4ab84c Merge pull request #3798 from annando/feed-information
Enhance feed information for "fetch further information"
2017-10-17 22:36:50 +02:00
Michael e38da9a3a5 And some further refinements 2017-10-17 11:39:09 +00:00
Michael 9c5cd476dd Better rule to replace content 2017-10-17 09:58:29 +00:00
Michael 7c658439da Removed unneeded stuff 2017-10-17 09:14:10 +00:00
Michael aa284a2ae6 Enhance feed information 2017-10-17 09:10:19 +00:00
Tobias Diekershoff ae1afebe26 Merge pull request #3796 from annando/ostatus-forum
OStatus: Auto subscribe to forum accounts
2017-10-17 08:30:05 +02:00
Michael 5498f04ffa OStatus: Auto subscribe to forum accounts 2017-10-17 04:45:38 +00:00
Hypolite Petovan 6640e6ceef Merge pull request #3795 from annando/complete-url
Complete incomplete URL during feed import
2017-10-16 17:04:46 -04:00
Michael 3eed3316ea Some more camels 2017-10-16 20:59:16 +00:00
Michael b521215383 Camels aren't studly 2017-10-16 20:57:53 +00:00
Michael f127d65de9 Added spaces 2017-10-16 20:55:37 +00:00
Michael 2a28591415 Complete incomplete URL during feed import 2017-10-16 20:31:13 +00:00
Tobias Diekershoff a0530d1066 Merge pull request #3789 from Alkarex/french_regions
French regions spelling
2017-10-16 11:32:11 +02:00
Tobias Diekershoff 541d6ab895 Merge pull request #3788 from Alkarex/denmark_regions
Danish areas updated
2017-10-16 11:30:35 +02:00
Tobias Diekershoff cadc8aa6e8 Merge pull request #3787 from rabuzarus/20171013_-_format_event_in_stream
event items are now more themeable in the networkstream
2017-10-16 11:29:43 +02:00
Tobias Diekershoff 576cc383b9 Version 3.6-dev for develop again 2017-10-16 10:31:37 +02:00
Tobias Diekershoff f4632319c0 Version 3.5.4 2017-10-16 10:27:24 +02:00
Tobias Diekershoff 023822b4e5 release date 2017-10-16 10:27:17 +02:00
Tobias Diekershoff 96501bda81 Merge pull request #3786 from tobiasd/3.5.4-CHANGELOG
Updating the CHANGELOG
2017-10-16 10:24:49 +02:00
Tobias Diekershoff 3fd0210681 Merge pull request #3793 from annando/parse-fix
Special treatment for HTTP Code 416
2017-10-16 07:34:41 +02:00
Michael 0a1554e08b Special treatment for HTTP Code 416 2017-10-16 03:14:32 +00:00
Tobias Diekershoff 74af893b87 Merge pull request #3791 from annando/parse-fix
Bugfix: Range checking with ParseUrl made problems
2017-10-16 00:37:05 +02:00
Tobias Diekershoff 26d7cf1d6a Merge pull request #3792 from annando/dead-contacts
Bugfix: Revive dead contacts
2017-10-16 00:36:08 +02:00
Michael 08f461f70c Bugfix: Revive dead contacts 2017-10-15 19:34:15 +00:00
Michael 1506886947 Bugfix: Range checking with ParseUrl made problems - we now use the standard 2017-10-15 19:29:58 +00:00
Michael Vogel d0d3824d0c Merge pull request #3790 from rabuzarus/20171015_-_frio_fix_nav_short_info_Image_floating
Buxfix: fix image floating in frios nav-short-info
2017-10-15 17:59:26 +02:00
rabuzarus 204c134ab8 Buxfix: fix image floating in frios nav-short-info 2017-10-15 17:54:35 +02:00
Alexandre Alapetite 05e7d112ab French regions spelling
* Updated spelling of French regions, using proper Unicode letters.
* Still using the pre-2016 divisions though, while waiting to see
whether the new divisions are sticking
https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise

Note that Guadeloupe, Martinique, Guyane, Reunion, and Mayotte are
currently registered as states, but they are official French regions.
This seems inconsistent with e.g. Alaska and Hawai which are listed
under USA.
I can fix if you want.

Note 2: The format of this file seems to be quite difficult to maintain
(e.g. to add/remove a state) due to integer indexes.
2017-10-14 14:03:32 +02:00
Alexandre Alapetite 14a4fb5703 Danish areas updated
Based on regions, region capitals, most populated cities, main islands.
The two largest regions are split into more precise areas.
Use proper Unicode letters.
https://da.wikipedia.org/wiki/Danmarks_regioner
https://da.wikipedia.org/wiki/Danmarks_st%C3%B8rste_byer
https://da.wikipedia.org/wiki/Beboede_danske_%C3%B8er
2017-10-14 13:07:44 +02:00
rabuzarus dcbf4d6d11 fix event html construction (fixes #2646) 2017-10-13 20:03:47 +02:00
rabuzarus 553428d1b1 event items are now more themeable in the networkstream.
The event description stays the same - but the theme developer can provide an template how the other event data should be organized and look
2017-10-13 19:42:27 +02:00
Tobias Diekershoff 98f3aef1b8 annando updated the docs as well 2017-10-13 19:10:59 +02:00
Tobias Diekershoff 7d5ad5df3b 1st batch of changes for the 3.5.4 hotfix release 2017-10-13 19:03:53 +02:00
Tobias Diekershoff 1441abd15a Version 3.5.4-rc 2017-10-13 18:49:37 +02:00
Tobias Diekershoff dd0e75628a Merge pull request #3784 from annando/receive-migration
Diaspora: We now support the receiving of account migration messages
2017-10-13 18:47:02 +02:00
Michael Vogel 4b61719450 Merge pull request #3785 from tobiasd/20171013-de
update DE translation
2017-10-13 18:26:29 +02:00
Michael e091a610d7 Fixed indention level 2017-10-13 16:24:38 +00:00
Tobias Diekershoff 5afab4b178 update DE translation 2017-10-13 18:10:08 +02:00
Michael b31c6413fe Can be private 2017-10-13 15:51:57 +00:00
Michael 9f2196aa1a Parameter should fit ... 2017-10-13 15:48:59 +00:00
Michael 0a45f40c9d Diaspora: We now support the receiving of account migration messages 2017-10-13 15:32:10 +00:00
rabuzarus 0882b2df97 Merge pull request #3779 from annando/event-data
export event data for display purposes
2017-10-13 13:06:46 +02:00
Tobias Diekershoff fd81a90eb8 Merge pull request #3783 from annando/diaspora-migration
Diaspora: Support account migration
2017-10-13 12:59:47 +02:00
Michael 9286f5cf31 Added documentation 2017-10-13 10:49:51 +00:00