Commit graph

16214 commits

Author SHA1 Message Date
rabuzarus
204c134ab8 Buxfix: fix image floating in frios nav-short-info 2017-10-15 17:54:35 +02:00
rabuzarus
4584670af4 add event action: duplicate events 2017-10-15 17:30:28 +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
98f3aef1b8 annando updated the docs as well 2017-10-13 19:10:59 +02:00
7d5ad5df3b 1st batch of changes for the 3.5.4 hotfix release 2017-10-13 19:03:53 +02:00
1441abd15a Version 3.5.4-rc 2017-10-13 18:49:37 +02:00
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
e091a610d7 Fixed indention level 2017-10-13 16:24:38 +00:00
5afab4b178 update DE translation 2017-10-13 18:10:08 +02:00
b31c6413fe Can be private 2017-10-13 15:51:57 +00:00
9f2196aa1a Parameter should fit ... 2017-10-13 15:48:59 +00:00
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
fd81a90eb8 Merge pull request #3783 from annando/diaspora-migration
Diaspora: Support account migration
2017-10-13 12:59:47 +02:00
9286f5cf31 Added documentation 2017-10-13 10:49:51 +00:00
Michael Vogel
14fe3d60ae Merge pull request #3782 from tobiasd/20171013-msg
regenerated master messages.po file
2017-10-13 11:44:27 +02:00
b31b29c557 Now it could work 2017-10-13 09:41:01 +00:00
2b80bf4683 Improved documentation 2017-10-13 09:26:07 +00:00
09020192d6 Diaspora: Support account migration 2017-10-13 09:22:05 +00:00
bdf0a62fdd regenerated master messages.po file 2017-10-13 07:28:17 +02:00
6a7b3f19ae Merge pull request #3781 from annando/display-improvements
Improve the data generation for the display page
2017-10-12 23:44:17 +02:00
5acdd18c00 Improve the data generation for the display page 2017-10-12 19:54:49 +00:00
Michael Vogel
f4859fbd8d Merge pull request #3780 from AlfredSK/patch-1
Update vier with new global support forum
2017-10-12 18:07:25 +02:00
S.Krumbholz
80dde20c64 Update vier with new global support forum
vier has a hardcoded path to the helpers forum as well.
I've changed the path of the global support forum to https://forum.friendi.ca/profile/helpers.
2017-10-12 15:59:13 +02:00
bc41a2b606 Merge pull request #3778 from annando/initialize-sql
"dba" is now static
2017-10-12 07:24:16 +02:00
eeec1ea163 We should take the event-id as well 2017-10-11 20:45:03 +00:00
42a76bced9 export event data for display purposes 2017-10-11 19:51:18 +00:00
7b833834f9 Avoid basepath problems 2017-10-11 18:21:10 +00:00
225eea2ca6 Avoid undefined class variables 2017-10-11 14:52:08 +00:00
a29b7e7153 "dba" is now a static class 2017-10-11 12:56:36 +00:00
57be4f047e Merge pull request #3776 from annando/initialize-sql
Checks if the database variable is initialized
2017-10-11 07:14:46 +02:00
dbcd1d1ae3 Additional check if the database object is initialized 2017-10-10 22:25:38 +00:00
63e02eb57f Checks if the database variable is initialized 2017-10-10 22:18:57 +00:00
Michael Vogel
c2472d9981 Merge pull request #3774 from tobiasd/20171010-lng
ES and PT BR translation work
2017-10-10 11:39:56 +02:00
49cc514f29 Merge pull request #3775 from annando/ostatus-nick-change
OStatus: Better handling of changed nicknames
2017-10-10 11:23:51 +02:00
763838c78d OStatus: Better handling of changed nicknames 2017-10-10 09:13:37 +00:00
0b66f3ed1e update for ES thx Albert 2017-10-10 07:13:52 +02:00
61095f7546 update for PT BR thx abinoam 2017-10-10 07:12:40 +02:00
ed13034e23 Merge pull request #3773 from annando/force-republish
Force a republish to the directory server
2017-10-09 21:39:24 +02:00
c8eefbd091 Force a republish to the directory server 2017-10-09 19:26:45 +00:00
4c75c59039 Merge pull request #3772 from annando/relocate-ignore
Process "relocate" messages even if we are ignoring a contact
2017-10-09 05:16:32 +00:00
09af73168c Process "relocate" messages even if we are ignoring a contact 2017-10-09 05:02:50 +00:00
rabuzarus
62aa839876 Merge pull request #3771 from tobiasd/20171008-doc
links in the docs
2017-10-08 14:00:57 +02:00
Michael Vogel
fd5cf0f147 Merge pull request #3770 from tobiasd/20171008-dotca
.com -> .ca
2017-10-08 12:39:03 +02:00
77471bccd3 changed links 2017-10-08 11:40:06 +02:00
74eb0ae923 move to forum.friendi.ca 2017-10-08 11:38:26 +02:00