]>
git.mxchange.org Git - friendica.git/log
Silke Meyer [Sat, 18 Apr 2015 16:39:16 +0000 (18:39 +0200)]
Reformatting and minor changes to content
Silke Meyer [Sat, 18 Apr 2015 15:10:14 +0000 (17:10 +0200)]
line breaks
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
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 [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
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
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.
Michael Vogel [Thu, 9 Apr 2015 22:42:03 +0000 (00:42 +0200)]
Automention of communities when a single contact is selected on the network page.
Michael Vogel [Thu, 9 Apr 2015 17:49:57 +0000 (19:49 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow
Michael Vogel [Thu, 9 Apr 2015 17:49:33 +0000 (19:49 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1504-parse_url
Michael Vogel [Thu, 9 Apr 2015 17:35:17 +0000 (19:35 +0200)]
The "fastlane" can be removed there.
Michael Vogel [Thu, 9 Apr 2015 05:45:48 +0000 (07:45 +0200)]
The "connect" link ar the display page now directs to the new "follow" page as well.
Michael Vogel [Wed, 8 Apr 2015 22:33:45 +0000 (00:33 +0200)]
"fastlane" should now work with remote adding as well.
Michael Vogel [Wed, 8 Apr 2015 22:10:21 +0000 (00:10 +0200)]
The behaviour when following a new contact is now unified.
Michael Vogel [Wed, 8 Apr 2015 17:17:33 +0000 (19:17 +0200)]
Merge pull request #1502 from tobiasd/20150408_de
DE update to the strings
Tobias Diekershoff [Wed, 8 Apr 2015 10:06:05 +0000 (12:06 +0200)]
DE update to the strings
Michael Vogel [Tue, 7 Apr 2015 17:08:30 +0000 (19:08 +0200)]
Merge pull request #1499 from tobiasd/20150407_lng
CS, FR update to the strings
Michael Vogel [Tue, 7 Apr 2015 13:24:12 +0000 (15:24 +0200)]
Merge pull request #1498 from ddorian1/develop
Fix infinite scrolling with frost-mobile
Johannes Schwab [Tue, 7 Apr 2015 11:26:09 +0000 (13:26 +0200)]
fix infinite scrolling with frost-mobile
Tobias Diekershoff [Tue, 7 Apr 2015 07:07:04 +0000 (09:07 +0200)]
FR update of the strings
Tobias Diekershoff [Tue, 7 Apr 2015 07:00:12 +0000 (09:00 +0200)]
CS update to the strings
fabrixxm [Tue, 7 Apr 2015 06:07:54 +0000 (08:07 +0200)]
Merge pull request #1497 from tobiasd/20150407_HF_1460
after pull 1460 all notifications got marked read
Tobias Diekershoff [Tue, 7 Apr 2015 05:47:15 +0000 (07:47 +0200)]
after pull 1460 all notifications got marked read
fabrixxm [Tue, 31 Mar 2015 08:21:29 +0000 (10:21 +0200)]
allow to update generic subsets of tables
fabrixxm [Sun, 15 Mar 2015 20:19:29 +0000 (21:19 +0100)]
add new api dfrn/remoteauth
allow 'user@server' as username in api_login()
Tobias Diekershoff [Mon, 6 Apr 2015 12:09:53 +0000 (14:09 +0200)]
Merge pull request #1486 from annando/1504-like-on-comment
Liking of "red" comments is now possible
Michael Vogel [Mon, 6 Apr 2015 11:49:57 +0000 (13:49 +0200)]
The timestamp was at the wrong place
Michael Vogel [Mon, 6 Apr 2015 11:22:19 +0000 (13:22 +0200)]
Liking of "red" comments is now possible.
Tobias Diekershoff [Mon, 6 Apr 2015 10:56:03 +0000 (12:56 +0200)]
Merge pull request #1484 from annando/1504-bugfix-sql-warning
Bugfix: Avoid SQL warnings because of empty id list
Tobias Diekershoff [Mon, 6 Apr 2015 10:55:38 +0000 (12:55 +0200)]
Merge pull request #1485 from annando/1504-diaspora-plink
Diaspora: Central "plink" function
Michael Vogel [Mon, 6 Apr 2015 10:26:31 +0000 (12:26 +0200)]
Diaspora: Central "plink" function
Michael Vogel [Mon, 6 Apr 2015 08:12:37 +0000 (10:12 +0200)]
Avoid SQL warnings because of empty id list.
Tobias Diekershoff [Mon, 6 Apr 2015 05:23:42 +0000 (07:23 +0200)]
Merge pull request #1483 from annando/1504-api-upload-pictures
API: New picture upload function (Enhanced Twidere support)
Michael Vogel [Mon, 6 Apr 2015 01:19:12 +0000 (03:19 +0200)]
API: New picture upload function (Enhanced Twidere support)
Tobias Diekershoff [Sun, 5 Apr 2015 19:24:21 +0000 (21:24 +0200)]
Merge pull request #1480 from annando/1504-diaspora-enhancement
Diaspora uses this to fetch single public items
Tobias Diekershoff [Sun, 5 Apr 2015 19:21:14 +0000 (21:21 +0200)]
Merge pull request #1481 from annando/1504-new-share-function
New central function for the "share" header
Michael Vogel [Sun, 5 Apr 2015 19:06:32 +0000 (21:06 +0200)]
Removed test logger
Michael Vogel [Sun, 5 Apr 2015 18:50:15 +0000 (20:50 +0200)]
Diaspora uses this to fetch single public items.
Michael Vogel [Sun, 5 Apr 2015 18:43:06 +0000 (20:43 +0200)]
New function for building the "share" header
Michael Vogel [Sun, 5 Apr 2015 18:40:31 +0000 (20:40 +0200)]
The order for the page parsing is changed.
Tobias Diekershoff [Sun, 5 Apr 2015 12:51:48 +0000 (14:51 +0200)]
Merge pull request #1477 from dc5ala/master
Just a few typos fixed I've seen
André Lohan [Sun, 5 Apr 2015 11:20:15 +0000 (13:20 +0200)]
fixes a few typos
Tobias Diekershoff [Sun, 5 Apr 2015 09:37:05 +0000 (11:37 +0200)]
Merge pull request #1460 from FlxAlbroscheit/develop
Issue 1163: Feature allowing desktop-notifications
fabrixxm [Sun, 5 Apr 2015 09:07:22 +0000 (11:07 +0200)]
Merge branch 'release/3.4' into develop
fabrixxm [Sun, 5 Apr 2015 09:05:30 +0000 (11:05 +0200)]
Merge branch 'release/3.4'
Michael Vogel [Sun, 5 Apr 2015 08:38:49 +0000 (10:38 +0200)]
Merge pull request #1476 from fabrixxm/changelog
update CHANGELOG
fabrixxm [Sun, 5 Apr 2015 08:30:57 +0000 (10:30 +0200)]
update CHANGELOG
fabrixxm [Sun, 5 Apr 2015 08:23:19 +0000 (10:23 +0200)]
Merge pull request #1474 from fabrixxm/silke-helptext
Connection approval help text, issue #1349, based on pull request #1463
fabrixxm [Sat, 4 Apr 2015 16:02:26 +0000 (18:02 +0200)]
different help text for different network
fabrixxm [Sat, 4 Apr 2015 15:42:23 +0000 (17:42 +0200)]
Merge branch 'helptext' of https://github.com/silke/friendica into silke-helptext
Michael Vogel [Fri, 3 Apr 2015 20:10:33 +0000 (22:10 +0200)]
Merge pull request #1473 from tobiasd/20150403doc
small updates to the developer intro doc
Tobias Diekershoff [Fri, 3 Apr 2015 17:47:14 +0000 (19:47 +0200)]
small changes to the developer intro doc
fabrixxm [Fri, 3 Apr 2015 13:07:56 +0000 (15:07 +0200)]
Merge pull request #1472 from annando/issue-1063
The unseen marker is now set according to the api output
Michael Vogel [Fri, 3 Apr 2015 12:58:42 +0000 (14:58 +0200)]
The unseen marker is now set according to the query that is used for the home timeline.
fabrixxm [Fri, 3 Apr 2015 11:56:27 +0000 (13:56 +0200)]
Merge pull request #1471 from annando/markdown-shared-posts
Diaspora/Libertree: problems with repeated posts
Michael Vogel [Fri, 3 Apr 2015 11:06:19 +0000 (13:06 +0200)]
Reshared posts weren't always recognized as such.
Michael Vogel [Fri, 3 Apr 2015 10:37:29 +0000 (12:37 +0200)]
The conversion of Repeated posts to markdown had a problem with a missing linefeed before the quote.
Michael Vogel [Thu, 2 Apr 2015 21:14:40 +0000 (23:14 +0200)]
Merge pull request #1469 from fabrixxm/changelog
Update codename and CHANGELOG
fabrixxm [Thu, 2 Apr 2015 20:18:59 +0000 (22:18 +0200)]
Update CHANGELOG
fabrixxm [Thu, 2 Apr 2015 20:17:35 +0000 (22:17 +0200)]
Merge pull request #1468 from tobiasd/20150402lng
DE update to the strings
fabrixxm [Thu, 2 Apr 2015 20:17:12 +0000 (22:17 +0200)]
Merge pull request #1467 from annando/issue-1306
Events from the past aren't shown anymore (hopefully)
fabrixxm [Thu, 2 Apr 2015 20:05:52 +0000 (22:05 +0200)]
Update codename and CHANGELOG
Tobias Diekershoff [Thu, 2 Apr 2015 19:34:59 +0000 (21:34 +0200)]
DE update to the strings
Tobias Diekershoff [Thu, 2 Apr 2015 16:23:27 +0000 (18:23 +0200)]
DE update to the strings
Michael Vogel [Wed, 1 Apr 2015 21:11:18 +0000 (23:11 +0200)]
Now past events aren't shown at any circumstance.
Michael Vogel [Wed, 1 Apr 2015 20:25:53 +0000 (22:25 +0200)]
Events from the past aren't shown anymore (hopefully)
Silke Meyer [Wed, 1 Apr 2015 08:10:00 +0000 (10:10 +0200)]
Improved help text, issue 1349.
Michael Vogel [Wed, 1 Apr 2015 05:52:20 +0000 (07:52 +0200)]
Merge pull request #1461 from fabrixxm/issue-1459
Block settings page for unauthorized users
fabrixxm [Tue, 31 Mar 2015 08:24:23 +0000 (10:24 +0200)]
Block settings page for unauthorized users
fixes issue #1459
projects / friendica.git / log