7216 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friendica	ddf5bf8968	rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present.	2013-03-21 18:25:41 -07:00
friendica	b3c699d49a	support various and multiple content_types on the display side - still have some work to do on the posting side.	2013-03-21 16:14:08 -07:00
friendica	c3590f6454	Merge https://github.com/friendica/red into zpull	2013-03-21 15:41:23 -07:00
friendica	b3417e4854	main_slider hook	2013-03-21 15:41:00 -07:00
friendica	02eb9aa521	update for js_upload	2013-03-21 15:30:51 -07:00
friendica	7dfdc4fba7	Merge pull request #40 from MicMee/master ... small fix for to add additional profiles	2013-03-21 12:52:43 -07:00
Michael Meer	c1f3c72099	otherwise add profile wont work	2013-03-21 18:38:34 +01:00
friendica	d9492a4a76	Merge https://github.com/friendica/red into zpull	2013-03-21 02:21:56 -07:00
friendica	4b22c6e531	update	2013-03-21 02:21:44 -07:00
friendica	6db6f6640e	Merge pull request #38 from beardy-unixer/master ... Small fixes	2013-03-21 02:20:32 -07:00
friendica	6a82fd609a	Merge pull request #39 from zzottel/master ... update channel notify flags on save settings	2013-03-21 01:30:16 -07:00
zottel	166596939b	write notify settings to channel table when saving settings	2013-03-21 09:02:10 +01:00
Thomas Willingham	06c5d0fcc2	Typo	2013-03-21 04:18:03 +00:00
Thomas Willingham	676d35b173	Add register link to nav.	2013-03-21 04:14:19 +00:00
Thomas Willingham	499083d5d4	Revert randprof - that was stupid. If you have a local channel, you also have it's xchan.	2013-03-20 23:43:02 +00:00
Thomas Willingham	28975931b5	Add a fallback or two to randprof.	2013-03-20 23:35:21 +00:00
Thomas Willingham	f49dcc0a0c	Use load_pconfig in style.php	2013-03-20 22:57:08 +00:00
Thomas Willingham	39028d6184	Make the channels profile tab actually do something.	2013-03-20 20:46:43 +00:00
friendica	117da45c70	Merge pull request #37 from beardy-unixer/master ... Add channels to profile table	2013-03-19 20:35:19 -07:00
Thomas Willingham	897910b5c9	Add "channels" field to profile table.	2013-03-20 03:17:07 +00:00
friendica	9d6a4093ba	we'll need a special system channel (not attached to any account) for directory synchronisation	2013-03-18 17:55:04 -07:00
friendica	11534ae91e	Merge pull request #36 from beardy-unixer/master ... Admin panel mobility/accessibility theme options	2013-03-18 15:21:45 -07:00
Thomas Willingham	9c4b3b03db	Allow admins to specify default mobile/accessibility theme.	2013-03-17 18:51:17 +00:00
friendica	104b41164f	Merge pull request #34 from beardy-unixer/master ... Admin panel	2013-03-15 15:38:38 -07:00
friendica	5a29f511c1	add xconfig table and functions, update strings and doco	2013-03-15 15:36:58 -07:00
Thomas Willingham	b48c481b9c	Tidy up	2013-03-15 15:25:39 +00:00
friendica	62f61a559a	Merge https://github.com/friendica/red into zpull	2013-03-14 22:22:00 -07:00
friendica	6a4170ab01	prepare for multiple content types	2013-03-14 22:21:38 -07:00
Thomas Willingham	d07971b909	Merge remote-tracking branch 'upstream/master' ... Conflicts: view/theme/redbasic/css/style.css	2013-03-14 22:50:30 +00:00
friendica	580acc5445	update modification time whenever a directory related attribute is changed	2013-03-13 17:27:17 -07:00
Thomas Willingham	ffcba3db81	Fix path in photo_ablums.tpl	2013-03-13 23:56:14 +00:00
friendica	ed2bcb6855	directory synchronisation timestamps	2013-03-13 16:28:41 -07:00
friendica	62e55ae63b	undo	2013-03-12 19:41:15 -07:00
friendica	e7b6669dc3	update xchans on url change	2013-03-12 17:39:35 -07:00
friendica	022316fd49	tell it like it is	2013-03-12 01:55:25 -07:00
friendica	f3f341eb8d	tell it like it is.	2013-03-12 00:55:29 -07:00
friendica	6c9db5a1cf	make reshares translateable	2013-03-11 21:29:43 -07:00
Thomas Willingham	fbc5260995	Get admin/users mostly working. Still need to associate channels with accounts.	2013-03-12 02:35:18 +00:00
friendica	f988213af8	fix typos	2013-03-11 18:22:40 -07:00
friendica	f09f2998dc	unknown column	2013-03-11 17:42:12 -07:00
friendica	d568f4d029	class def for reshared content	2013-03-11 16:50:24 -07:00
friendica	b86277b0ff	dangerous typo that removes all your hublocs, fix reshare formatting	2013-03-11 16:13:09 -07:00
friendica	bcf4592cb0	likes were somewhat confused. Unconfuse them.	2013-03-11 00:14:12 -07:00
friendica	26499981b6	cleanup	2013-03-10 20:39:27 -07:00
Thomas Willingham	dd45daaad8	Get rid of max-height - no longer breaks newer versions of chrome, but does break showmore.	2013-03-11 02:19:25 +00:00
friendica	952b2ef2ab	.	2013-03-10 18:45:58 -07:00
Thomas Willingham	0d504715c1	Smarty template	2013-03-11 01:13:23 +00:00
Thomas Willingham	9834df13c9	Make idiot mode colour schemes work.	2013-03-11 01:12:13 +00:00
Thomas Willingham	f961251176	And another.	2013-03-10 21:12:43 +00:00
Thomas Willingham	635ce018fc	Oops, remove erroneously committed files.	2013-03-10 21:10:49 +00:00