Commit graph

14378 commits

Author SHA1 Message Date
40390cc5ec Diaspora Relay: Only accept postings from anyone when the relay is configured 2017-02-10 20:45:22 +00:00
f5a634abbc Changed server detection. 2017-02-10 19:23:46 +00:00
95bb8d38e8 Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-02-10 19:18:03 +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
6dfe2c6c9b theme work 2017-02-08 10:43:49 +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
de255891d4 some work done 2017-02-08 06:37:31 +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
6dd27b83ef Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-02-06 21:28:42 +00: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
21accc0a53 Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-02-04 16:28:36 +00:00
9c4a53e380 Optimized query for nodeinfo, better way to analyze posting problems with DFRN 2017-02-04 16:16:15 +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
efc25f744a Merge pull request #3148 from rabuzarus/20170203_-_frio_fix_tabbar_glitch
Bugfix: frio - the tabbar should be hidden if it is a dirict child of the section element
2017-02-03 20:28:23 +01:00
rabuzarus
7f1acdb8e9 frio - append tabbar to nav only if it's a direct child of section 2017-02-03 19:37:47 +01:00
rabuzarus
c12850250d Bugfix: frio - move tabs to the top of the contacts-template 2017-02-03 19:18:10 +01:00
rebeka-catalina
39da1f1d03 Update dark.css 2017-02-03 19:07:39 +01:00
rabuzarus
a71f7aefbb Bugfix: frio - the tabbar should be hidden if it is in the section element 2017-02-03 19:00:55 +01:00
rebeka-catalina
2483e7cda7 Make links visually different from normal text 2017-02-03 19:00:04 +01:00
Michael Vogel
2c71d307c8 Merge pull request #3141 from tobiasd/20170201-htconfig
make sure all config done with the installer is represented in the emergency backup template as well
2017-02-02 09:40:05 +01:00
adedf18b30 Merge pull request #3146 from annando/1701-pnut
Preparation to add the social network "pnut"
2017-02-02 09:10:28 +01:00
5ffef9c96d Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-02-02 06:27:10 +00:00
275a1c6574 Preparation to add the social network "pnut" 2017-02-02 06:06:23 +00:00
9a19ae7ce1 The queue now works with the cache - whoch should speed it up 2017-02-02 05:52:45 +00:00
ef0fb5148c Some more timeout checks 2017-02-01 21:35:01 +00:00
2f00683b77 Merge pull request #3144 from annando/bugfix-index
Bugfix: An index was missing
2017-02-01 22:34:11 +01:00
8a75a20d26 Bugfix: An index was missing 2017-02-01 21:08:13 +00:00
f6e1fbfcaa Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-02-01 17:29:20 +00:00
39136b6485 Merge pull request #3143 from annando/develop
Bugfix for pull request 3125
2017-02-01 16:33:48 +01:00
da30538a98 Bugfix for pull request 3125 2017-02-01 13:50:05 +00:00
7a89d06465 Make sure that we only quit when we are sure we can 2017-02-01 08:43:18 +00:00
94694aae86 RInO is not true / false anymore 2017-02-01 08:45:13 +01:00
a9b3c6d9d7 make sure all config done with the installer is represented in the emergency backup template as well 2017-02-01 08:26:22 +01:00
bf7314e46e Revert "make sure all config done with the installer is represented in the emergency backup template as well"
This reverts commit d78201cf50.
2017-02-01 08:24:51 +01:00
d78201cf50 make sure all config done with the installer is represented in the emergency backup template as well 2017-02-01 08:23:41 +01:00
7324a661f1 Optimized timeouts during network operations 2017-02-01 00:15:37 +00:00
2424cb78d1 Only process feed and dfrn items when they aren't already stored 2017-01-31 19:39:09 +00:00
793b3c2026 some issues done 2017-01-31 19:56:59 +01:00
44bd890645 Merge pull request #3140 from annando/issue-3116
Bugfix issue 3116: Only allowed themes are displayed
2017-01-31 07:36:25 +01:00
4c1292f171 Merge pull request #3139 from annando/issue-3135
Issue 3135: dbupdate is started again and again
2017-01-31 07:30:15 +01:00