keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9794 commits 4 branches 0 tags 179 MiB
Commit graph

9794 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael Vogel
2285b3b7a7 Storing the parent with every notification 2015-04-14 06:54:41 +02:00
Frank Dieckmann
3525df9e11 Schreibfehler korrigiert 2015-04-13 18:16:42 +02:00
Frank Dieckmann
fd065e6aec Klicke auf "Pinnwand" 2015-04-13 18:13:59 +02:00
Frank Dieckmann
1089521249 Some more adds 2015-04-13 18:09:05 +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
Frank Dieckmann
1f5ee8a9e9 Capitalization of addresses an linguistic style in Account-Basics.md 2015-04-12 15:32:02 +02: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