|
|
3bf7c9c7a1
|
Merge pull request #1238 from annando/1412-prevent-span-problem
1412 prevent span problem
|
2014-12-07 10:41:14 +01:00 |
|
|
|
c29ff719ec
|
Merge pull request #1239 from annando/1412-prevent-parsing-problems
1412 prevent parsing problems
|
2014-12-07 10:39:28 +01:00 |
|
Michael Vogel
|
a321da8511
|
Merge pull request #1240 from silke/breathe
Use a sans-serif font-family in breathe
|
2014-12-06 20:22:45 +01:00 |
|
Silke Meyer
|
f493252ac8
|
Use a sans-serif font-family in breathe
|
2014-12-06 20:05:30 +01:00 |
|
Michael Vogel
|
0bfe57bb48
|
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
|
2014-12-01 23:32:23 +01:00 |
|
Michael Vogel
|
8b5412068e
|
When selecting forums there was an added "span" html element.
|
2014-12-01 22:56:41 +01:00 |
|
Michael Vogel
|
9124d922e9
|
In "parse_url" now links with [ or ] are replaced with shortened versions to avoid parsing problems.
|
2014-12-01 22:54:01 +01:00 |
|
Michael Vogel
|
0c60eb18f7
|
Some more typical tracking parameter is removed
|
2014-12-01 22:52:51 +01:00 |
|
Michael Vogel
|
d2d3804e09
|
If a link contains BBCode stuff, make a short link out of this to avoid parsing problems
|
2014-12-01 22:51:41 +01:00 |
|
Michael Vogel
|
e475cf131d
|
When a post contains a picture then a picture in the added information is displayed only as a small preview picture.
|
2014-12-01 22:49:35 +01:00 |
|
Michael Vogel
|
7b26aa2b84
|
When exporting shared posts to diaspora now removed hashtags will be added again.
|
2014-12-01 22:45:13 +01:00 |
|
|
|
766915061c
|
Merge pull request #1227 from annando/1411-api-throttling
API: Possibility of throttling when posting limit is reached
|
2014-11-22 07:38:06 +01:00 |
|
Michael Vogel
|
a3f7578085
|
Merge branch 'develop' of github.com:annando/friendica into 1409-shadow-items
|
2014-11-19 00:19:30 +01:00 |
|
Michael Vogel
|
f8f7cc9292
|
API: Possibilty of throttling when posting limit is reached
|
2014-11-18 23:55:45 +01:00 |
|
fabrixxm
|
2b65d77685
|
Updage CHANGELOG
|
2014-11-16 13:47:35 +01:00 |
|
fabrixxm
|
774ee9c8c7
|
Merge pull request #1226 from annando/1411-bugfix-dfrn-notify
Urgent Bugfix: Error when delivering Friendica content
|
2014-11-16 13:14:45 +01:00 |
|
Michael Vogel
|
9a414cc4a0
|
Bugfix: There was a SQL error when trying to deliver friendica posts because of a parameter mismatch
|
2014-11-15 19:21:54 +01:00 |
|
fabrixxm
|
d24fd35473
|
Merge pull request #1225 from tobiasd/20141113a
applying the removal of that host from the German /help as well
|
2014-11-13 08:41:07 +01:00 |
|
|
|
efab6031d5
|
applying the removal of that host from the German /help as well
|
2014-11-13 08:28:49 +01:00 |
|
|
|
a3ae3c9156
|
Merge pull request #1224 from beardy-unixer/development
Move a hub that's no longer a Friendica hub from the doco. This is
|
2014-11-11 08:30:55 +01:00 |
|
Thomas Willingham
|
ba2567fdf3
|
Move a hub that's no longer a Friendica hub from the doco. This is
also listed in the German entries. I left it there for somebody
German to fix because it can't be easily removed.
|
2014-11-11 00:43:04 +00:00 |
|
Michael Vogel
|
1d512f3ba2
|
Merge pull request #1223 from fabrixxm/issue/1222
Issue/1222
|
2014-11-10 16:01:13 +01:00 |
|
Fabrixxm
|
2fee5966f1
|
fix #1222
|
2014-11-10 15:37:52 +01:00 |
|
Fabrixxm
|
84e93602de
|
small indentation fix
|
2014-11-10 15:07:35 +01:00 |
|
fabrixxm
|
fd61391e3e
|
Merge pull request #1221 from annando/1411-default-value-type
Fix: "not null" fields were not set
|
2014-11-10 09:57:42 +01:00 |
|
Michael Vogel
|
5379e07c4e
|
Setting default values for all database fields.
|
2014-11-09 13:29:27 +01:00 |
|
|
|
3069e5eb1a
|
Merge pull request #1219 from annando/1411-hostname
It is now possible to define the hostname from the admin page.
|
2014-11-09 09:18:17 +01:00 |
|
Michael Vogel
|
9172ea2246
|
Some more values that need to be set to avoid SQL warnings.
|
2014-11-09 01:13:07 +01:00 |
|
Michael Vogel
|
030784ad35
|
Fix for issue "Field 'type' doesn't have a default value" in the challenge table.
|
2014-11-08 20:52:15 +01:00 |
|
Michael Vogel
|
70ba1667e1
|
It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions.
|
2014-11-08 00:07:21 +01:00 |
|
fabrixxm
|
d81289c58b
|
Merge branch 'master' into develop
|
2014-11-06 20:53:49 +01:00 |
|
fabrixxm
|
ac29e831b2
|
Merge branch 'release-3.3.1'
|
2014-11-06 20:43:38 +01:00 |
|
fabrixxm
|
86c8362bb8
|
Bump version to 3.3.1. Add CHANGELOG file
|
2014-11-06 20:31:27 +01:00 |
|
fabrixxm
|
3c6bfe6033
|
Merge pull request #1217 from annando/1411-newlines-beyand-attachments
Suppress newlines beneath attachments
|
2014-11-03 14:18:25 +01:00 |
|
Michael Vogel
|
cd0bdd7dd2
|
Merge pull request #1216 from cpfeiffer/TinyMCE-resizable
Make TinyMCE editors resizable
|
2014-11-03 01:00:05 +01:00 |
|
Michael Vogel
|
3eed5bbd3e
|
Further improvement for newlines after attachments
|
2014-11-02 18:39:23 +01:00 |
|
Michael Vogel
|
14ea4b972e
|
BBCode: Newlines under attachments are now removed
|
2014-11-02 17:35:49 +01:00 |
|
Carsten Pfeiffer
|
00c16b387a
|
Make TinyMCE editors resizable
|
2014-11-01 22:18:42 +01:00 |
|
Fabrixxm
|
a32682d78c
|
Merge branch 'develop' into release-3.3.1
|
2014-10-31 14:50:46 +01:00 |
|
fabrixxm
|
a818ed2d49
|
Merge pull request #1213 from annando/1410-keyword-blacklist
Blacklist for generating hashtags from keywords
|
2014-10-31 14:40:27 +01:00 |
|
Michael Vogel
|
5e303f9905
|
Removed some more special characters from hashtags
|
2014-10-30 11:33:33 +01:00 |
|
Michael Vogel
|
691aa17025
|
fetch further information: it is now possible to define a blacklist for keywords for "fetch further information"
|
2014-10-30 00:24:23 +01:00 |
|
|
|
ec4e3d76bc
|
Merge pull request #1212 from annando/1410-remote-self
Remote-Self is now working for Friendica and Diaspora contacts as well
|
2014-10-29 15:06:21 +01:00 |
|
Michael Vogel
|
17f87ef9b2
|
Remote-self: It does only make sense to check for duplicates from friendica
|
2014-10-29 08:24:05 +01:00 |
|
Michael Vogel
|
59517f6e58
|
Remote self is now working for diaspora contacts as well.
|
2014-10-29 01:42:43 +01:00 |
|
Michael Vogel
|
338ad1d85f
|
Additional check for repeated posts
|
2014-10-29 01:31:29 +01:00 |
|
Michael Vogel
|
3e57954807
|
remote-self: Moved the code in a single function and cleaned it up.
|
2014-10-29 01:05:09 +01:00 |
|
Michael Vogel
|
01cb340752
|
Let remote-self posts appear as own posts - for test reasons
|
2014-10-28 22:10:58 +01:00 |
|
Michael Vogel
|
e46f597b00
|
Remote-self functionality added at another place - time for a separated function. (tbd)
|
2014-10-28 08:30:04 +01:00 |
|
Michael Vogel
|
f4860d3fd0
|
Remote-self: relocated the code (may now work?)
|
2014-10-27 21:44:30 +01:00 |
|
