Commit graph

9582 commits

Author SHA1 Message Date
Silke Meyer
963d76fa37 Reformatting and minor changes to content 2015-04-18 19:46:11 +02:00
Silke Meyer
02f03c0313 Reformatted 2015-04-18 19:31:19 +02:00
Silke Meyer
584c2e4a58 Reformatting and minor changes to content 2015-04-18 18:57:22 +02:00
Silke Meyer
f1fc55736b Reformatting and minor changes to content 2015-04-18 18:39:16 +02:00
Silke Meyer
3bab439540 line breaks 2015-04-18 17:10:14 +02:00
Silke Meyer
00a3960df0 Reformatting, cropped the admin part of SSL documentation out of the users' question 2015-04-18 16:56:56 +02:00
Silke Meyer
90c657e211 Formatting and minor changes 2015-04-18 16:02:39 +02:00
Silke Meyer
5b9f29cade Formatting and some minor changes 2015-04-18 15:51:27 +02:00
Silke Meyer
4f4dc6b7e0 minor formatting stuff mainly 2015-04-17 18:23:00 +02:00
Silke Meyer
f4eaf5842d sorted out the headings' md syntax 2015-04-17 18:17:44 +02:00
Silke Meyer
7faf4de3af md syntax, fixed minor typos 2015-04-17 18:05:54 +02:00
Silke Meyer
27c101e041 line breaks 2015-04-17 18:00:57 +02:00
Silke Meyer
40f9568ee4 Proper markdown subheadings 2015-04-17 17:10:27 +02:00
Silke Meyer
60f963c685 line breaks 2015-04-17 17:03:20 +02:00
Silke Meyer
86c3d16726 Proper markdown subheadings 2015-04-17 16:58:48 +02:00
Silke Meyer
ecb33e2b6f Added branching workflow, reformatted markdown syntax 2015-04-17 16:56:41 +02:00
Silke Meyer
e6d516a355 Just added linebreaks 2015-04-17 16:04:10 +02:00
Silke Meyer
99cc1419f6 Modified according to #1478 (line break after each sentence) 2015-04-17 09:13:40 +02:00
Silke Meyer
803a9328b4 Corrected typo 2015-04-17 09:08:57 +02:00
fabrixxm
94451a5eb5 Merge pull request #1517 from tobiasd/20150414_lng
CS, FR: update to the strings
2015-04-14 20:08:24 +02:00
Tobias Diekershoff
14d61b5644 FR update of the strings 2015-04-14 13:41:56 +02:00
Tobias Diekershoff
60a17ef88e CS update of the strings 2015-04-14 13:40:24 +02:00
Michael Vogel
178b7eba1b Merge pull request #1487 from fabrixxm/projects
new api dfrn/remoteauth, allow plugins to use update_structure
2015-04-13 15:47:11 +02:00
Tobias Diekershoff
ef6ddfcb15 Merge pull request #1515 from treellama/develop
use ImageMagick for orientation when available
2015-04-13 07:44:04 +02:00
Gregory Smith
ce821d0891 use ImageMagick for orientation when available 2015-04-12 21:09:25 -04:00
Tobias Diekershoff
ccba86b384 Merge pull request #1511 from annando/1504-contact-last-item
New field in the contact table to better detect "dead profiles"
2015-04-12 15:09:47 +02:00
Michael Vogel
b8542e336c Merge remote-tracking branch 'upstream/develop' into 1504-contact-last-item 2015-04-12 11:56:02 +02:00
Michael Vogel
9a35e861ce New field in the contact table to better detect "dead profiles" 2015-04-12 11:40:38 +02:00
Tobias Diekershoff
d5ad32a309 Merge pull request #1510 from annando/1504-contact-update
New function to update the contact data
2015-04-12 10:56:36 +02:00
Michael Vogel
64e343ed4b Some refinement to the contact update 2015-04-12 10:32:02 +02:00
Michael Vogel
1058d055d1 Merge remote-tracking branch 'upstream/develop' into 1504-contact-update
Conflicts:
	mod/contacts.php
2015-04-12 09:59:28 +02:00
fabrixxm
a0adf8c6a2 change remoteauth endpoint path 2015-04-12 08:53:30 +02:00
fabrixxm
8b2742dc7d Merge pull request #1505 from annando/1504-unified-follow
The behaviour when following a new contact is now unified
2015-04-12 08:48:36 +02:00
fabrixxm
1731db45c2 Merge pull request #1509 from annando/1504-code-rework
Code reworks: replaced hardcoded network text with the corresponding constants
2015-04-12 08:45:31 +02:00
Michael Vogel
04d9d9863d Fixed "Copy and paste" bug. 2015-04-11 23:56:53 +02:00
Michael Vogel
2c3e2908b2 There is now a new possibility to update contact data. 2015-04-11 23:51:47 +02:00
Michael Vogel
0e895e24f7 Code reworks: replaced hardcoded network text with the corresponding constants. 2015-04-11 22:14:56 +02:00
Michael Vogel
190b7d6070 Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow 2015-04-10 11:34:21 +02:00
Tobias Diekershoff
dea1b067bd Merge pull request #1479 from annando/1504-parse_url
The order for the page parsing is changed
2015-04-10 10:13:13 +02:00
Tobias Diekershoff
5e3f2b67a8 Merge pull request #1507 from annando/1504-community-automention
Automention of communities when a single contact is selected
2015-04-10 09:50:08 +02:00
Michael Vogel
489af0d55d Just added some forgotten escaping. 2015-04-10 00:54:42 +02:00
Michael Vogel
662fd84891 Automention of communities when a single contact is selected on the network page. 2015-04-10 00:42:03 +02:00
Michael Vogel
26eceaacbe Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow 2015-04-09 19:49:57 +02:00
Michael Vogel
e81f9c91fa Merge remote-tracking branch 'upstream/develop' into 1504-parse_url 2015-04-09 19:49:33 +02:00
Michael Vogel
98bf8d85fa The "fastlane" can be removed there. 2015-04-09 19:35:17 +02:00
Michael Vogel
ccbac6874b The "connect" link ar the display page now directs to the new "follow" page as well. 2015-04-09 07:45:48 +02:00
Michael Vogel
015ebd7d1b "fastlane" should now work with remote adding as well. 2015-04-09 00:33:45 +02:00
Michael Vogel
f6ea872986 The behaviour when following a new contact is now unified. 2015-04-09 00:10:21 +02:00
Michael Vogel
e955f013ca Merge pull request #1502 from tobiasd/20150408_de
DE update to the strings
2015-04-08 19:17:33 +02:00
Tobias Diekershoff
4ad52a417a DE update to the strings 2015-04-08 12:06:05 +02:00