Commit graph

15876 commits

Author SHA1 Message Date
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
Michael 33b61ab262 Database connections should be closed 2017-08-10 06:33:24 +00:00
Michael eb7cbb9ada Now there are fewer than 300 updates left ... 2017-08-10 05:07:23 +00:00
Michael bd8efb7f92 Several updates are transformed as well 2017-08-10 04:31:46 +00:00
Michael f1a57dd9c6 Avoid an error 2017-08-09 23:08:25 +00:00
Michael 03b86d3766 Now we have less than 100 insert commands, yeah 2017-08-09 23:02:57 +00:00
Michael c6b04aa922 And some more inserts 2017-08-09 22:23:46 +00:00
Michael 6180d62ebc Some more inserts 2017-08-09 22:04:00 +00:00
Michael Vogel f80984541e Merge pull request #3620 from tobiasd/20170809-issue3592
add a switch to the Markdown parser for using hard line wraps
2017-08-09 23:46:00 +02:00
Michael f248f9cc85 Merge remote-tracking branch 'upstream/develop' into new-dba 2017-08-09 21:42:51 +00:00
Michael 69a3f66d56 Just more simplyfication 2017-08-09 21:34:39 +00:00
Michael fce72cbbc8 Modifed "update" and "insert" function / many changed queries 2017-08-09 21:12:41 +00:00
Tobias Diekershoff 147bfb0576 some simplification 2017-08-09 19:19:42 +02:00
Tobias Diekershoff a0ecd5ab2e add more space 2017-08-09 19:18:38 +02:00
Tobias Diekershoff 29a66c8336 it is hardwrap for consistency 2017-08-09 16:10:09 +02:00
Tobias Diekershoff 6504156508 add a switch to the Markdown parser for using hard line breaks (issue 3592) 2017-08-09 16:04:53 +02:00
Michael a5e7f7bf70 We don't need an order. 2017-08-09 07:57:33 +00:00
Michael 64718b53d1 Works now 2017-08-09 06:16:19 +00:00
Tobias Diekershoff 95679c470c Merge pull request #3619 from annando/dba-connect
DBA: Do a fallback to other db functions on problems
2017-08-09 08:13:57 +02:00
Michael b01ab3e64c DBA: Do a fallback to other db functions on problems 2017-08-09 06:02:48 +00:00
Michael ae8098eaf2 Config now works with the new database routines 2017-08-09 05:53:07 +00:00
Tobias Diekershoff 4d77c8a90a Merge pull request #3618 from annando/mysqli-fix
Quickfix for MYSQLi (prepared statement problem)
2017-08-08 09:32:26 +02:00
Michael c3e1f88d4b Quickfix for MYSQLi (prepared statement problem) 2017-08-08 06:07:04 +00:00
Michael Vogel 56de36574b Merge pull request #3617 from ddorian1/develop
Catch exceptions in PDO constructor
2017-08-05 15:42:29 +02:00
Johannes Schwab 37262c24d9 Catch exceptions in PDO constructor 2017-08-04 11:01:29 +02:00
Tobias Diekershoff 93fb98959a Merge pull request #3613 from annando/some-ostatus
Speed up of OStatus transmission/Ignoring "created" with remote self
2017-08-03 08:01:04 +02:00
Tobias Diekershoff b7fb43484e Merge pull request #3614 from annando/avoid-warnings
Avoid some PHP warnings, no functional changes
2017-08-03 07:58:16 +02:00
Michael Vogel c0d2e73d0a Merge pull request #3612 from tobiasd/20170802-issue2121
invitations
2017-08-03 07:54:35 +02:00
Michael 1bd85971a4 Avoid some PHP warnings, no functional changes 2017-08-03 05:50:44 +00:00
Michael a80329b416 Speed up of OStatus transmission/Ignoring "created" with remote self 2017-08-03 05:42:44 +00:00
Tobias Diekershoff ee6956a91a else is sufficient here 2017-08-03 07:23:05 +02:00
Tobias Diekershoff 0c8c69371c no global directory URL defined? 2017-08-03 07:22:29 +02:00
Michael Vogel f94a360d9a Merge pull request #3609 from rabuzarus/20170802_-_probe_camelcase
fix some method names (camelcase) in Probe.php and Lock.php
2017-08-02 19:45:37 +02:00
Tobias Diekershoff 5da5ab5c74 Merge pull request #3610 from rabuzarus/20170802_-_frio_subthread
Add subthread to frio (needs reanabling the frio theme)
2017-08-02 17:24:35 +02:00
rabuzarus ccb3f6b655 Add subthread to frio (needs reanabling the frio theme) 2017-08-02 15:52:11 +02:00
rabuzarus 28eb5d57a7 fix some method names (camelcase) in Probe.php and Lock.php 2017-08-02 13:09:42 +02:00
Tobias Diekershoff 6cf951c930 use /servers instead of /siteinfo for the directory link in invitations 2017-08-02 08:48:01 +02:00
Tobias Diekershoff 7034d6efbd use /servers instead of /siteinfo for the directory link in invitations 2017-08-02 08:47:09 +02:00
Michael Vogel e38340dc5f Merge pull request #3608 from tobiasd/20170801-issue2998
Show contacts personal message in local profile
2017-08-01 22:18:00 +02:00
Tobias Diekershoff 016e4a0efc Show contacts personal message in local profile 2017-08-01 17:47:13 +02:00
Tobias Diekershoff 8a93725d77 Merge pull request #3607 from annando/issue-3536
Issue 3536. Now likes aren't show anymore on the community page
2017-08-01 06:51:41 +02:00
Michael 55569f9df3 This is a fix for issue 3536. Now likes aren't show anymore on the community page. 2017-07-31 19:29:43 +00:00
Tobias Diekershoff 088837e1d1 Merge pull request #3606 from AndyHee/20170731-en_USGB_translations
Update US and GB Translations
2017-07-31 19:35:04 +02:00