|
|
e29d7f19d1
|
Merge pull request #3222 from Hypolite/issue/#3220
Diaspora: Normalize line endings instead of adding <br> before Markdown()
|
2017-03-12 15:35:42 +01:00 |
|
|
|
30d82f4391
|
mark the develop version in the version string
|
2017-03-12 14:40:08 +01:00 |
|
|
|
4cddb74f27
|
Merge branch 'master' into develop
|
2017-03-12 14:39:09 +01:00 |
|
|
|
2bfa870c47
|
Friendica Version 3.5.1
|
2017-03-12 14:38:01 +01:00 |
|
Hypolite Petovan
|
2310bf994a
|
Normalize line endings instead of adding <br> before Markdown()
|
2017-03-12 03:55:22 -04:00 |
|
Hypolite Petovan
|
3fa4605ace
|
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
|
2017-03-09 21:11:14 -05:00 |
|
fabrixxm
|
3f6fd8ee69
|
Merge pull request #3208 from Hypolite/issue/#3194
Strip @hubzilla.server part from guid for autoscrolling purpuses
|
2017-03-09 09:37:21 +01:00 |
|
|
|
9cbab5cd7a
|
Merge pull request #3212 from annando/followup2-profile
Second followup for profile issue
|
2017-03-05 13:29:48 +01:00 |
|
Michael Vogel
|
7867f6fcef
|
Merge pull request #3211 from tobiasd/3.5.1rc
DE translation and one solved issue for the CHANGELOG
|
2017-03-05 13:09:28 +01:00 |
|
|
|
67dda52f4b
|
issue solved
|
2017-03-05 12:41:02 +01:00 |
|
|
|
5097c74d21
|
DE translations
|
2017-03-05 12:40:31 +01:00 |
|
|
|
2775adfdf5
|
Second followup for profile issue
|
2017-03-05 11:07:10 +00:00 |
|
|
|
ad9303868b
|
Merge pull request #3209 from annando/followup-3196
Follow up for issue 3196: We need an index hint for performance issues
|
2017-03-04 09:41:00 +01:00 |
|
|
|
8690b97c27
|
Follow up for issue 3196: We need an index hint for performance issues
|
2017-03-04 08:25:47 +00:00 |
|
Hypolite Petovan
|
3ea830e221
|
Strip @hubzilla.server part from guid for autoscrolling purpuses
|
2017-03-03 21:45:36 -05:00 |
|
Michael Vogel
|
9ccb6072b8
|
Merge pull request #3205 from tobiasd/20170226-issue3187
Bugfix issue 3187
|
2017-03-03 21:36:37 +01:00 |
|
|
|
1d667d7a45
|
tag change
|
2017-03-03 17:18:09 +01:00 |
|
|
|
0d83082343
|
regenerated master messages.po file
|
2017-03-03 10:31:10 +01:00 |
|
|
|
2fa9f76e67
|
better wording and placeholder for name
|
2017-03-03 10:28:29 +01:00 |
|
Michael Vogel
|
372b660aa1
|
Merge pull request #3201 from tobiasd/20170302-changelog
issues solved
|
2017-03-02 10:16:14 +01:00 |
|
|
|
3476820529
|
issues solved
|
2017-03-02 09:05:24 +01:00 |
|
|
|
e66ad9d6bd
|
Merge pull request #3199 from annando/issue-3196
Bugfix Issue 3196: Not all forum posts weren't shown
|
2017-03-02 07:29:45 +01:00 |
|
|
|
5c92e97173
|
Added index for performance issues
|
2017-03-02 05:46:44 +00:00 |
|
|
|
3ab845dcf3
|
Issue 3196: Not all forum posts weren't shown
|
2017-03-01 21:47:10 +00:00 |
|
Michael Vogel
|
c23298b4c9
|
Merge pull request #3193 from tobiasd/20170228-CHANGELOG
this line is superfluous by now
|
2017-02-28 09:30:35 +01:00 |
|
|
|
59bfc3f4a8
|
this line is superfluous by now
|
2017-02-28 08:21:33 +01:00 |
|
|
|
1046f2573c
|
Merge pull request #3192 from annando/gstools-isnt-anymore
The service at gstools.org doesn't exist anymore.
|
2017-02-28 07:35:04 +01:00 |
|
|
|
c829dc8e71
|
The service at gstools.org doesn't exist anymore.
|
2017-02-28 06:26:50 +00:00 |
|
|
|
7442ce3d6d
|
change Fan/Admirer to Subscriber
|
2017-02-26 16:47:11 +01:00 |
|
|
|
86c6c48bd8
|
Merge pull request #3190 from annando/bugfix-dbstructure
Bugfix: "ALTER IGNORE" was missing on structure and index alteration
|
2017-02-26 10:05:02 +01:00 |
|
|
|
6bd59cd094
|
Bugfix: "ALTER IGNORE" was missing on structure and index change
|
2017-02-26 08:36:05 +00:00 |
|
|
|
b850eb248a
|
Merge pull request #3188 from annando/bugfix-fetch_url
Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic
|
2017-02-26 04:19:22 +01:00 |
|
|
|
da8a48f89e
|
Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic
|
2017-02-25 13:59:24 +00:00 |
|
Michael Vogel
|
450b1fa6ff
|
Merge pull request #3186 from tobiasd/20170224-changelog
small update for the CHANGELOG
|
2017-02-25 00:17:10 +01:00 |
|
|
|
3f27c8bb0a
|
issues closed
|
2017-02-24 19:41:07 +01:00 |
|
|
|
ed675b94d1
|
Merge pull request #3185 from annando/3.5.1rc
New version string for RC
|
2017-02-24 19:29:37 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ca6171eb5c
|
For 3.5.1 use "0000-00-00 00:00:00" as lowest datetime value
|
2017-02-23 07:21:47 +00:00 |
|
|
|
06b16cce8b
|
Define the lowest possible datetime string as "0001-01-01 00:00:00"
|
2017-02-23 07:09:55 +00:00 |
|
|
|
8986edf070
|
Merge remote-tracking branch 'upstream/develop' into bugfix-sql-date
|
2017-02-23 06:54:50 +00:00 |
|
|
|
55288e8e6e
|
Merge pull request #3173 from annando/more-temp-stuff
Workaround for not createable spool path
|
2017-02-23 07:15:46 +01:00 |
|
|
|
ffeae7e048
|
Bugfix for bugfix :-)
|
2017-02-23 05:45:06 +00:00 |
|
|
|
c84565633e
|
Added check for invalid "contact-type"
|
2017-02-22 22:25:35 +00:00 |
|
|
|
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 |
|
