Tobias Diekershoff
ed675b94d1
Merge pull request #3185 from annando/3.5.1rc
...
New version string for RC
2017-02-24 19:29:37 +01:00
Michael
21a6d7b31f
Merge branch '3.5.1rc' of github.com:annando/friendica into 3.5.1rc
2017-02-24 15:14:19 +00:00
Michael
bd793e5987
New version string for RC
2017-02-24 15:02:16 +00:00
Michael Vogel
7edb18dd30
Merge pull request #3184 from tobiasd/20170224-doc
...
coding standard for the docs
2017-02-24 08:50:30 +01:00
Tobias Diekershoff
4a3a61c594
coding standard for the docs
2017-02-24 08:37:36 +01:00
Michael Vogel
4d591c4a07
Merge pull request #2841 from Hypolite/issue/#2103-alt
...
Issue/#2103 alt - define coding standards for Friendica
2017-02-24 07:46:29 +01:00
Michael Vogel
45ebeba643
Merge pull request #2916 from tobiasd/20160925-changes
...
updateing credits and CHANGELOG
2017-02-24 07:46:07 +01:00
Tobias Diekershoff
0d1c8139ae
Merge pull request #3182 from annando/bugfix-sql-date
...
Bugfix for badly formatted date time string
2017-02-24 06:28:32 +01:00
Michael
ca6171eb5c
For 3.5.1 use "0000-00-00 00:00:00" as lowest datetime value
2017-02-23 07:21:47 +00:00
Michael
06b16cce8b
Define the lowest possible datetime string as "0001-01-01 00:00:00"
2017-02-23 07:09:55 +00:00
Michael
f9f27c2f5f
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-23 06:55:35 +00:00
Michael
8986edf070
Merge remote-tracking branch 'upstream/develop' into bugfix-sql-date
2017-02-23 06:54:50 +00:00
Tobias Diekershoff
55288e8e6e
Merge pull request #3173 from annando/more-temp-stuff
...
Workaround for not createable spool path
2017-02-23 07:15:46 +01:00
Michael
ffeae7e048
Bugfix for bugfix :-)
2017-02-23 05:45:06 +00:00
Michael
c84565633e
Added check for invalid "contact-type"
2017-02-22 22:25:35 +00:00
Michael
194d80c326
Bugfix for badly formatted date time string.
2017-02-22 22:04:56 +00:00
rabuzarus
ca7c608161
Merge pull request #3181 from tobiasd/20170222-docinstall
...
sql_mode setting in code block
2017-02-22 13:53:21 +01:00
rabuzarus
0c22e9a1fe
Merge pull request #3177 from annando/disable-fulltext
...
See issue 3157: Fulltext is now disabled
2017-02-22 13:51:53 +01:00
Michael Vogel
f859824ed9
Merge pull request #3179 from tobiasd/20170222-docquickstarten
...
EN quickstart had some dead links in it, DE version is ok
2017-02-22 12:35:27 +01:00
Tobias Diekershoff
4de6ef1610
make it a code block
2017-02-22 09:37:00 +01:00
Michael
451d83c417
Merge remote-tracking branch 'upstream/develop' into more-temp-stuff
2017-02-22 06:38:56 +00:00
Tobias Diekershoff
79c2234cc1
EN quickstart had some dead links in it, DE version is ok
2017-02-22 07:21:36 +01:00
Tobias Diekershoff
429d884c51
regen credits
2017-02-21 21:31:31 +01:00
Tobias Diekershoff
30b4da37fc
Merge pull request #3178 from eelcomaljaars/sql_mode_doc_update
...
Added note about MySQL sql_mode on newer versions of MySQL
2017-02-21 19:57:25 +01:00
Eelco Maljaars
d9d4a0ccc4
Document reformat as requested - 1 sentence per line
2017-02-21 19:32:03 +01:00
Eelco Maljaars
32660b64a7
Added note about MySQL sql_mode on newer versions of MySQL
2017-02-21 15:59:12 +01:00
Michael
cec79ddf2b
See issue 3157: Fulltext is now disabled
2017-02-21 05:23:37 +00:00
Tobias Diekershoff
90267a7ab7
issues and stuff
2017-02-20 14:09:32 +01:00
Michael
564bc22900
Merge remote-tracking branch 'upstream/develop' into more-temp-stuff
2017-02-19 18:46:20 +00:00
Michael Vogel
82ebc673a0
Merge pull request #3171 from Hypolite/bug/fix-diaspora-attachment-links
...
Bug/fix diaspora attachment links
2017-02-19 19:44:20 +01:00
Michael Vogel
6bc657f398
Merge pull request #3176 from eelcomaljaars/sql_mode_doc_update
...
Sql mode doc update
2017-02-19 19:41:17 +01:00
Eelco Maljaars
38aea0aeac
Typos fixed
2017-02-19 16:36:40 +01:00
Eelco Maljaars
36265d984e
Ran into an installation problem today that is linked to newer MySQL builds
...
This commit expands the INSTALL.txt with notes when this problem arises and
how it should be handled. In the end the database code should probably be fixed
but this should help in the short term.
2017-02-19 15:53:29 +01:00
Eelco Maljaars
a32431e693
Added missing mbstring php module to xenial setup in vagrant
2017-02-19 15:44:48 +01:00
Michael
9251d2af6f
Ensure that the spool path is set
2017-02-19 10:13:40 +00:00
Michael
2bfc40d74c
Bugfix for not createable spool path
2017-02-19 08:23:21 +00:00
Hypolite Petovan
58a444b430
Add original_url() param documentation
2017-02-18 20:39:16 -05:00
Hypolite Petovan
2c959b925d
Add param documentation
2017-02-18 20:35:31 -05:00
rabuzarus
4264518859
Merge pull request #3170 from tobiasd/20170217-de
...
DE translations
2017-02-18 15:20:14 +01:00
rabuzarus
d27b342f7d
Merge pull request #3167 from Hypolite/bug/comment-box-undefined
...
Bug comment box undefined
2017-02-18 13:29:39 +01:00
Hypolite Petovan
432587464c
Fix Diaspora link attachment probe
...
- Move analytics param stripping out of original_url
- Remove HEAD curl request in ParseUrl::getSiteInfo
- Replace original_url with strip_tracking_query_params in
ParseUrl::getSiteInfo to prevent massive curl fest in border cases
2017-02-17 22:35:46 -05:00
Hypolite Petovan
99cfae63d7
Clean trailing whitespaces
2017-02-17 22:32:33 -05:00
Hypolite Petovan
e61301a403
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
2017-02-17 20:44:57 -05:00
Tobias Diekershoff
5e46b8315a
DE translations
2017-02-17 10:14:38 +01:00
Tobias Diekershoff
e647aa8846
Merge pull request #3169 from annando/bugfix-delete-spool
...
We have to delete spool files after posting in any case
2017-02-17 08:04:22 +01:00
Tobias Diekershoff
6dc07514db
Merge pull request #3168 from annando/bugfix-contact-posts
...
posts_from_contact_url: Handle the case when a contact is unknown.
2017-02-17 08:03:15 +01:00
Michael
03653072a2
We have to delete spool files after posting in any case
2017-02-16 20:23:07 +00:00
Michael
531074a72f
Handle the case when a contact is unknown.
2017-02-16 20:03:44 +00:00
Tobias Diekershoff
ce953e5882
Merge pull request #3166 from annando/bugfix-tempdir
...
More analytics to analyze the reason for constantly changing temp paths
2017-02-16 16:58:18 +01:00
Hypolite Petovan
3cdfaa4fad
[frio] Fix comment box not opening on focus, undefined on blur
...
- Remove the callback system for commentOpenUI
- Remove comments
Fixes #3062
2017-02-16 07:06:11 -05:00
