Commit graph

15060 commits

Author SHA1 Message Date
Hypolite Petovan
25d70c39c6 Merge pull request #3341 from annando/issue-3326
Always use utf8mb4 from now on
2017-04-15 01:58:18 -04:00
Alexandre Alapetite
d2b3e0daf5 Merge develop 2017-04-15 01:03:21 +02:00
Alexandre Alapetite
6be6badd91 SQL typo mod/message
Mistake in previous commit
2017-04-15 00:45:30 +02:00
Alexandre Alapetite
1058b28cea MySQL ANY_VALUE with fallback to MIN
https://github.com/friendica/friendica/issues/3322
2017-04-15 00:42:44 +02:00
358aa1d7ef Database version updated 2017-04-14 22:34:01 +00:00
e7783e2018 Merge remote-tracking branch 'upstream/develop' into issue-3326 2017-04-14 22:30:48 +00:00
9423db628f
Merge branch 'develop' into rewrites/coding-convention-split2-1-2
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 17:56:51 +02:00
fcf095cc6e
always surround operators like +,-,. with spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 17:43:01 +02:00
851c0284ee
added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 17:40:49 +02:00
ccbe7dd353
opps, missed this space ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 17:36:59 +02:00
a8136898b4
Opps, fixed parser errors
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 17:04:09 +02:00
03d23838f5
Continued:
- added curly braces/spaces
- added TODOs (type-hints, old-lost code)
- more usage of dbm::is_result()
- combined some if() return stuff into a simple return statement

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 17:00:51 +02:00
629fcd48bd
tpzo fixed ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 16:27:21 +02:00
f2f20c85d5
added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 16:27:06 +02:00
be59fe86e5
added space + type-hinted $a (App)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 15:29:50 +02:00
3a197833cd
added space
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 15:28:30 +02:00
753b432ab2
fixed intending
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 15:27:45 +02:00
83d6d68efd
removed some parentheses, but left them in where a string was concated
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 15:25:12 +02:00
3feece56dc
Continued a bit:
- rewrote 2 multi-line single comments to one multi-line comment
- added TODO for rewriting function to closure (CR request)

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 15:14:39 +02:00
cf4bacdbd6
fixed spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 15:12:11 +02:00
8e1b6186f1
CR: added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 15:11:10 +02:00
d7537e7346 We only need to define the collation. 2017-04-14 12:22:36 +00:00
2930601719 it should work now 2017-04-14 11:26:47 +00:00
fdcb6d3c6f Issue 3326: We are now completely working with utf8mb4 2017-04-14 07:58:56 +00:00
a0a0885527 Merge pull request #3339 from Hypolite/issue/#2803-icons
Change icon of contact page links
2017-04-14 07:35:16 +02:00
b8fd48dddc Merge pull request #3335 from annando/issue-3331
Issue 3331: Remove unneeded table "deliverq"
2017-04-14 07:32:30 +02:00
Michael Vogel
79e827417c Merge pull request #3319 from Hypolite/issue/#3316
Use get_contact_by_url for unknown contacts in acl_lookup
2017-04-14 07:24:27 +02:00
Hypolite Petovan
440fd29c1e Change icon of contact page links 2017-04-13 23:00:02 -04:00
Hypolite Petovan
bffd3f2304 Add htmlentities to protect nick/addr in acl_lookup 2017-04-13 18:33:40 -04:00
Hypolite Petovan
ad53764832 Merge pull request #3338 from annando/issue-3336
Issue 3336: The date format should now be okay
2017-04-13 15:48:25 -04:00
319284c665 Issue 3336: The date format should now be okay 2017-04-13 19:25:00 +00:00
d5c6f67a4a Changed documentation 2017-04-13 19:10:53 +00:00
Hypolite Petovan
879ebb1d7f Merge pull request #3330 from Rudloff/feature/keypress
Scroll to next/previous thread when pressing j/k (fixes #3327)
2017-04-13 11:42:45 -04:00
Hypolite Petovan
615295c3fe Merge pull request #3332 from Rudloff/feature/manifest
Web app manifest (fixes #3317)
2017-04-13 11:42:03 -04:00
Pierre Rudloff
8567113f0f Doc about j/k keyboard shortcuts 2017-04-13 17:20:05 +02:00
Pierre Rudloff
ead9cbe534 Web app manifest (fixes #3317) 2017-04-13 16:46:36 +02:00
Pierre Rudloff
31f9b418ba Scroll to next/previous thread when pressing j/k (fixes #3327) 2017-04-13 15:16:49 +02:00
Pierre Rudloff
d0407f8b76 theme-color meta 2017-04-13 12:03:02 +02:00
2b3a129480 Removed it here as well 2017-04-13 05:08:42 +00:00
f399a1914f Removed documentation 2017-04-13 05:08:12 +00:00
d82684219a Issue 3331: Removed unneeded table "deliverq" 2017-04-13 04:51:16 +00:00
Michael Vogel
93fe0188a7 Merge pull request #3329 from Alkarex/sql-type-contact.contact-type
Allow negative contact.contat-type
2017-04-13 06:44:41 +02:00
Hypolite Petovan
96b1a00e91 Fiddling with the unknown contact array values 2017-04-12 21:32:06 -04:00
Alexandre Alapetite
92361a0209 Bump update version 2017-04-12 23:20:10 +02:00
Alexandre Alapetite
325d3afe18 Bump DB version 2017-04-12 23:14:33 +02:00
Alexandre Alapetite
b8e4094e7b Allow negative contact.contat-type
https://github.com/friendica/friendica/issues/3328
2017-04-12 23:09:22 +02:00
Alexandre Alapetite
38e7a0f793 Fix GROUP BY for search
https://github.com/friendica/friendica/issues/3322
Fix MySQL ERROR 1055 (42000): Expression #1 of SELECT list is not in
GROUP BY clause and contains nonaggregated column
'friendica.item.author-id' which is not functionally dependent on
columns in GROUP BY clause; this is incompatible with
sql_mode=only_full_group_by
2017-04-12 22:55:02 +02:00
Alexandre Alapetite
534ea6aefc Fix ping_init SQL
According to review
https://github.com/friendica/friendica/pull/3323#pullrequestreview-32401628
2017-04-12 18:54:54 +02:00
Alexandre Alapetite
9fb4ba2b73 Fix profile wrong DISTINCT + ORDER BY
Fix: ERROR 3065 (HY000) Expression #1 of ORDER BY clause is not in
SELECT list, references column 'friendica.item.created' which is not in
SELECT list; this is incompatible with DISTINCT
2017-04-12 18:49:29 +02:00
Alexandre Alapetite
3500190e41 Default to utf8mb4
https://github.com/friendica/friendica/issues/3324
2017-04-12 16:49:05 +02:00