Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 20:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
15818 commits 3 branches 64 tags 237 MiB
Commit graph

15818 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tobias Diekershoff
fdc8190567 Merge pull request #3642 from annando/pleroma 
Compatibility with pleroma added
 2017-08-22 08:40:36 +02:00
Michael
51dca9b034 Compatibility with pleroma added 2017-08-21 20:21:04 +00:00
Tobias Diekershoff
c9daecb80d Merge pull request #3640 from annando/better-smiley-support 
Preparation for Unicode Emojis
 2017-08-21 06:54:15 +02:00
Michael
85c49060e2 Preparation for Unicode Emojis 2017-08-20 19:47:00 +00:00
Tobias Diekershoff
db5b42579b Merge pull request #3638 from annando/issue-3560-2 
When "local_search" is activated, point all hashtags to the local server
 2017-08-19 12:21:37 +02:00
Michael
17b05c9ad9 Hash tag links now do a redir 2017-08-19 09:22:50 +00:00
Michael
f8946c9e0a When "local_search" is activated, then point all hashtags to the local server 2017-08-18 22:12:40 +00:00
Tobias Diekershoff
5c5db12706 Merge pull request #3635 from annando/better-dfrn-status 
DFRN: Improved delivery status handling
 2017-08-16 07:44:34 +02:00
Michael
e10bb40e1a Added logging 2017-08-16 04:53:15 +00:00
Michael
791fc1d8b3 DFRN: Improved delivery status handling 2017-08-16 04:08:57 +00:00
Michael Vogel
23c4e934e9 Merge pull request #3634 from tobiasd/20170815-de 
DE translations
 2017-08-15 21:17:40 +02:00
Tobias Diekershoff
33b3ad991c DE translations 2017-08-15 19:54:08 +02:00
Tobias Diekershoff
0abdb26507 Merge pull request #3633 from annando/dba-bugfix 
Further database corrections
 2017-08-15 13:30:34 +02:00
Michael
6c9953809a Improved position of "close" 2017-08-15 10:10:09 +00:00
Michael
a0567d4081 dbm::is_result now checks whether a dba:... call returns at least one result 2017-08-15 06:08:26 +00:00
Tobias Diekershoff
d2b7a44299 Merge pull request #3631 from annando/1708-libertree 
Shared posts to Libertree now look better.
 2017-08-15 07:44:53 +02:00
Tobias Diekershoff
dd08e22bea Merge pull request #3632 from annando/bugfix-3630 
Bugfix for PR 3630
 2017-08-15 07:41:30 +02:00
Michael
3290ccc779 Now some more stuff is fixed 2017-08-14 21:46:58 +00:00
Michael
4f6f47f714 Now the bugfix really should work 2017-08-14 20:58:02 +00:00
Michael
2d99e86b12 Bugfix for PR 3630: "get_contact_details_by_url" not always returned a value 2017-08-14 20:17:17 +00:00
Michael
3c59eefa22 Shared posts to Libertree now look better. 2017-08-14 19:16:28 +00:00
Tobias Diekershoff
cdc41d6018 Merge pull request #3630 from annando/dba-2 
Several more replaced database calls
 2017-08-14 10:46:40 +02:00
Michael
796cee6273 Cleaning code 2017-08-14 05:52:36 +00:00
Michael
b3e20b1685 New database version 2017-08-14 05:49:49 +00:00
Michael
1fa82581b6 Avoid warning 2017-08-14 05:47:25 +00:00
Michael
217a8ce6ee Events now work again 2017-08-14 05:05:32 +00:00
Michael
0ac725dc47 Some more updated queries 2017-08-12 22:15:16 +00:00
Michael
41a81624a2 Now deletions will also work with complicated queries 2017-08-12 18:07:47 +00:00
rabuzarus
509c247a41 Merge pull request #3628 from tobiasd/20170818-messages 
regenerated master messages.po file
 2017-08-12 18:49:17 +02:00
Michael
89017d4e6c DBA: The condition can now be a complex string 2017-08-12 13:54:29 +00:00
Michael
1d8c91c478 Restructured "dba::exists" function 2017-08-12 08:55:50 +00:00
Tobias Diekershoff
0fb7793bfa regenerated master messages.po file 2017-08-12 09:43:28 +02:00
Michael
b14b44e8a8 Merge remote-tracking branch 'upstream/develop' into dba-2 2017-08-12 07:37:06 +00:00
Michael Vogel
adf06e9c81 Merge pull request #3627 from tobiasd/20170812-invite 
wrong url
 2017-08-12 09:33:14 +02:00
Tobias Diekershoff
0babc2c96e Merge pull request #3626 from annando/issue-3616 
Issue 3616: Don't create notifications for forum accounts
 2017-08-12 07:52:14 +02:00
Tobias Diekershoff
e6db0f12aa Merge pull request #3625 from annando/issue-3615 
Issue 3615: Probing sometimes returned an empty "addr" field
 2017-08-12 07:51:00 +02:00
Tobias Diekershoff
3b67ef3e9c wrong url 2017-08-12 07:46:37 +02:00
Michael
51f6c46923 Issue 3616: Don't create notifications for forum accounts 2017-08-12 05:08:45 +00:00
Michael
7052da745c Issue 3615: Probing sometimes returned an empty "addr" field 2017-08-11 21:50:46 +00:00
Michael
4ada71081f No timeout problem anymore in preview. 2017-08-11 20:25:02 +00:00
Michael
556cc0cc4c And some more changed lines 2017-08-11 19:26:08 +00:00
Michael
05393a6faa Merge remote-tracking branch 'upstream/develop' into dba-2 2017-08-11 16:24:33 +00:00
Michael
99f0c01cdd Some more changed queries 2017-08-11 16:21:55 +00:00
Michael
d352a290fe Parameter wasn't replaced 2017-08-11 08:55:07 +00:00
Michael
d810b21f87 New dba functions 2017-08-11 08:04:01 +00:00
Tobias Diekershoff
e6e8ebbac5 Merge pull request #3622 from annando/new-dba 
Enhanced dba functions, several replaced database calls
 2017-08-11 08:11:20 +02:00
Michael Vogel
6125c2b604 Merge pull request #3623 from tobiasd/20170810-missingbracket 
missing bracket
 2017-08-10 14:46:32 +02:00
Michael
7b6664f0f7 Improved parameter handling 2017-08-10 12:38:32 +00:00
Tobias Diekershoff
e89e008565 missing bracket 2017-08-10 10:31:45 +02:00