Commit graph

10019 commits

Author SHA1 Message Date
Frank Dieckmann f536301d05 Update Bugs-and-Issues.md 2015-04-21 20:02:47 +02:00
Frank Dieckmann b4aecb63e8 Bugs-and-Issues.md: Linguistic style and addresses 2015-04-21 19:22:44 +02:00
Michael Vogel e2827c0af7 The ID field will be stored with notifications as well. 2015-04-21 10:14:20 +02:00
Michael Vogel 261cd441c7 Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications 2015-04-21 10:13:28 +02:00
Tobias Diekershoff 604a630fdc Merge pull request #1525 from silke/documentation
And... still more files
2015-04-19 20:08:55 +02:00
Silke Meyer 4bea25e32f reformatted and reorganized a bit 2015-04-19 19:15:43 +02:00
Silke Meyer 8a5f6b0a93 line breaks 2015-04-19 18:48:16 +02:00
Silke Meyer 79de00f333 Moved plugin documentation from admin to dev manual 2015-04-19 18:44:12 +02:00
Silke Meyer 7fdde0e547 reformatted 2015-04-19 18:41:42 +02:00
Silke Meyer ec584b164d line breaks 2015-04-19 18:04:08 +02:00
Silke Meyer c62120549e line breaks 2015-04-19 17:50:17 +02:00
Silke Meyer f19fb2d307 reformatted 2015-04-18 19:56:50 +02:00
Silke Meyer 00dc2945ba Reformatted 2015-04-18 19:51:57 +02:00
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
fabrixxm a677e12b50 Merge pull request #1516 from tobiasd/issue1429
regarding issue 1429
2015-04-18 17:15:22 +02:00
Silke Meyer 3bab439540 line breaks 2015-04-18 17:10:14 +02:00
Tobias Diekershoff 32cb1eb9f1 Merge pull request #1524 from silke/documentation
More updated and reformatted documentation files
2015-04-18 17:04:05 +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
fabrixxm 9210e4f0d4 Merge pull request #1521 from tugelbend/develop
bug fix: "local_" has 6 not 5 characters
2015-04-17 10:05:24 +02:00
Hauke Altmann 62b4f117bf bug fix: "local_" has 6 not 5 characters 2015-04-17 10:02:17 +02:00
fabrixxm fdb74b6a42 Merge pull request #1520 from tugelbend/develop
bug fix: substring is not a PHP function %-)
2015-04-17 10:01:51 +02:00
Hauke Altmann c292d01723 bug fix: substring is not a PHP function %-) 2015-04-17 09:59:28 +02:00
Tobias Diekershoff 519018d430 Merge pull request #1512 from fraengii/2015-04-12-Account-Basics.md
12.4.2015, doc/de/Account-Basics.md: Anrede und Stil
2015-04-17 09:45:41 +02:00
Tobias Diekershoff 8e5f224730 Merge pull request #1503 from fraengii/20150408-H-de-fraengii
doc/de/Quick-Start-*.md
2015-04-17 09:45:22 +02:00
Tobias Diekershoff c6aeaa8fc1 Merge pull request #1519 from silke/documentation
Yes, looks good :-)
2015-04-17 09:42:49 +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 cbe4e2bf8c Merge pull request #1518 from tugelbend/develop
preserve local indexes of friendica database when updating
2015-04-17 08:41:59 +02:00
hauke 00cbc383f5 code cleanup 2015-04-16 21:07:46 +02:00
hauke 0d61e462fe preserve local index of friendica database when updating 2015-04-16 21:05:37 +02:00
Michael Vogel d42cea51a2 The item id is now stored in every notification as well 2015-04-16 07:18:06 +02:00
Michael Vogel 7a1db2e083 Only show one notification per parent 2015-04-16 06:47:09 +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
Tobias Diekershoff 8367cadeef dont normalise OpenID URLs and fallback to https if no protocol is specified 2015-04-14 12:27:36 +02:00