clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,152 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

15152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hypolite Petovan 2c69d36886 Remove extra htmlentities in notifications 2017-04-18 19:34:46 -04:00
Hypolite Petovan 83ab3e3307 Skip lang file search if lang=en 2017-04-18 19:21:26 -04:00
Hypolite Petovan d94e930065 Merge pull request #3354 from annando/issue-3157 
Issue 3157: No fulltext anymore
 2017-04-18 16:31:15 -04:00
Hypolite Petovan f1aed292db Merge pull request #3353 from annando/1704-empty-contacts 
Handle the case when the given contact url or address is empty
 2017-04-18 16:20:33 -04:00
Michael 33d5e5b818 Issue 3157: No fulltext anymore 2017-04-18 20:09:05 +00:00
Alexandre Alapetite 08924b9c59 Revert unneeded changes in third-party libraries 
https://github.com/friendica/friendica/pull/3326#discussion_r112039526
https://github.com/friendica/friendica/pull/3326#discussion_r112039589
 2017-04-18 21:21:29 +02:00
Michael 828ae671f0 Handle the case when the given contact url or address is empty 2017-04-18 18:50:01 +00:00
Hypolite Petovan 08209419aa Merge pull request #3352 from annando/issue-3351 
Issue 3351: Check if resource was created
 2017-04-18 13:48:47 -04:00
Michael 806f395724 Issue 3351: Check if resource was created 2017-04-18 17:17:15 +00:00
Hypolite Petovan c02d801440 Merge pull request #3350 from annando/1704-resubmit-directory 
Resubmit all profiles on directory change
 2017-04-18 00:03:22 -04:00
Michael 47fd9226c3 Resubmit all profiles on directory change 2017-04-17 21:39:11 +00:00
Hypolite Petovan 1955d3d1b8 Merge pull request #3349 from annando/1704-api-owner 
API: The "friendica-owner" has only to be different from the user on starting posts
 2017-04-17 13:00:58 -04:00
Michael 1681d18693 API: The "friendica-owner" has only to be different from the user on starting posts 2017-04-17 14:38:13 +00:00
Hypolite Petovan 7cfe83fd24 Merge pull request #3348 from Alkarex/SQL-messages-AS 
SQL AS for messages
 2017-04-17 09:03:20 -04:00
Alexandre Alapetite d1888ac05c SQL AS for messages 
Fix bug introduced in https://github.com/friendica/friendica/pull/3323
 2017-04-17 15:01:05 +02:00
rabuzarus 6a7a4591d3 Merge pull request #3333 from Rudloff/feature/theme-color 
theme-color meta
 2017-04-17 13:51:37 +02:00
Pierre Rudloff 6cd6e886db Updated theme-color code 
Add comment explaining what the code does
Remove unused include
Code standards
 2017-04-17 13:38:55 +02:00
Michael Vogel a941199760 Merge pull request #3344 from tobiasd/20170412-doc 
some words about the workers
 2017-04-17 08:11:18 +02:00
Tobias Diekershoff d5c2b9d4cd Ham 2017-04-17 07:33:12 +02:00
Alexandre Alapetite 07faa14361 Merge branch 'develop' into utf8mb4 2017-04-16 22:08:48 +02:00
Hypolite Petovan 457cec3e0d Merge pull request #3321 from Alkarex/MySQL5.7 
Fix for MySQL 5.7+ NO_ZERO_DATE
 2017-04-16 16:03:13 -04:00
Hypolite Petovan afa70bf74e Merge pull request #3345 from annando/1704-db-update-error 
Print out database error messages
 2017-04-16 16:03:06 -04:00
Alexandre Alapetite a2a03c3f70 Default UTF8MB4 for CREATE DATABASE 2017-04-16 16:04:38 +02:00
Alexandre Alapetite 5d3bf9307f More replaces UTF8 to UTF8MB4 2017-04-16 15:53:48 +02:00
Michael d80a09c9e5 Doxygen header added 2017-04-16 13:37:42 +00:00
Alexandre Alapetite c35eef625a More general date test for dob 2017-04-16 15:36:01 +02:00
Alexandre Alapetite 62768a1bb4 Bump version to 1219 
https://github.com/friendica/friendica/pull/3321#pullrequestreview-32528437
 2017-04-16 15:23:57 +02:00
Michael 3e6f501bc0 Print out database error messages 2017-04-16 13:21:49 +00:00
Alexandre Alapetite 6b250d3ae9 Merge branch 'develop' into MySQL5.7 2017-04-16 15:16:58 +02:00
Tobias Diekershoff f3393106ae typos 2017-04-16 13:59:52 +02:00
Tobias Diekershoff 5a0af71ade remote_self paragraph was missing in DE 2017-04-16 13:54:12 +02:00
Tobias Diekershoff 09da31442e Worker auf Deutsch 2017-04-16 13:47:57 +02:00
Tobias Diekershoff f4466b86e3 some EN doc about the worker 2017-04-16 13:32:41 +02:00
Tobias Diekershoff 4e5b926d23 Merge pull request #3343 from annando/1704-mastodon 
Discover Mastodon servers
 2017-04-16 10:23:07 +02:00
Michael dc0ce4e08c Discover Mastodon servers 2017-04-16 07:46:04 +00:00
Hypolite Petovan d1fd797d6e Merge pull request #3323 from Alkarex/ostatus-only_full_group_by 
Fix MySQL bugs related to only_full_group_by
 2017-04-15 18:32:50 -04:00
Alexandre Alapetite d076b39b64 Forgotten AS in mod/admin patch 2017-04-15 23:48:02 +02:00
Alexandre Alapetite 8b3f623d29 ANY_VALUE in mod/admin 
The query was not standard, not deterministic, and was not doing what
its description says. The patch makes it more standard and a bit more
deterministic. The returned protocol type is still undeterministic.
 2017-04-15 23:42:10 +02:00
Alexandre Alapetite 062070058e Move any_value_fallback() to dba class 
https://github.com/friendica/friendica/pull/3323#discussion_r111666245
 2017-04-15 17:31:32 +02:00
Alexandre Alapetite 06f374b26b Document any_value_fallback() 
https://github.com/friendica/friendica/pull/3323#discussion_r111663767
 2017-04-15 14:39:41 +02:00
Alexandre Alapetite 5007be3cf5 Use server_info to fallback from ANY_VALUE if needed 2017-04-15 12:40:32 +02:00
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
Michael 358aa1d7ef Database version updated 2017-04-14 22:34:01 +00:00
Michael e7783e2018 Merge remote-tracking branch 'upstream/develop' into issue-3326 2017-04-14 22:30:48 +00:00
Roland Häder 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
Roland Haeder fcf095cc6e
always surround operators like +,-,. with spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:43:01 +02:00
Roland Haeder 851c0284ee
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:40:49 +02:00