]>
git.mxchange.org Git - friendica.git/log
Alexandre Alapetite [Sat, 14 Oct 2017 12:03:32 +0000 (14:03 +0200)]
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.
Tobias Diekershoff [Tue, 22 Aug 2017 06:40:36 +0000 (08:40 +0200)]
Merge pull request #3642 from annando/pleroma
Compatibility with pleroma added
Michael [Mon, 21 Aug 2017 20:21:04 +0000 (20:21 +0000)]
Compatibility with pleroma added
Tobias Diekershoff [Mon, 21 Aug 2017 04:54:15 +0000 (06:54 +0200)]
Merge pull request #3640 from annando/better-smiley-support
Preparation for Unicode Emojis
Michael [Sun, 20 Aug 2017 19:47:00 +0000 (19:47 +0000)]
Preparation for Unicode Emojis
Tobias Diekershoff [Sat, 19 Aug 2017 10:21:37 +0000 (12:21 +0200)]
Merge pull request #3638 from annando/issue-3560-2
When "local_search" is activated, point all hashtags to the local server
Michael [Sat, 19 Aug 2017 09:22:50 +0000 (09:22 +0000)]
Hash tag links now do a redir
Michael [Fri, 18 Aug 2017 22:12:40 +0000 (22:12 +0000)]
When "local_search" is activated, then point all hashtags to the local server
Tobias Diekershoff [Wed, 16 Aug 2017 05:44:34 +0000 (07:44 +0200)]
Merge pull request #3635 from annando/better-dfrn-status
DFRN: Improved delivery status handling
Michael [Wed, 16 Aug 2017 04:53:15 +0000 (04:53 +0000)]
Added logging
Michael [Wed, 16 Aug 2017 04:08:57 +0000 (04:08 +0000)]
DFRN: Improved delivery status handling
Michael Vogel [Tue, 15 Aug 2017 19:17:40 +0000 (21:17 +0200)]
Merge pull request #3634 from tobiasd/
20170815 -de
DE translations
Tobias Diekershoff [Tue, 15 Aug 2017 17:54:08 +0000 (19:54 +0200)]
DE translations
Tobias Diekershoff [Tue, 15 Aug 2017 11:30:34 +0000 (13:30 +0200)]
Merge pull request #3633 from annando/dba-bugfix
Further database corrections
Michael [Tue, 15 Aug 2017 10:10:09 +0000 (10:10 +0000)]
Improved position of "close"
Michael [Tue, 15 Aug 2017 06:08:26 +0000 (06:08 +0000)]
dbm::is_result now checks whether a dba:... call returns at least one result
Tobias Diekershoff [Tue, 15 Aug 2017 05:44:53 +0000 (07:44 +0200)]
Merge pull request #3631 from annando/1708-libertree
Shared posts to Libertree now look better.
Tobias Diekershoff [Tue, 15 Aug 2017 05:41:30 +0000 (07:41 +0200)]
Merge pull request #3632 from annando/bugfix-3630
Bugfix for PR 3630
Michael [Mon, 14 Aug 2017 21:46:58 +0000 (21:46 +0000)]
Now some more stuff is fixed
Michael [Mon, 14 Aug 2017 20:58:02 +0000 (20:58 +0000)]
Now the bugfix really should work
Michael [Mon, 14 Aug 2017 20:17:17 +0000 (20:17 +0000)]
Bugfix for PR 3630: "get_contact_details_by_url" not always returned a value
Michael [Mon, 14 Aug 2017 19:16:28 +0000 (19:16 +0000)]
Shared posts to Libertree now look better.
Tobias Diekershoff [Mon, 14 Aug 2017 08:46:40 +0000 (10:46 +0200)]
Merge pull request #3630 from annando/dba-2
Several more replaced database calls
Michael [Mon, 14 Aug 2017 05:52:36 +0000 (05:52 +0000)]
Cleaning code
Michael [Mon, 14 Aug 2017 05:49:49 +0000 (05:49 +0000)]
New database version
Michael [Mon, 14 Aug 2017 05:47:25 +0000 (05:47 +0000)]
Avoid warning
Michael [Mon, 14 Aug 2017 05:05:32 +0000 (05:05 +0000)]
Events now work again
Michael [Sat, 12 Aug 2017 22:15:16 +0000 (22:15 +0000)]
Some more updated queries
Michael [Sat, 12 Aug 2017 18:07:47 +0000 (18:07 +0000)]
Now deletions will also work with complicated queries
rabuzarus [Sat, 12 Aug 2017 16:49:17 +0000 (18:49 +0200)]
Merge pull request #3628 from tobiasd/
20170818 -messages
regenerated master messages.po file
Michael [Sat, 12 Aug 2017 13:54:29 +0000 (13:54 +0000)]
DBA: The condition can now be a complex string
Michael [Sat, 12 Aug 2017 08:55:50 +0000 (08:55 +0000)]
Restructured "dba::exists" function
Tobias Diekershoff [Sat, 12 Aug 2017 07:43:28 +0000 (09:43 +0200)]
regenerated master messages.po file
Michael [Sat, 12 Aug 2017 07:37:06 +0000 (07:37 +0000)]
Merge remote-tracking branch 'upstream/develop' into dba-2
Michael Vogel [Sat, 12 Aug 2017 07:33:14 +0000 (09:33 +0200)]
Merge pull request #3627 from tobiasd/
20170812 -invite
wrong url
Tobias Diekershoff [Sat, 12 Aug 2017 05:52:14 +0000 (07:52 +0200)]
Merge pull request #3626 from annando/issue-3616
Issue 3616: Don't create notifications for forum accounts
Tobias Diekershoff [Sat, 12 Aug 2017 05:51:00 +0000 (07:51 +0200)]
Merge pull request #3625 from annando/issue-3615
Issue 3615: Probing sometimes returned an empty "addr" field
Tobias Diekershoff [Sat, 12 Aug 2017 05:46:37 +0000 (07:46 +0200)]
wrong url
Michael [Sat, 12 Aug 2017 05:08:45 +0000 (05:08 +0000)]
Issue 3616: Don't create notifications for forum accounts
Michael [Fri, 11 Aug 2017 21:50:46 +0000 (21:50 +0000)]
Issue 3615: Probing sometimes returned an empty "addr" field
Michael [Fri, 11 Aug 2017 20:25:02 +0000 (20:25 +0000)]
No timeout problem anymore in preview.
Michael [Fri, 11 Aug 2017 19:26:08 +0000 (19:26 +0000)]
And some more changed lines
Michael [Fri, 11 Aug 2017 16:24:33 +0000 (16:24 +0000)]
Merge remote-tracking branch 'upstream/develop' into dba-2
Michael [Fri, 11 Aug 2017 16:21:55 +0000 (16:21 +0000)]
Some more changed queries
Michael [Fri, 11 Aug 2017 08:55:07 +0000 (08:55 +0000)]
Parameter wasn't replaced
Michael [Fri, 11 Aug 2017 08:04:01 +0000 (08:04 +0000)]
New dba functions
Tobias Diekershoff [Fri, 11 Aug 2017 06:11:20 +0000 (08:11 +0200)]
Merge pull request #3622 from annando/new-dba
Enhanced dba functions, several replaced database calls
Michael Vogel [Thu, 10 Aug 2017 12:46:32 +0000 (14:46 +0200)]
Merge pull request #3623 from tobiasd/
20170810 -missingbracket
missing bracket
Michael [Thu, 10 Aug 2017 12:38:32 +0000 (12:38 +0000)]
Improved parameter handling
Tobias Diekershoff [Thu, 10 Aug 2017 08:31:45 +0000 (10:31 +0200)]
missing bracket
Michael [Thu, 10 Aug 2017 06:33:24 +0000 (06:33 +0000)]
Database connections should be closed
Michael [Thu, 10 Aug 2017 05:07:23 +0000 (05:07 +0000)]
Now there are fewer than 300 updates left ...
Michael [Thu, 10 Aug 2017 04:31:46 +0000 (04:31 +0000)]
Several updates are transformed as well
Michael [Wed, 9 Aug 2017 23:08:25 +0000 (23:08 +0000)]
Avoid an error
Michael [Wed, 9 Aug 2017 23:02:57 +0000 (23:02 +0000)]
Now we have less than 100 insert commands, yeah
Michael [Wed, 9 Aug 2017 22:23:46 +0000 (22:23 +0000)]
And some more inserts
Michael [Wed, 9 Aug 2017 22:04:00 +0000 (22:04 +0000)]
Some more inserts
Michael Vogel [Wed, 9 Aug 2017 21:46:00 +0000 (23:46 +0200)]
Merge pull request #3620 from tobiasd/
20170809 -issue3592
add a switch to the Markdown parser for using hard line wraps
Michael [Wed, 9 Aug 2017 21:42:51 +0000 (21:42 +0000)]
Merge remote-tracking branch 'upstream/develop' into new-dba
Michael [Wed, 9 Aug 2017 21:34:39 +0000 (21:34 +0000)]
Just more simplyfication
Michael [Wed, 9 Aug 2017 21:12:41 +0000 (21:12 +0000)]
Modifed "update" and "insert" function / many changed queries
Tobias Diekershoff [Wed, 9 Aug 2017 17:19:42 +0000 (19:19 +0200)]
some simplification
Tobias Diekershoff [Wed, 9 Aug 2017 17:18:38 +0000 (19:18 +0200)]
add more space
Tobias Diekershoff [Wed, 9 Aug 2017 14:10:09 +0000 (16:10 +0200)]
it is hardwrap for consistency
Tobias Diekershoff [Wed, 9 Aug 2017 14:04:53 +0000 (16:04 +0200)]
add a switch to the Markdown parser for using hard line breaks (issue 3592)
Michael [Wed, 9 Aug 2017 07:57:33 +0000 (07:57 +0000)]
We don't need an order.
Michael [Wed, 9 Aug 2017 06:16:19 +0000 (06:16 +0000)]
Works now
Tobias Diekershoff [Wed, 9 Aug 2017 06:13:57 +0000 (08:13 +0200)]
Merge pull request #3619 from annando/dba-connect
DBA: Do a fallback to other db functions on problems
Michael [Wed, 9 Aug 2017 06:02:48 +0000 (06:02 +0000)]
DBA: Do a fallback to other db functions on problems
Michael [Wed, 9 Aug 2017 05:53:07 +0000 (05:53 +0000)]
Config now works with the new database routines
Tobias Diekershoff [Tue, 8 Aug 2017 07:32:26 +0000 (09:32 +0200)]
Merge pull request #3618 from annando/mysqli-fix
Quickfix for MYSQLi (prepared statement problem)
Michael [Tue, 8 Aug 2017 06:07:04 +0000 (06:07 +0000)]
Quickfix for MYSQLi (prepared statement problem)
Michael Vogel [Sat, 5 Aug 2017 13:42:29 +0000 (15:42 +0200)]
Merge pull request #3617 from ddorian1/develop
Catch exceptions in PDO constructor
Johannes Schwab [Fri, 4 Aug 2017 09:01:29 +0000 (11:01 +0200)]
Catch exceptions in PDO constructor
Tobias Diekershoff [Thu, 3 Aug 2017 06:01:04 +0000 (08:01 +0200)]
Merge pull request #3613 from annando/some-ostatus
Speed up of OStatus transmission/Ignoring "created" with remote self
Tobias Diekershoff [Thu, 3 Aug 2017 05:58:16 +0000 (07:58 +0200)]
Merge pull request #3614 from annando/avoid-warnings
Avoid some PHP warnings, no functional changes
Michael Vogel [Thu, 3 Aug 2017 05:54:35 +0000 (07:54 +0200)]
Merge pull request #3612 from tobiasd/
20170802 -issue2121
invitations
Michael [Thu, 3 Aug 2017 05:50:44 +0000 (05:50 +0000)]
Avoid some PHP warnings, no functional changes
Michael [Thu, 3 Aug 2017 05:42:44 +0000 (05:42 +0000)]
Speed up of OStatus transmission/Ignoring "created" with remote self
Tobias Diekershoff [Thu, 3 Aug 2017 05:23:05 +0000 (07:23 +0200)]
else is sufficient here
Tobias Diekershoff [Thu, 3 Aug 2017 05:22:29 +0000 (07:22 +0200)]
no global directory URL defined?
Michael Vogel [Wed, 2 Aug 2017 17:45:37 +0000 (19:45 +0200)]
Merge pull request #3609 from rabuzarus/20170802_-_probe_camelcase
fix some method names (camelcase) in Probe.php and Lock.php
Tobias Diekershoff [Wed, 2 Aug 2017 15:24:35 +0000 (17:24 +0200)]
Merge pull request #3610 from rabuzarus/20170802_-_frio_subthread
Add subthread to frio (needs reanabling the frio theme)
rabuzarus [Wed, 2 Aug 2017 13:52:11 +0000 (15:52 +0200)]
Add subthread to frio (needs reanabling the frio theme)
rabuzarus [Wed, 2 Aug 2017 11:09:42 +0000 (13:09 +0200)]
fix some method names (camelcase) in Probe.php and Lock.php
Tobias Diekershoff [Wed, 2 Aug 2017 06:48:01 +0000 (08:48 +0200)]
use /servers instead of /siteinfo for the directory link in invitations
Tobias Diekershoff [Wed, 2 Aug 2017 06:47:09 +0000 (08:47 +0200)]
use /servers instead of /siteinfo for the directory link in invitations
Michael Vogel [Tue, 1 Aug 2017 20:18:00 +0000 (22:18 +0200)]
Merge pull request #3608 from tobiasd/
20170801 -issue2998
Show contacts personal message in local profile
Tobias Diekershoff [Tue, 1 Aug 2017 15:47:13 +0000 (17:47 +0200)]
Show contacts personal message in local profile
Tobias Diekershoff [Tue, 1 Aug 2017 04:51:41 +0000 (06:51 +0200)]
Merge pull request #3607 from annando/issue-3536
Issue 3536. Now likes aren't show anymore on the community page
Michael [Mon, 31 Jul 2017 19:29:43 +0000 (19:29 +0000)]
This is a fix for issue 3536. Now likes aren't show anymore on the community page.
Tobias Diekershoff [Mon, 31 Jul 2017 17:35:04 +0000 (19:35 +0200)]
Merge pull request #3606 from AndyHee/
20170731 -en_USGB_translations
Update US and GB Translations
AndyHee [Mon, 31 Jul 2017 14:18:22 +0000 (21:18 +0700)]
Update US and GB Translations
Tobias Diekershoff [Mon, 31 Jul 2017 09:09:45 +0000 (11:09 +0200)]
Merge pull request #3605 from annando/better-endless-scroll
Endless scroll now avoids showing the same items
Michael [Mon, 31 Jul 2017 06:04:37 +0000 (06:04 +0000)]
Endless scroll now avoids showing the same items
Tobias Diekershoff [Thu, 27 Jul 2017 15:03:46 +0000 (17:03 +0200)]
Merge pull request #3604 from annando/bugfix-acl
Bugfix: The ACL lookup had its problems after the last changes
Michael [Thu, 27 Jul 2017 14:02:25 +0000 (14:02 +0000)]
Bugfix: The ACL lookup had its problems after the last changes
Tobias Diekershoff [Wed, 26 Jul 2017 05:27:37 +0000 (07:27 +0200)]
Merge pull request #3603 from annando/fix-ostatus
Fix incomplete webfinger data for OStatus
Michael [Tue, 25 Jul 2017 21:46:14 +0000 (21:46 +0000)]
Fix incomplete webfinger data for OStatus
Tobias Diekershoff [Sun, 23 Jul 2017 20:21:30 +0000 (22:21 +0200)]
Merge pull request #3602 from annando/1707-expiration
Bugfix: the expiration check in item_store now works again