11770 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stefan Parviainen	6ee514579f	Move registration button to before login in nav to avoid problems with mobile. In the long run a better fix should be found.	2014-10-19 21:08:53 +02:00
Thomas Willingham	fe877b68aa	Seventy five people you won't believe contributed to RedMatrix!	2014-10-19 17:09:06 +01:00
RedMatrix	5ded3d5247	Merge pull request #649 from pafcu/master ... Improvements to date selection	2014-10-19 20:40:56 +11:00
Stefan Parviainen	a6c4ae186e	Don't display date format, it's already in the placeholder text	2014-10-19 11:09:51 +02:00
Stefan Parviainen	519ef48500	Changes in the datetimesel api, prevent user from picking event end date earlier than start date	2014-10-19 10:47:42 +02:00
Stefan Parviainen	d9817779fb	Give an error if event is supposed to end before it starts. Closes friendica/red#534	2014-10-19 08:33:18 +02:00
RedMatrix	fb183a29b9	Merge pull request #646 from pafcu/master ... Initial stab at better general datetime picker	2014-10-19 08:53:49 +11:00
Stefan Parviainen	7c4f55af9f	Oops, forgot one file	2014-10-18 22:17:49 +02:00
Stefan Parviainen	7e091c05a1	Initial stab at better general datetime picker	2014-10-18 15:04:47 +02:00
Thomas Willingham	e5a17b5d77	Doco - if I ever have to touch dozens of files to change one link again, ... I'll stab someone - so make sure we don't have to.	2014-10-17 17:42:34 +01:00
Thomas Willingham	17d23a52e2	Policy	2014-10-17 17:16:53 +01:00
Jeroen	0950f90e66	New util/messages.po	2014-10-17 14:19:38 +00:00
Jeroen	5cd6965eef	Remote login > Remote authentication as discussed	2014-10-17 14:00:58 +00:00
marijus	7e2a11ddde	oups... forgot to remove some debug stuff	2014-10-17 14:32:44 +02:00
marijus	fd48d4d81d	make lockview for photos work	2014-10-17 14:28:21 +02:00
friendica	7bbe700f3f	mark signature forgeries	2014-10-16 16:19:19 -07:00
RedMatrix	8391e8b1a1	Merge pull request #645 from pafcu/master ... Turn login button into a menu	2014-10-17 09:43:36 +11:00
marijus	f290c4b1e4	Merge branch 'master' of https://github.com/friendica/red	2014-10-16 22:53:04 +02:00
marijus	1ee2b631db	lighttpd sample conf security enhancement	2014-10-16 22:52:28 +02:00
Stefan Parviainen	e425def2a2	Merge branch 'master' of https://github.com/pafcu/red	2014-10-16 21:37:14 +02:00
Stefan Parviainen	6867a8a7f6	Login menu	2014-10-16 17:21:37 +02:00
pafcu	865f804cfb	Merge pull request #1 from friendica/master ... Sync with upstream	2014-10-16 16:06:20 +03:00
friendica	e1f88fd15d	jsonp support (thankxs fabrixxm)	2014-10-16 02:02:11 -07:00
friendica	d4abc91d1f	Merge https://github.com/friendica/red into pending_merge	2014-10-15 18:36:48 -07:00
friendica	4cbe696859	remove log statement	2014-10-15 18:36:36 -07:00
friendica	ae9e1fa688	missing event permissions	2014-10-15 18:35:56 -07:00
Thomas Willingham	4af0b717de	Merge branch 'master' of https://github.com/friendica/red	2014-10-16 01:58:17 +01:00
Thomas Willingham	11ad127c68	Let's not play security expert. Use Mozillas recommended server ... config, even if it's ridiculously verbose. Reasoning - they make the browser, so if they've got it wrong, you're buggered anyway.	2014-10-16 01:57:04 +01:00
friendica	e80c20d258	Don't recognise hashtags starting with #, e.g. ###	2014-10-15 17:55:20 -07:00
Thomas Willingham	1eb478ba54	SSL is broken you say? Well bah gum. ... Someone probably needs to update Lighttpd and Apache too.	2014-10-16 00:47:02 +01:00
marijus	997ec0911c	$comments > $commentbox	2014-10-15 22:41:42 +02:00
marijus	04a254d94a	some work on single photo view comments	2014-10-15 22:23:38 +02:00
marijus	dc23030dcb	one more item_id > id	2014-10-15 21:17:07 +02:00
marijus	0c2d9edd83	it seems we do not have an key called item_id here so must be id only	2014-10-15 21:15:20 +02:00
friendica	aa0aa22b8a	chanman is now 'locs' and a couple of post handlers have been defined.	2014-10-14 20:33:38 -07:00
friendica	65b84e839a	back to wrestling with the !@#$ diaspora recursive reshare from hell	2014-10-14 18:47:08 -07:00
friendica	5362943330	missing quote	2014-10-14 18:05:32 -07:00
friendica	2db7d88e28	this is the reason Diaspora forum tagging was broken	2014-10-14 18:02:34 -07:00
friendica	903f7e73fb	if a hubloc primary change results in an xchan primary change, create a directory update packet.	2014-10-13 21:44:46 -07:00
friendica	0057612a9f	figuring out how to bootstrap the change_primary procedure when all you have is inconsistent data which you think you trust.	2014-10-13 21:38:36 -07:00
friendica	79684e05cc	fix import sql error	2014-10-13 21:24:06 -07:00
friendica	19e1b95837	don't use cached data	2014-10-13 21:01:51 -07:00
friendica	bd4dd85fbb	there's the problem	2014-10-13 20:53:34 -07:00
friendica	8a907a789f	more diagnostic when changing primary	2014-10-13 17:59:03 -07:00
friendica	3d56bb5cd7	this bug has been there for a *long* time. First time I've ever seen it triggered.	2014-10-13 16:21:02 -07:00
friendica	b740baf6a9	Merge https://github.com/friendica/red into pending_merge	2014-10-13 16:13:13 -07:00
friendica	6503b91131	sql	2014-10-13 16:12:32 -07:00
RedMatrix	b9457c06af	Merge pull request #638 from dawnbreak/RedDAV ... When you delete something in /cloud stay in the right folder.	2014-10-14 09:40:43 +11:00
friendica	8710496689	Merge https://github.com/friendica/red into pending_merge	2014-10-13 15:28:40 -07:00
friendica	1b0390af06	new function hubloc_change_primary()	2014-10-13 15:27:56 -07:00