Commit graph

8409 commits

Author SHA1 Message Date
Hauke Altmann e89e8d2914 adjusted configuration due to problems with mailcatcher 2014-06-20 18:32:40 +02:00
Hauke Altmann c23de3a64e added vagrant configuration for running a friendica development instance 2014-06-20 16:05:44 +02:00
hauke b8bf26ec1f code cleanup, replaced tabs with spaces 2014-04-27 14:53:45 +02:00
hauke f14835ce4a re-added missing styles for event 2014-04-27 14:50:39 +02:00
hauke cd1a726d87 code cleanup 2014-04-27 14:44:42 +02:00
hauke c111cec560 event entry: added some padding for a nicer look 2014-04-27 14:41:31 +02:00
hauke 21f5004821 bug fix: event entry. long text doesn't wrap in colorbox popup 2014-04-27 14:35:32 +02:00
Tobias Diekershoff ef4ce5f795 Merge pull request #950 from tobiasd/DE_20140426
DE: update to the strings
2014-04-26 12:30:39 +02:00
Tobias Diekershoff 05dc93de7c DE: update to the strings 2014-04-26 12:27:44 +02:00
Tobias Diekershoff 3977907268 Merge pull request #946 from tobiasd/newstrings_20140426
get strings from #942 into the master strings for translation
2014-04-26 09:26:06 +02:00
Tobias Diekershoff de51106cde get strings from #942 into the master strings for translation 2014-04-26 09:24:29 +02:00
Tobias Diekershoff 90b5efe361 Merge pull request #945 from tobiasd/de_fix_20140426
fix for the DE strings
2014-04-26 09:20:04 +02:00
Tobias Diekershoff 4503680a8f fix for the DE strings 2014-04-26 09:18:43 +02:00
Tobias Diekershoff a9c8aed9b1 Merge pull request #942 from davidmoerike/master
Line: 68 f.
2014-04-26 09:16:03 +02:00
Tobias Diekershoff c1d14bcc98 Merge pull request #944 from annando/master
Some more frontend stuff/Native Diaspora reshare
2014-04-26 09:13:17 +02:00
David ecc8ccebba File messages.po changed.
Utility executed: po2php.php view/de/messages.po

Friendica no longer works; gives blank page.

When changing to English by disabling the german language package of the browser, it still works.

David
2014-04-26 08:05:07 +02:00
Michael Vogel 2846dfeb05 Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values. 2014-04-26 02:22:30 +02:00
Michael Vogel 9489af548c Merge pull request #943 from tobiasd/identica_no_SN_anymore
Identica no StatusNet anymore
2014-04-26 01:47:43 +02:00
Michael Vogel e75562cd6d Diaspora: support for sending native reshares. If a message from Diaspora is repeated, then it will be repeated as native reshare. 2014-04-26 01:35:02 +02:00
Michael Vogel 79da821c75 Added template for Diaspora reshare 2014-04-26 01:33:33 +02:00
Tobias Diekershoff 44c45367a2 update for the base strings 2014-04-25 08:30:20 +02:00
David 741aab0916 Now more friendly error message. Will tomorrow add a german translation.
David
2014-04-25 06:29:03 +02:00
David 8f78e8dbed Now more friendly error message. Will tomorrow add a german translation.
David
2014-04-25 06:12:42 +02:00
Tobias Diekershoff 2dfbd448a3 ideni.ca is now pump.io, so don't mention it in OStatus settings 2014-04-24 21:18:12 +02:00
Michael Vogel e0c5934a28 Global CSS changed for opacity of disabled networks. 2014-04-24 16:41:22 +02:00
Michael Vogel 7134d27bae Icons for Dreamwidth and InsaneJournal 2014-04-24 15:41:29 +02:00
Michael Vogel 1227d071d1 The preview button is now a button. This is more consistent 2014-04-24 13:27:08 +02:00
Michael Vogel 97d8c03f33 Vier: removed the gray line under the user menu when it was selected 2014-04-24 13:02:50 +02:00
Michael Vogel ec1f07d5b7 Only show the preview button when it is activated/Menü arrangement changed for settings menu. 2014-04-24 12:39:27 +02:00
Michael Vogel 59c9a9adae OAuth-settings: The "cancel" button generated an error message (and is superfluous), so it is removed 2014-04-24 12:18:51 +02:00
Michael Vogel 2e7549c945 Show preview of the correct theme, not the mobile theme. 2014-04-24 12:14:45 +02:00
Michael Vogel 9ae9b66328 Export personal data: Now the settings menu on the left side is taken from the settings module. 2014-04-24 11:58:04 +02:00
Michael Vogel b9656cbe23 Delegations: Now the menu of the settings appears at the delegations settings 2014-04-24 11:49:11 +02:00
fabrixxm 807fc60d3e Merge pull request #941 from annando/master
Moved and renamed menu entries to improve the usability, global css, icons for social networks
2014-04-24 10:48:07 +02:00
Michael Vogel a50eefe292 New file "global.css" for stylesheet stuff that is valid for all themes 2014-04-24 10:26:02 +02:00
Michael Vogel 4998c08ce2 New icons for the social network connectors 2014-04-24 10:25:09 +02:00
Michael Vogel c1988d7e08 Vier: Removed the delegations from the nav menu, renamed the hardcoded "impressum" to use the translations. 2014-04-24 10:19:13 +02:00
Michael Vogel b005423ebf New layout for connector settings. New global CSS for things that seems to be identical in most themes. 2014-04-24 10:17:19 +02:00
Michael Vogel 30efb0c1e6 menu entry for "Delegations" moved to the settings. 2014-04-24 10:16:02 +02:00
David 44beff1a9a Line: 68 f.
When trying to upload a file greater than PHP's max_upload_filesize,

the filesize is 0, and maybe some html code appears in the
text input window of the form. Problem seems to disappear
when refusing all uploads if filesize <=0.
2014-04-23 20:22:53 +02:00
fabrixxm b09f2f0a5d Merge pull request #940 from annando/master
Bugfixes: 1. When posting shared feeds to Diaspora, the link vanished/2. The profile name detection had problems with feeds
2014-04-23 08:42:48 +02:00
Michael Vogel acb5748221 Bugfixes: 1. When posting shared feeds to Diaspora, the link vanished/2. The profile name detection had problems with feeds 2014-04-23 00:34:34 +02:00
fabrixxm 22c45b9bf1 Merge pull request #938 from annando/master
API: Don't show own posts in mentions, some "vier" changes and provider name for diaspora
2014-04-22 16:15:42 +02:00
Michael Vogel 22772876a9 API: Beautifying the code, only showing posts (not likes), don't show own posts in mentions. 2014-04-22 15:56:28 +02:00
Michael Vogel b64ddcce96 Accepting "!"-links as tags. (They are used at statusnet for groups) 2014-04-22 15:54:56 +02:00
Michael Vogel b6384ec5be The postal code wasn't displayed correctly. 2014-04-22 15:53:26 +02:00
Michael Vogel 6e7d8b87bb Vier: attached link descriptions (type-link, ...) are redesigned to make it look more modern. 2014-04-22 01:03:08 +02:00
Michael Vogel 9185321c8b Diaspora-XML-Templates: Added provider name and some rearrangements to fit the exact order of the elements in diaspora (only for the beauty) 2014-04-22 01:01:21 +02:00
Michael Vogel 2c3a5d72fd Diaspora: Now the application name is transmitted as well with a post. 2014-04-22 00:58:17 +02:00
Michael Vogel 10d36c324a bbcode: The header for shared messages for text based system needn't to have a profile link. 2014-04-22 00:56:46 +02:00