9567 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hauke Altmann	62b4f117bf	bug fix: "local_" has 6 not 5 characters	2015-04-17 10:02:17 +02:00
Hauke Altmann	c292d01723	bug fix: substring is not a PHP function %-)	2015-04-17 09:59:28 +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
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
Michael Vogel	3195157b2e	Merge pull request #1499 from tobiasd/20150407_lng ... CS, FR update to the strings	2015-04-07 19:08:30 +02:00
Michael Vogel	5ceb8e76fd	Merge pull request #1498 from ddorian1/develop ... Fix infinite scrolling with frost-mobile	2015-04-07 15:24:12 +02:00
Johannes Schwab	107b495183	fix infinite scrolling with frost-mobile	2015-04-07 13:26:09 +02:00
Tobias Diekershoff	7ecc401b5c	FR update of the strings	2015-04-07 09:07:04 +02:00
Tobias Diekershoff	52549dae7b	CS update to the strings	2015-04-07 09:00:12 +02:00
fabrixxm	9b6922fa86	Merge pull request #1497 from tobiasd/20150407_HF_1460 ... after pull 1460 all notifications got marked read	2015-04-07 08:07:54 +02:00
Tobias Diekershoff	42ec9ad279	after pull 1460 all notifications got marked read	2015-04-07 07:47:15 +02:00
fabrixxm	73248f7dda	allow to update generic subsets of tables	2015-04-06 21:03:11 +02:00
fabrixxm	11a83b2345	add new api dfrn/remoteauth ... allow 'user@server' as username in api_login()	2015-04-06 21:03:11 +02:00
Tobias Diekershoff	3355d00082	Merge pull request #1486 from annando/1504-like-on-comment ... Liking of "red" comments is now possible	2015-04-06 14:09:53 +02:00
Michael Vogel	539a93b3f1	The timestamp was at the wrong place	2015-04-06 13:49:57 +02:00
Michael Vogel	1048be1dd0	Liking of "red" comments is now possible.	2015-04-06 13:22:19 +02:00
Tobias Diekershoff	81901f39e5	Merge pull request #1484 from annando/1504-bugfix-sql-warning ... Bugfix: Avoid SQL warnings because of empty id list	2015-04-06 12:56:03 +02:00
Tobias Diekershoff	95c58e59d3	Merge pull request #1485 from annando/1504-diaspora-plink ... Diaspora: Central "plink" function	2015-04-06 12:55:38 +02:00
Michael Vogel	4768c6c6b6	Diaspora: Central "plink" function	2015-04-06 12:26:31 +02:00