Commit Graph

  • 2303f1e434 Merge branch 'master' of https://github.com/friendica/friendica David 2014-05-16 19:33:16 +0200
  • ad9f4ec85f Merge pull request #978 from tobiasd/de20140516 Tobias Diekershoff 2014-05-16 12:10:20 +0200
  • bcafa23292 DE: update for the strings Tobias Diekershoff 2014-05-16 12:08:41 +0200
  • 1e8e10796b Merge pull request #977 from fabrixxm/master fabrixxm 2014-05-16 11:06:43 +0200
  • ca5da9f9af update master strings Fabrixxm 2014-05-16 11:05:16 +0200
  • b072b8f284 Update bbcode.php fabrixxm 2014-05-16 10:55:29 +0200
  • ed748f2d15 Merge pull request #976 from tobiasd/lng20140516 Tobias Diekershoff 2014-05-16 07:56:57 +0200
  • 4075b872bf update to the master strings Tobias Diekershoff 2014-05-16 07:55:17 +0200
  • 40b1e40b33 Merge pull request #973 from tobiasd/FR20140515 Tobias Diekershoff 2014-05-15 07:56:39 +0200
  • e275494090 FR: update to the strings Tobias Diekershoff 2014-05-15 07:54:55 +0200
  • 6253d61803 Merge pull request #967 from fabrixxm/issue_737 Michael Vogel 2014-05-13 10:16:15 +0200
  • 0774a5c5fd Merge pull request #970 from annando/master fabrixxm 2014-05-12 22:07:41 +0200
  • 0f16672176 Deleted the duplicate file "wall_attach.php" Michael Vogel 2014-05-12 21:30:53 +0200
  • f55a22cb19 fix query as @annado comment fabrixxm 2014-05-12 19:02:03 +0200
  • d7b514c2c0 add check for expiration time in item_store() Fabrixxm 2014-05-12 15:33:20 +0200
  • 1a5da0ae60 Merge pull request #954 from fabrixxm/issue_936 fabrixxm 2014-05-12 11:56:05 +0200
  • bb4296e686 exclude know contacts from unknown contact list Fabrixxm 2014-05-12 05:46:02 -0400
  • bd2dd90d0a Merge pull request #966 from annando/master Tobias Diekershoff 2014-05-12 06:58:06 +0200
  • a6742d3db6 Repeated messages to Diaspora now contain a link to the original content at the bottom of the message. Michael Vogel 2014-05-11 22:07:37 +0200
  • 01c146414c Merge pull request #965 from annando/master Tobias Diekershoff 2014-05-10 06:28:41 +0200
  • acf1c3956c Only show connectors when not "hide wall" is enabled. Michael Vogel 2014-05-10 00:24:15 +0200
  • 31312ab1d2 Merge pull request #956 from annando/master Tobias Diekershoff 2014-05-09 21:55:01 +0200
  • 5616c58535 Better error handling during install. Michael Vogel 2014-05-09 20:44:25 +0200
  • dfa52185ca Reenabled PDO engine. Michael Vogel 2014-05-09 20:43:06 +0200
  • 018b1f0086 Added buffer image (needed for plugin) Michael Vogel 2014-05-09 20:42:23 +0200
  • 7afe5afcf1 Merge pull request #963 from tabacha/master fabrixxm 2014-05-06 14:16:54 +0200
  • 0dac5bf804 Make uimport URL work for Sites with subfolder Sven Anders 2014-05-06 14:15:15 +0200
  • 407ea6977a Plaintext: Regular expressions were too greedy. Michael Vogel 2014-05-06 00:33:56 +0200
  • 4dbfae7883 Merge pull request #962 from tobiasd/fix961 Tobias Diekershoff 2014-05-05 13:46:03 +0200
  • fd7e17f91e save selection to suppress language results (fix 961) Tobias Diekershoff 2014-05-05 13:44:33 +0200
  • 6b38968f80 The template "register_adminadd_eml.tpl" was missing for all languages except german. That lead to an empty page when adding users. Michael Vogel 2014-05-04 21:11:25 +0200
  • 30f1f40a1e No functional changes, only removed spaces Michael Vogel 2014-05-03 23:40:34 +0200
  • 04ba988f75 Plaintext: If a picture link went directly to a picture, this wasn't recognized. Additionally there was a situation when a post could be empty. Michael Vogel 2014-05-03 23:34:53 +0200
  • 4b0cc51ae4 The PDO functionality is deactivated until the last differences in functionality are removed. Michael Vogel 2014-05-03 12:14:43 +0200
  • c27bd7d0b4 The pagetypes are rearrange to make the differences better understandable. Michael Vogel 2014-05-03 12:10:38 +0200
  • 059b88b7a0 The CSS code for shared messages is moved from "vier" to the global.css, so that it is usable for all themes. Michael Vogel 2014-05-03 12:08:42 +0200
  • 426e0045ee The function "short_url" is used in several addons, so it deserves a central place. Michael Vogel 2014-05-03 12:07:34 +0200
  • c41b1c2d55 Building a central functionality to export postings to all networks that only support plaintext postings. In near future this will replace the similar code in the several addons. Michael Vogel 2014-05-03 12:04:54 +0200
  • 2db1029830 APC support is removed due to problems with PHP 5.5. Michael Vogel 2014-05-03 12:02:25 +0200
  • 94baf0c8f7 Merge pull request #957 from tobiasd/trans_20140430 Tobias Diekershoff 2014-04-30 17:07:03 +0200
  • 27ff19a92c FR: update to some templates Tobias Diekershoff 2014-04-30 17:05:01 +0200
  • 1741dd2a1d NB-NO: update to the strings Tobias Diekershoff 2014-04-30 17:02:45 +0200
  • 1469407777 ZH-CN: update to the strings Tobias Diekershoff 2014-04-30 17:02:06 +0200
  • c732cefcfd CS: update to the strings Tobias Diekershoff 2014-04-30 17:01:27 +0200
  • 92035cdca4 FR: update to the strings Tobias Diekershoff 2014-04-30 17:00:56 +0200
  • a6b03b6263 The remove page now has the settings menu. Michael Vogel 2014-04-29 22:34:48 +0200
  • 7b7e372fb0 Suppress showing unsupported addons in the administration. Michael Vogel 2014-04-29 14:22:37 +0200
  • 4ca857e110 Empty template to avoid errors when installing themes. Michael Vogel 2014-04-29 13:33:39 +0200
  • 941c049933 The file "dbstructure.php" was corrupted. This is the right one. Michael Vogel 2014-04-29 13:19:44 +0200
  • c5825a0c20 Merge remote-tracking branch 'upstream/master' Michael Vogel 2014-04-29 12:36:49 +0200
  • 66996a2fa3 The file dba.php was missing in the last commit :) Additionally there are some chamges to the update script. Michael Vogel 2014-04-29 12:35:24 +0200
  • b69f6b6ade Merge pull request #953 from tugelbend/master fabrixxm 2014-04-29 09:07:32 +0200
  • 405dd794fe New database system that uses PDO if present/Test script for doing database upgrades. Michael Vogel 2014-04-28 23:55:47 +0200
  • 5b7228e46d Merge pull request #955 from fabrixxm/quattro_photo_comments fabrixxm 2014-04-28 15:44:52 +0200
  • cae89749d7 vier: remove unused .less files, fix photo comments Fabrixxm 2014-04-28 09:42:41 -0400
  • 42a9d0af09 quattro: fix photo comments, small fix to search_item template Fabrixxm 2014-04-28 09:31:48 -0400
  • aba27ad404 fix photo comments: use $drop array as in wall_thread and search_item Fabrixxm 2014-04-28 09:29:48 -0400
  • 2904b7d354 quattro: remove 'do not edit' comments from templates Fabrixxm 2014-04-28 08:47:10 -0400
  • 487d563366 add people in thread in autocomplete (issue #936) issues: tested only in quattro theme contacts in thread will appear twice in autocomplete popup fabrixxm 2014-04-27 15:13:05 +0200
  • 0b83432bf3 better logger format, some comments fabrixxm 2014-04-27 15:08:21 +0200
  • b8bf26ec1f code cleanup, replaced tabs with spaces hauke 2014-04-27 14:53:45 +0200
  • f14835ce4a re-added missing styles for event hauke 2014-04-27 14:50:39 +0200
  • cd1a726d87 code cleanup hauke 2014-04-27 14:44:42 +0200
  • c111cec560 event entry: added some padding for a nicer look hauke 2014-04-27 14:41:31 +0200
  • 21f5004821 bug fix: event entry. long text doesn't wrap in colorbox popup hauke 2014-04-27 14:35:32 +0200
  • 18d5435f48 Last commit reverted, because it is not good. Jan David Mörike 2014-04-27 09:19:40 +0200
  • 1b759ea518 Installing theme vier from the admin panel does not work. It does work, when file theme_settings.tpl is moved from view/theme/vier/templates to view/templates. Jan David Mörike 2014-04-26 18:16:22 +0200
  • ef4ce5f795 Merge pull request #950 from tobiasd/DE_20140426 Tobias Diekershoff 2014-04-26 12:30:39 +0200
  • 05dc93de7c DE: update to the strings Tobias Diekershoff 2014-04-26 12:27:44 +0200
  • 2cd12b0403 Merge 5297669244 into 3977907268 Jan David Mörike 2014-04-26 08:27:52 +0000
  • 5297669244 Added more friendly message and german translation of message. David Mörike Jan David Mörike 2014-04-26 10:15:34 +0200
  • 3977907268 Merge pull request #946 from tobiasd/newstrings_20140426 Tobias Diekershoff 2014-04-26 09:26:06 +0200
  • de51106cde get strings from #942 into the master strings for translation Tobias Diekershoff 2014-04-26 09:24:29 +0200
  • 90b5efe361 Merge pull request #945 from tobiasd/de_fix_20140426 Tobias Diekershoff 2014-04-26 09:20:04 +0200
  • 4503680a8f fix for the DE strings Tobias Diekershoff 2014-04-26 09:18:43 +0200
  • a9c8aed9b1 Merge pull request #942 from davidmoerike/master Tobias Diekershoff 2014-04-26 09:16:03 +0200
  • c1d14bcc98 Merge pull request #944 from annando/master Tobias Diekershoff 2014-04-26 09:13:17 +0200
  • ecc8ccebba File messages.po changed. David 2014-04-26 08:05:07 +0200
  • 2846dfeb05 Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values. Michael Vogel 2014-04-26 02:22:30 +0200
  • 9489af548c Merge pull request #943 from tobiasd/identica_no_SN_anymore Michael Vogel 2014-04-26 01:47:43 +0200
  • e75562cd6d Diaspora: support for sending native reshares. If a message from Diaspora is repeated, then it will be repeated as native reshare. Michael Vogel 2014-04-26 01:35:02 +0200
  • 79da821c75 Added template for Diaspora reshare Michael Vogel 2014-04-26 01:33:33 +0200
  • 44c45367a2 update for the base strings Tobias Diekershoff 2014-04-25 08:30:20 +0200
  • 741aab0916 Now more friendly error message. Will tomorrow add a german translation. David 2014-04-25 06:29:03 +0200
  • 8f78e8dbed Now more friendly error message. Will tomorrow add a german translation. David 2014-04-25 06:12:42 +0200
  • 2dfbd448a3 ideni.ca is now pump.io, so don't mention it in OStatus settings Tobias Diekershoff 2014-04-24 21:18:12 +0200
  • e0c5934a28 Global CSS changed for opacity of disabled networks. Michael Vogel 2014-04-24 16:41:22 +0200
  • 7134d27bae Icons for Dreamwidth and InsaneJournal Michael Vogel 2014-04-24 15:41:29 +0200
  • 1227d071d1 The preview button is now a button. This is more consistent Michael Vogel 2014-04-24 13:27:08 +0200
  • 97d8c03f33 Vier: removed the gray line under the user menu when it was selected Michael Vogel 2014-04-24 13:02:50 +0200
  • ec1f07d5b7 Only show the preview button when it is activated/Menü arrangement changed for settings menu. Michael Vogel 2014-04-24 12:39:27 +0200
  • 59c9a9adae OAuth-settings: The "cancel" button generated an error message (and is superfluous), so it is removed Michael Vogel 2014-04-24 12:18:51 +0200
  • 2e7549c945 Show preview of the correct theme, not the mobile theme. Michael Vogel 2014-04-24 12:14:45 +0200
  • 9ae9b66328 Export personal data: Now the settings menu on the left side is taken from the settings module. Michael Vogel 2014-04-24 11:58:04 +0200
  • b9656cbe23 Delegations: Now the menu of the settings appears at the delegations settings Michael Vogel 2014-04-24 11:49:11 +0200
  • 807fc60d3e Merge pull request #941 from annando/master fabrixxm 2014-04-24 10:48:07 +0200
  • a50eefe292 New file "global.css" for stylesheet stuff that is valid for all themes Michael Vogel 2014-04-24 10:26:02 +0200
  • 4998c08ce2 New icons for the social network connectors Michael Vogel 2014-04-24 10:25:09 +0200
  • c1988d7e08 Vier: Removed the delegations from the nav menu, renamed the hardcoded "impressum" to use the translations. Michael Vogel 2014-04-24 10:19:13 +0200
  • b005423ebf New layout for connector settings. New global CSS for things that seems to be identical in most themes. Michael Vogel 2014-04-24 10:17:19 +0200