]>
git.mxchange.org Git - friendica.git/log
Michael Vogel [Fri, 1 May 2015 09:06:39 +0000 (11:06 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1505-oembed-bbcode
Michael Vogel [Fri, 1 May 2015 08:42:43 +0000 (10:42 +0200)]
rich content in oembed now replaces the content in attachments
Tobias Diekershoff [Fri, 1 May 2015 08:34:40 +0000 (10:34 +0200)]
Merge pull request #1543 from annando/1504-oembed-stylesheet
The oembed iframe now has a class name to use it for stylesheets.
Tobias Diekershoff [Fri, 1 May 2015 08:34:14 +0000 (10:34 +0200)]
Merge pull request #1542 from annando/1504-ping
Highlighting of user names should now work in every case
Michael Vogel [Thu, 30 Apr 2015 04:12:21 +0000 (06:12 +0200)]
The oembed iframe now has a class name to use it for stylesheets.
Michael Vogel [Thu, 30 Apr 2015 04:11:05 +0000 (06:11 +0200)]
Highlighting of user names should now work in every case
Tobias Diekershoff [Mon, 27 Apr 2015 05:55:37 +0000 (07:55 +0200)]
Merge pull request #1539 from annando/issue-1536
Redefined the conditions when notifications and introductions are shown.
Michael Vogel [Sun, 26 Apr 2015 20:16:38 +0000 (22:16 +0200)]
Redefined the conditions when notifications and introductions are shown.
Tobias Diekershoff [Sun, 26 Apr 2015 12:02:36 +0000 (14:02 +0200)]
Merge pull request #1538 from annando/1504-api-twidere-conversations
API: The "conversation" function can now be called with every message id
Tobias Diekershoff [Sun, 26 Apr 2015 12:01:42 +0000 (14:01 +0200)]
Merge pull request #1537 from annando/1504-notifications-android-app
Bugfix: The android app will have readable notifications again.
Michael Vogel [Sun, 26 Apr 2015 11:26:48 +0000 (13:26 +0200)]
API: The "conversation" function can now be called with every message id of a post in that conversation. Not only the parent.
Michael Vogel [Sun, 26 Apr 2015 11:25:04 +0000 (13:25 +0200)]
Bugfix: The android app will have readable notifications again.
Tobias Diekershoff [Sat, 25 Apr 2015 11:46:48 +0000 (13:46 +0200)]
Merge pull request #1535 from annando/1504-matrix-detection
New function that detects red matrix accounts
Tobias Diekershoff [Sat, 25 Apr 2015 09:22:14 +0000 (11:22 +0200)]
Merge pull request #1534 from tobiasd/20150425_de
DE update to the strings
Tobias Diekershoff [Sat, 25 Apr 2015 09:18:30 +0000 (11:18 +0200)]
DE update to the strings
Michael Vogel [Sat, 25 Apr 2015 09:08:53 +0000 (11:08 +0200)]
Exchanged the hard coded comparism with the new function.
Michael Vogel [Fri, 24 Apr 2015 22:50:48 +0000 (00:50 +0200)]
Don't generate a preview in an item from Diaspora if it is a posting from red matrix.
Tobias Diekershoff [Fri, 24 Apr 2015 08:02:42 +0000 (10:02 +0200)]
Merge pull request #1530 from tobiasd/
20150424
linefeeds in DE docs part of #1478
Tobias Diekershoff [Fri, 24 Apr 2015 07:55:16 +0000 (09:55 +0200)]
linefeeds in DE docs part of #1478
fabrixxm [Fri, 24 Apr 2015 06:42:02 +0000 (08:42 +0200)]
Merge pull request #1529 from annando/1504-condensed-notifications
Condensed notifications
Michael Vogel [Thu, 23 Apr 2015 06:59:30 +0000 (08:59 +0200)]
Show unread notifications in a different order than read notifications
Michael Vogel [Thu, 23 Apr 2015 06:37:31 +0000 (08:37 +0200)]
Show unread mails and introductions as well.
Tobias Diekershoff [Wed, 22 Apr 2015 11:29:03 +0000 (13:29 +0200)]
Merge pull request #1527 from fraengii/2015-04-22-Chats.md-fraengii
Chats.md: Linguistic style, capitalization of addresses
Frank Dieckmann [Wed, 22 Apr 2015 10:28:19 +0000 (12:28 +0200)]
Chats.md: Linguistic style, capitalization of addresses
Michael Vogel [Wed, 22 Apr 2015 06:39:27 +0000 (08:39 +0200)]
New function that will prevent notifications from deleted posts
Tobias Diekershoff [Tue, 21 Apr 2015 19:56:58 +0000 (21:56 +0200)]
Merge pull request #1526 from fraengii/
20150421-Bugs-and-Issues.md
Bugs-and-Issues.md: Linguistic style and addresses
Frank Dieckmann [Tue, 21 Apr 2015 18:02:47 +0000 (20:02 +0200)]
Update Bugs-and-Issues.md
Frank Dieckmann [Tue, 21 Apr 2015 17:22:44 +0000 (19:22 +0200)]
Bugs-and-Issues.md: Linguistic style and addresses
Michael Vogel [Tue, 21 Apr 2015 08:14:20 +0000 (10:14 +0200)]
The ID field will be stored with notifications as well.
Michael Vogel [Tue, 21 Apr 2015 08:13:28 +0000 (10:13 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications
Tobias Diekershoff [Sun, 19 Apr 2015 18:08:55 +0000 (20:08 +0200)]
Merge pull request #1525 from silke/documentation
And... still more files
Silke Meyer [Sun, 19 Apr 2015 17:15:43 +0000 (19:15 +0200)]
reformatted and reorganized a bit
Silke Meyer [Sun, 19 Apr 2015 16:48:16 +0000 (18:48 +0200)]
line breaks
Silke Meyer [Sun, 19 Apr 2015 16:44:12 +0000 (18:44 +0200)]
Moved plugin documentation from admin to dev manual
Silke Meyer [Sun, 19 Apr 2015 16:41:42 +0000 (18:41 +0200)]
reformatted
Silke Meyer [Sun, 19 Apr 2015 16:04:08 +0000 (18:04 +0200)]
line breaks
Silke Meyer [Sun, 19 Apr 2015 15:50:17 +0000 (17:50 +0200)]
line breaks
Silke Meyer [Sat, 18 Apr 2015 17:56:50 +0000 (19:56 +0200)]
reformatted
Silke Meyer [Sat, 18 Apr 2015 17:51:57 +0000 (19:51 +0200)]
Reformatted
Silke Meyer [Sat, 18 Apr 2015 17:46:11 +0000 (19:46 +0200)]
Reformatting and minor changes to content
Silke Meyer [Sat, 18 Apr 2015 17:31:19 +0000 (19:31 +0200)]
Reformatted
Silke Meyer [Sat, 18 Apr 2015 16:57:22 +0000 (18:57 +0200)]
Reformatting and minor changes to content
Silke Meyer [Sat, 18 Apr 2015 16:39:16 +0000 (18:39 +0200)]
Reformatting and minor changes to content
fabrixxm [Sat, 18 Apr 2015 15:15:22 +0000 (17:15 +0200)]
Merge pull request #1516 from tobiasd/issue1429
regarding issue 1429
Silke Meyer [Sat, 18 Apr 2015 15:10:14 +0000 (17:10 +0200)]
line breaks
Tobias Diekershoff [Sat, 18 Apr 2015 15:04:05 +0000 (17:04 +0200)]
Merge pull request #1524 from silke/documentation
More updated and reformatted documentation files
Silke Meyer [Sat, 18 Apr 2015 14:56:56 +0000 (16:56 +0200)]
Reformatting, cropped the admin part of SSL documentation out of the users' question
Silke Meyer [Sat, 18 Apr 2015 14:02:39 +0000 (16:02 +0200)]
Formatting and minor changes
Silke Meyer [Sat, 18 Apr 2015 13:51:27 +0000 (15:51 +0200)]
Formatting and some minor changes
Silke Meyer [Fri, 17 Apr 2015 16:23:00 +0000 (18:23 +0200)]
minor formatting stuff mainly
Silke Meyer [Fri, 17 Apr 2015 16:17:44 +0000 (18:17 +0200)]
sorted out the headings' md syntax
Silke Meyer [Fri, 17 Apr 2015 16:05:54 +0000 (18:05 +0200)]
md syntax, fixed minor typos
Silke Meyer [Fri, 17 Apr 2015 16:00:57 +0000 (18:00 +0200)]
line breaks
Silke Meyer [Fri, 17 Apr 2015 15:10:27 +0000 (17:10 +0200)]
Proper markdown subheadings
Silke Meyer [Fri, 17 Apr 2015 15:03:20 +0000 (17:03 +0200)]
line breaks
Silke Meyer [Fri, 17 Apr 2015 14:58:48 +0000 (16:58 +0200)]
Proper markdown subheadings
Silke Meyer [Fri, 17 Apr 2015 14:56:41 +0000 (16:56 +0200)]
Added branching workflow, reformatted markdown syntax
Silke Meyer [Fri, 17 Apr 2015 14:04:10 +0000 (16:04 +0200)]
Just added linebreaks
fabrixxm [Fri, 17 Apr 2015 08:05:24 +0000 (10:05 +0200)]
Merge pull request #1521 from tugelbend/develop
bug fix: "local_" has 6 not 5 characters
Hauke Altmann [Fri, 17 Apr 2015 08:02:17 +0000 (10:02 +0200)]
bug fix: "local_" has 6 not 5 characters
fabrixxm [Fri, 17 Apr 2015 08:01:51 +0000 (10:01 +0200)]
Merge pull request #1520 from tugelbend/develop
bug fix: substring is not a PHP function %-)
Hauke Altmann [Fri, 17 Apr 2015 07:59:28 +0000 (09:59 +0200)]
bug fix: substring is not a PHP function %-)
Tobias Diekershoff [Fri, 17 Apr 2015 07:45:41 +0000 (09:45 +0200)]
Merge pull request #1512 from fraengii/2015-04-12-Account-Basics.md
12.4.2015, doc/de/Account-Basics.md: Anrede und Stil
Tobias Diekershoff [Fri, 17 Apr 2015 07:45:22 +0000 (09:45 +0200)]
Merge pull request #1503 from fraengii/
20150408-H-de-fraengii
doc/de/Quick-Start-*.md
Tobias Diekershoff [Fri, 17 Apr 2015 07:42:49 +0000 (09:42 +0200)]
Merge pull request #1519 from silke/documentation
Yes, looks good :-)
Silke Meyer [Fri, 17 Apr 2015 07:13:40 +0000 (09:13 +0200)]
Modified according to #1478 (line break after each sentence)
Silke Meyer [Fri, 17 Apr 2015 07:08:57 +0000 (09:08 +0200)]
Corrected typo
fabrixxm [Fri, 17 Apr 2015 06:41:59 +0000 (08:41 +0200)]
Merge pull request #1518 from tugelbend/develop
preserve local indexes of friendica database when updating
hauke [Thu, 16 Apr 2015 19:07:46 +0000 (21:07 +0200)]
code cleanup
hauke [Thu, 16 Apr 2015 19:05:37 +0000 (21:05 +0200)]
preserve local index of friendica database when updating
Michael Vogel [Thu, 16 Apr 2015 05:18:06 +0000 (07:18 +0200)]
The item id is now stored in every notification as well
Michael Vogel [Thu, 16 Apr 2015 04:47:09 +0000 (06:47 +0200)]
Only show one notification per parent
fabrixxm [Tue, 14 Apr 2015 18:08:24 +0000 (20:08 +0200)]
Merge pull request #1517 from tobiasd/20150414_lng
CS, FR: update to the strings
Tobias Diekershoff [Tue, 14 Apr 2015 11:41:56 +0000 (13:41 +0200)]
FR update of the strings
Tobias Diekershoff [Tue, 14 Apr 2015 11:40:24 +0000 (13:40 +0200)]
CS update of the strings
Tobias Diekershoff [Tue, 14 Apr 2015 10:27:36 +0000 (12:27 +0200)]
dont normalise OpenID URLs and fallback to https if no protocol is specified
Michael Vogel [Tue, 14 Apr 2015 04:54:41 +0000 (06:54 +0200)]
Storing the parent with every notification
Frank Dieckmann [Mon, 13 Apr 2015 16:16:42 +0000 (18:16 +0200)]
Schreibfehler korrigiert
Frank Dieckmann [Mon, 13 Apr 2015 16:13:59 +0000 (18:13 +0200)]
Klicke auf "Pinnwand"
Frank Dieckmann [Mon, 13 Apr 2015 16:09:05 +0000 (18:09 +0200)]
Some more adds
Michael Vogel [Mon, 13 Apr 2015 13:47:11 +0000 (15:47 +0200)]
Merge pull request #1487 from fabrixxm/projects
new api dfrn/remoteauth, allow plugins to use update_structure
Tobias Diekershoff [Mon, 13 Apr 2015 05:44:04 +0000 (07:44 +0200)]
Merge pull request #1515 from treellama/develop
use ImageMagick for orientation when available
Gregory Smith [Mon, 13 Apr 2015 01:09:25 +0000 (21:09 -0400)]
use ImageMagick for orientation when available
Frank Dieckmann [Sun, 12 Apr 2015 13:32:02 +0000 (15:32 +0200)]
Capitalization of addresses an linguistic style in Account-Basics.md
Tobias Diekershoff [Sun, 12 Apr 2015 13:09:47 +0000 (15:09 +0200)]
Merge pull request #1511 from annando/1504-contact-last-item
New field in the contact table to better detect "dead profiles"
Michael Vogel [Sun, 12 Apr 2015 09:56:02 +0000 (11:56 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1504-contact-last-item
Michael Vogel [Sun, 12 Apr 2015 09:40:38 +0000 (11:40 +0200)]
New field in the contact table to better detect "dead profiles"
Tobias Diekershoff [Sun, 12 Apr 2015 08:56:36 +0000 (10:56 +0200)]
Merge pull request #1510 from annando/1504-contact-update
New function to update the contact data
Michael Vogel [Sun, 12 Apr 2015 08:32:02 +0000 (10:32 +0200)]
Some refinement to the contact update
Michael Vogel [Sun, 12 Apr 2015 07:59:28 +0000 (09:59 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1504-contact-update
Conflicts:
mod/contacts.php
fabrixxm [Sun, 12 Apr 2015 06:53:30 +0000 (08:53 +0200)]
change remoteauth endpoint path
fabrixxm [Sun, 12 Apr 2015 06:48:36 +0000 (08:48 +0200)]
Merge pull request #1505 from annando/1504-unified-follow
The behaviour when following a new contact is now unified
fabrixxm [Sun, 12 Apr 2015 06:45:31 +0000 (08:45 +0200)]
Merge pull request #1509 from annando/1504-code-rework
Code reworks: replaced hardcoded network text with the corresponding constants
Michael Vogel [Sat, 11 Apr 2015 21:56:53 +0000 (23:56 +0200)]
Fixed "Copy and paste" bug.
Michael Vogel [Sat, 11 Apr 2015 21:51:47 +0000 (23:51 +0200)]
There is now a new possibility to update contact data.
Michael Vogel [Sat, 11 Apr 2015 20:14:56 +0000 (22:14 +0200)]
Code reworks: replaced hardcoded network text with the corresponding constants.
Michael Vogel [Fri, 10 Apr 2015 09:34:21 +0000 (11:34 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow
Tobias Diekershoff [Fri, 10 Apr 2015 08:13:13 +0000 (10:13 +0200)]
Merge pull request #1479 from annando/1504-parse_url
The order for the page parsing is changed
Tobias Diekershoff [Fri, 10 Apr 2015 07:50:08 +0000 (09:50 +0200)]
Merge pull request #1507 from annando/1504-community-automention
Automention of communities when a single contact is selected
Michael Vogel [Thu, 9 Apr 2015 22:54:42 +0000 (00:54 +0200)]
Just added some forgotten escaping.
projects / friendica.git / log