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
9251d2af6f
Ensure that the spool path is set
2017-02-19 10:13:40 +00:00
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
5e46b8315a
DE translations
2017-02-17 10:14:38 +01:00
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
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
03653072a2
We have to delete spool files after posting in any case
2017-02-16 20:23:07 +00:00
531074a72f
Handle the case when a contact is unknown.
2017-02-16 20:03:44 +00:00
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
Michael Vogel
043449c24b
Merge pull request #3164 from tobiasd/20170215-quattro
...
fix for less file of quattro, regen CSS
2017-02-16 06:26:54 +01:00
Hypolite Petovan
be7041c3e0
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
2017-02-15 22:00:02 -05:00
90b5cbe71c
More analytics to analyze the reason for constantly changing temp paths
2017-02-15 21:46:29 +00:00
fabrixxm
b5b1f1e814
Merge pull request #3165 from tobiasd/20170215-sv
...
SV update to the strings
2017-02-15 09:12:54 +01:00
7e1f51b0f9
SV update to the strings
2017-02-15 08:13:06 +01:00
51a6903b4c
fix for less file of quattro, regen CSS
2017-02-15 07:55:30 +01:00
78715c8671
Merge pull request #3162 from annando/bugfix-spooling
...
Bugfix: Only delete spool files that are spool files
2017-02-15 07:29:38 +01:00
7ba5228814
Bugfix: Only delete spool files that are spool files
2017-02-14 21:13:00 +00:00
rabuzarus
3fbf3af343
Merge pull request #3161 from annando/logging-diaspora-relay
...
Better logging to analyze unwanted messages from Diaspora
2017-02-12 00:56:11 +01:00
e5e6f4fd19
Better logging to analyze unwanted messages from Diaspora
2017-02-11 23:37:15 +00:00
a4dcd8be55
Merge pull request #3159 from annando/bugfix-diaspora-relay
...
Bugfix: Only accept postings from anyone when the relay is configured
2017-02-11 08:58:38 +01:00
Michael Vogel
27fe4ae2a4
Merge pull request #3156 from rabuzarus/20170210_-_fix_pending_contacts_in_viewcontacts
...
Bugfix: pending contacts shouldn't be available in contacts widget and viewcontacts
2017-02-10 21:51:17 +01:00
40390cc5ec
Diaspora Relay: Only accept postings from anyone when the relay is configured
2017-02-10 20:45:22 +00:00
rabuzarus
3474b40732
fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts
2017-02-10 03:51:01 +01:00
8d2c74eb3c
Merge pull request #3154 from rabuzarus/20170208_-_frio_fix_form_group_search_buttons
...
Bugfix: frio - fix text of input elements disappears behind the button
2017-02-09 10:20:52 +01:00
rabuzarus
ad6ba9203e
fix typo
2017-02-08 18:05:23 +01:00
rabuzarus
dd752189f1
frio - fix text of input elements disappears behind the button
2017-02-08 17:50:59 +01:00
fabrixxm
2536bd4f56
Merge pull request #3153 from tobiasd/20170208-quattroembedvideo
...
remove float left to fix issue 2987 in quattro theme
2017-02-08 09:34:28 +01:00
e223fee40d
remove float left to fix issue 2987 in quattro theme
2017-02-08 07:21:19 +01:00
c574bc5538
Merge pull request #3151 from rabuzarus/20170203_-_frio_fix_tabbar_glitch
...
Bugfix: frio - fix tabbar on mobile view
2017-02-08 06:35:15 +01:00
3adbbd6689
Merge pull request #3152 from rabuzarus/20170208_-_fix_oembed_video_floating
...
Bugfix: for "embedded videos are cut off" #2987
2017-02-08 06:33:44 +01:00
rabuzarus
d27c8f4932
fix oembeded video floating
2017-02-08 02:18:42 +01:00
rabuzarus
60ef105a14
frio - fix tabbar on mobile view
2017-02-08 01:34:36 +01:00
3c5f7e457a
Merge pull request #3149 from annando/1601-new-diaspora-mention
...
Support for the new Diaspora mention format
2017-02-05 16:38:09 +01:00
e9d719a299
removed to-do
2017-02-05 07:02:20 +00:00
9f706fcfbb
Add include
2017-02-04 22:27:49 +00:00
0d1f88033b
Support for the new Diaspora mention format
2017-02-04 22:22:12 +00:00
2092fa03b2
Merge pull request #3147 from rebeka-catalina/vier_dark_item_links
...
Vier dark item links
2017-02-03 20:28:39 +01:00
