Commit Graph

  • be7041c3e0 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop Hypolite Petovan 2017-02-15 22:00:02 -05:00
  • 90b5cbe71c More analytics to analyze the reason for constantly changing temp paths Michael 2017-02-15 21:46:29 +00:00
  • b5b1f1e814 Merge pull request #3165 from tobiasd/20170215-sv fabrixxm 2017-02-15 09:12:54 +01:00
  • 7e1f51b0f9 SV update to the strings Tobias Diekershoff 2017-02-15 08:13:06 +01:00
  • 51a6903b4c fix for less file of quattro, regen CSS Tobias Diekershoff 2017-02-15 07:55:30 +01:00
  • 78715c8671 Merge pull request #3162 from annando/bugfix-spooling Tobias Diekershoff 2017-02-15 07:29:38 +01:00
  • 7ba5228814 Bugfix: Only delete spool files that are spool files Michael 2017-02-14 21:13:00 +00:00
  • 3fbf3af343 Merge pull request #3161 from annando/logging-diaspora-relay rabuzarus 2017-02-12 00:56:11 +01:00
  • e5e6f4fd19 Better logging to analyze unwanted messages from Diaspora Michael 2017-02-11 23:37:15 +00:00
  • a4dcd8be55 Merge pull request #3159 from annando/bugfix-diaspora-relay Tobias Diekershoff 2017-02-11 08:58:38 +01:00
  • 27fe4ae2a4 Merge pull request #3156 from rabuzarus/20170210_-_fix_pending_contacts_in_viewcontacts Michael Vogel 2017-02-10 21:51:17 +01:00
  • 40390cc5ec Diaspora Relay: Only accept postings from anyone when the relay is configured Michael 2017-02-10 20:45:22 +00:00
  • f5a634abbc Changed server detection. Michael 2017-02-10 19:23:46 +00:00
  • 95bb8d38e8 Merge remote-tracking branch 'upstream/develop' into 1701-performance Michael 2017-02-10 19:18:03 +00:00
  • 3474b40732 fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts rabuzarus 2017-02-10 03:51:01 +01:00
  • 8d2c74eb3c Merge pull request #3154 from rabuzarus/20170208_-_frio_fix_form_group_search_buttons Tobias Diekershoff 2017-02-09 10:20:52 +01:00
  • ad6ba9203e fix typo rabuzarus 2017-02-08 18:05:23 +01:00
  • dd752189f1 frio - fix text of input elements disappears behind the button rabuzarus 2017-02-08 17:50:59 +01:00
  • 6dfe2c6c9b theme work Tobias Diekershoff 2017-02-08 10:43:49 +01:00
  • 2536bd4f56 Merge pull request #3153 from tobiasd/20170208-quattroembedvideo fabrixxm 2017-02-08 09:34:28 +01:00
  • e223fee40d remove float left to fix issue 2987 in quattro theme Tobias Diekershoff 2017-02-08 07:21:19 +01:00
  • de255891d4 some work done Tobias Diekershoff 2017-02-08 06:37:31 +01:00
  • c574bc5538 Merge pull request #3151 from rabuzarus/20170203_-_frio_fix_tabbar_glitch Tobias Diekershoff 2017-02-08 06:35:15 +01:00
  • 3adbbd6689 Merge pull request #3152 from rabuzarus/20170208_-_fix_oembed_video_floating Tobias Diekershoff 2017-02-08 06:33:44 +01:00
  • d27c8f4932 fix oembeded video floating rabuzarus 2017-02-08 02:18:42 +01:00
  • 60ef105a14 frio - fix tabbar on mobile view rabuzarus 2017-02-08 01:34:36 +01:00
  • 6dd27b83ef Merge remote-tracking branch 'upstream/develop' into 1701-performance Michael 2017-02-06 21:28:42 +00:00
  • 3c5f7e457a Merge pull request #3149 from annando/1601-new-diaspora-mention Tobias Diekershoff 2017-02-05 16:38:09 +01:00
  • e9d719a299 removed to-do Michael 2017-02-05 07:02:20 +00:00
  • 9f706fcfbb Add include Michael 2017-02-04 22:27:49 +00:00
  • 0d1f88033b Support for the new Diaspora mention format Michael 2017-02-04 22:22:12 +00:00
  • 21accc0a53 Merge remote-tracking branch 'upstream/develop' into 1701-performance Michael 2017-02-04 16:28:36 +00:00
  • 9c4a53e380 Optimized query for nodeinfo, better way to analyze posting problems with DFRN Michael 2017-02-04 16:16:15 +00:00
  • 2092fa03b2 Merge pull request #3147 from rebeka-catalina/vier_dark_item_links Tobias Diekershoff 2017-02-03 20:28:39 +01:00
  • efc25f744a Merge pull request #3148 from rabuzarus/20170203_-_frio_fix_tabbar_glitch Tobias Diekershoff 2017-02-03 20:28:23 +01:00
  • 7f1acdb8e9 frio - append tabbar to nav only if it's a direct child of section rabuzarus 2017-02-03 19:37:47 +01:00
  • c12850250d Bugfix: frio - move tabs to the top of the contacts-template rabuzarus 2017-02-03 19:18:10 +01:00
  • 39da1f1d03 Update dark.css rebeka-catalina 2017-02-03 19:07:39 +01:00
  • a71f7aefbb Bugfix: frio - the tabbar should be hidden if it is in the section element rabuzarus 2017-02-03 19:00:55 +01:00
  • 2483e7cda7 Make links visually different from normal text rebeka-catalina 2017-02-03 19:00:04 +01:00
  • 2c71d307c8 Merge pull request #3141 from tobiasd/20170201-htconfig Michael Vogel 2017-02-02 09:40:05 +01:00
  • adedf18b30 Merge pull request #3146 from annando/1701-pnut Tobias Diekershoff 2017-02-02 09:10:28 +01:00
  • 5ffef9c96d Merge remote-tracking branch 'upstream/develop' into 1701-performance Michael 2017-02-02 06:27:10 +00:00
  • 275a1c6574 Preparation to add the social network "pnut" Michael 2017-02-02 06:06:23 +00:00
  • 9a19ae7ce1 The queue now works with the cache - whoch should speed it up Michael 2017-02-02 05:52:45 +00:00
  • ef0fb5148c Some more timeout checks Michael 2017-02-01 21:35:01 +00:00
  • 2f00683b77 Merge pull request #3144 from annando/bugfix-index Tobias Diekershoff 2017-02-01 22:34:11 +01:00
  • 8a75a20d26 Bugfix: An index was missing Michael 2017-02-01 21:08:13 +00:00
  • f6e1fbfcaa Merge remote-tracking branch 'upstream/develop' into 1701-performance Michael 2017-02-01 17:29:20 +00:00
  • 39136b6485 Merge pull request #3143 from annando/develop Tobias Diekershoff 2017-02-01 16:33:48 +01:00
  • da30538a98 Bugfix for pull request 3125 Michael 2017-02-01 13:50:05 +00:00
  • 7a89d06465 Make sure that we only quit when we are sure we can Michael 2017-02-01 08:43:18 +00:00
  • 94694aae86 RInO is not true / false anymore Tobias Diekershoff 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 Tobias Diekershoff 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" Tobias Diekershoff 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 Tobias Diekershoff 2017-02-01 08:23:41 +01:00
  • 7324a661f1 Optimized timeouts during network operations Michael 2017-02-01 00:15:37 +00:00
  • 2424cb78d1 Only process feed and dfrn items when they aren't already stored Michael 2017-01-31 19:39:09 +00:00
  • 793b3c2026 some issues done Tobias Diekershoff 2017-01-31 19:56:59 +01:00
  • 44bd890645 Merge pull request #3140 from annando/issue-3116 Tobias Diekershoff 2017-01-31 07:36:25 +01:00
  • 4c1292f171 Merge pull request #3139 from annando/issue-3135 Tobias Diekershoff 2017-01-31 07:30:15 +01:00
  • 49834676c7 Bugfix issue 3116: Only allowed themes are displayed Michael 2017-01-31 05:14:32 +00:00
  • 96aadb23f8 Change $allowed_src_protocols to static Matthew Exon 2017-01-31 03:44:32 +00:00
  • dae125e8ee Issue 3135: dbupdate is started again and again Michael 2017-01-30 21:18:08 +00:00
  • ce10a9aa7f Break out list of acceptable protocols in "src" attribute into separate variable similar to "href" attributes Matthew Exon 2017-01-30 15:48:12 +00:00
  • 080233b9b9 Merge pull request #3137 from rabuzarus/20170130_-_fix_meta_element_in_display_module Tobias Diekershoff 2017-01-30 15:56:41 +01:00
  • b6f64182a8 Merge pull request #3136 from rabuzarus/20170130_vier_photo_album Tobias Diekershoff 2017-01-30 15:55:58 +01:00
  • 6d01dd83fe Bugfix: fix the author image in the meta elements in html head (display module) rabuzarus 2017-01-30 15:23:44 +01:00
  • ec4e60ce3a style the photo album page of the vier theme rabuzarus 2017-01-30 15:00:26 +01:00
  • dd36b2bded Merge pull request #3128 from annando/bugfix-no-self-destroy Tobias Diekershoff 2017-01-30 09:11:10 +01:00
  • 63e71ff297 Merge pull request #3127 from annando/bugfix-ssl-issues Tobias Diekershoff 2017-01-30 08:46:25 +01:00
  • 0b04e0383c Merge pull request #3132 from annando/1701-remove-duplicates Tobias Diekershoff 2017-01-30 08:40:26 +01:00
  • d99a96ef49 Global is an integer, do not set it to an empty string Matthew Exon 2017-01-30 00:55:38 +00:00
  • 7ca809a00e Addind unique indexes should now work with every MySQL flavour Michael 2017-01-29 17:31:20 +00:00
  • ac88471e55 Make the code nicer Michael 2017-01-29 14:00:44 +00:00
  • c1eea3771f Bugfix: Sometimes the self contact seems to destroy itself Michael 2017-01-29 13:57:03 +00:00
  • ae849954cc Bugfix: The SSL policy setting was not respected Michael 2017-01-29 13:50:57 +00:00
  • 069dd5b75d Merge pull request #3125 from annando/alternate-pr-3124 Tobias Diekershoff 2017-01-28 15:25:30 +01:00
  • 46ab87a303 Typo fixed Michael 2017-01-28 13:38:18 +00:00
  • ea22828d37 Alternate solution for pull request 3124 Michael 2017-01-28 12:19:04 +00:00
  • 8b2c995c3d Merge pull request #3123 from tobiasd/20170128-nodbpwd Michael Vogel 2017-01-28 11:25:55 +01:00
  • ffd934c78f Merge pull request #3122 from tobiasd/20170128-allowedthemes Michael Vogel 2017-01-28 11:25:29 +01:00
  • af699940d4 typo Tobias Diekershoff 2017-01-28 11:20:39 +01:00
  • 703628cd01 wording Tobias Diekershoff 2017-01-28 11:12:31 +01:00
  • 4b2f6138a4 smoothly is also allowed Tobias Diekershoff 2017-01-28 11:08:05 +01:00
  • 83607ff894 enforce them, but inform the user about it Tobias Diekershoff 2017-01-28 10:10:35 +01:00
  • 334bc7037a don't enfoce non-empty passwords during installation Tobias Diekershoff 2017-01-28 10:02:32 +01:00
  • 9259feec6f Merge pull request #3121 from annando/1701-bugfix-config Tobias Diekershoff 2017-01-28 08:30:22 +01:00
  • d6e81117f9 system -> allowed_themes was not set in htconfig template Tobias Diekershoff 2017-01-28 08:26:40 +01:00
  • e031c01bb6 some stuff done Tobias Diekershoff 2017-01-28 07:55:44 +01:00
  • 0179bc7f00 Merge pull request #3120 from tobiasd/20170128-editor Michael Vogel 2017-01-28 07:34:04 +01:00
  • 05281a877b Merge pull request #3072 from Hypolite/issue/#3062 Michael Vogel 2017-01-28 07:32:18 +01:00
  • 0b5ef73d4a Merge pull request #3119 from annando/1701-bugfix-events Tobias Diekershoff 2017-01-28 07:29:29 +01:00
  • 32b997823f Don't forget the brackets Michael 2017-01-28 06:21:58 +00:00
  • 82086eea36 Bugfix: When a value was only in the .htconfig.php then it never was stored Michael 2017-01-28 06:18:16 +00:00
  • 0342f559c1 added editorconfig config file Tobias Diekershoff 2017-01-28 07:15:57 +01:00
  • c38a5e443d Merge branch 'develop' into issue/#3062 Hypolite Petovan 2017-01-27 15:30:21 -05:00
  • d61a4a67db Merge pull request #3109 from Hypolite/issue/scrap-tinymce Michael Vogel 2017-01-27 21:08:33 +01:00
  • 5760cfeb94 Added to-do Michael 2017-01-27 19:57:57 +00:00
  • 288ad37c3c Merge pull request #3110 from tobiasd/20170127-translationdocs Michael Vogel 2017-01-27 18:14:08 +01:00