1
0
Fork 0
Commit graph

14471 commits

Author SHA1 Message Date
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
49834676c7 Bugfix issue 3116: Only allowed themes are displayed 2017-01-31 05:14:32 +00:00
Matthew Exon
96aadb23f8 Change $allowed_src_protocols to static 2017-01-31 03:44:32 +00:00
dae125e8ee Issue 3135: dbupdate is started again and again 2017-01-30 21:18:08 +00:00
Matthew Exon
ce10a9aa7f Break out list of acceptable protocols in "src" attribute into separate variable similar to "href" attributes 2017-01-30 15:48:12 +00:00
080233b9b9 Merge pull request #3137 from rabuzarus/20170130_-_fix_meta_element_in_display_module
Bugfix: fix the author image in the meta elements in html head (display module)
2017-01-30 15:56:41 +01:00
b6f64182a8 Merge pull request #3136 from rabuzarus/20170130_vier_photo_album
style the photo album page of the vier theme
2017-01-30 15:55:58 +01:00
rabuzarus
6d01dd83fe Bugfix: fix the author image in the meta elements in html head (display module) 2017-01-30 15:23:44 +01:00
rabuzarus
ec4e60ce3a style the photo album page of the vier theme 2017-01-30 15:00:26 +01:00
dd36b2bded Merge pull request #3128 from annando/bugfix-no-self-destroy
Bugfix: Sometimes the self contact seems to destroy itself
2017-01-30 09:11:10 +01:00
63e71ff297 Merge pull request #3127 from annando/bugfix-ssl-issues
Bugfix: The SSL policy setting was not respected
2017-01-30 08:46:25 +01:00
0b04e0383c Merge pull request #3132 from annando/1701-remove-duplicates
Adding unique indexes should now work with every MySQL flavour
2017-01-30 08:40:26 +01:00
Matthew Exon
d99a96ef49 Global is an integer, do not set it to an empty string 2017-01-30 00:56:21 +00:00
7ca809a00e Addind unique indexes should now work with every MySQL flavour 2017-01-29 17:31:20 +00:00
ac88471e55 Make the code nicer 2017-01-29 14:00:44 +00:00
c1eea3771f Bugfix: Sometimes the self contact seems to destroy itself 2017-01-29 13:57:03 +00:00
ae849954cc Bugfix: The SSL policy setting was not respected 2017-01-29 13:50:57 +00:00