7503 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friendica	6e17be3e85	Merge https://github.com/friendica/red into zpull	2013-04-03 18:06:16 -07:00
friendica	f353b9ae3d	liking comments were reverted to liking the parent after sending item to another channel	2013-04-03 18:04:48 -07:00
friendica	0ba7f76bfd	Merge pull request #45 from beardy-unixer/master ... Album slideshows	2013-04-03 17:34:55 -07:00
friendica	c10e30631a	missed channel_default_group key nrename	2013-04-03 15:51:56 -07:00
friendica	cecf3687bb	rev update	2013-04-03 15:48:25 -07:00
Thomas Willingham	2f24bf2efe	New mail_list template.	2013-03-31 21:05:20 +01:00
Thomas Willingham	3d714638b3	Merge remote-tracking branch 'upstream/master'	2013-03-29 20:48:12 +00:00
Thomas Willingham	6803265eba	Typo in page_display	2013-03-29 20:38:59 +00:00
Thomas Willingham	8741bb20e8	Make prettyPhoto a feature, add slideshow for albums.	2013-03-29 20:36:39 +00:00
friendica	ef09e50514	Merge pull request #44 from beardy-unixer/c8852d455e77624baf9e6ac852c1176f45462e70 ... Template cleanup	2013-03-28 14:55:50 -07:00
Thomas Willingham	fbb4dc69c6	Merge remote-tracking branch 'upstream/master'	2013-03-28 21:16:25 +00:00
Thomas Willingham	c8852d455e	Template clean up.	2013-03-28 21:13:18 +00:00
friendica	d0bf459721	clarify	2013-03-27 20:36:23 -07:00
friendica	f48510432a	updated readme	2013-03-27 20:32:37 -07:00
friendica	810a60b912	add new connections to default group (if any)	2013-03-27 19:35:34 -07:00
friendica	8148b7c32f	update manage table and some documentation	2013-03-27 19:02:01 -07:00
friendica	ca605a8c83	more doco	2013-03-26 19:53:04 -07:00
friendica	abd58bce68	set hidden flags on new directory entries, not just existing ones	2013-03-26 19:37:33 -07:00
friendica	63c6427dc4	magic auth issue	2013-03-26 16:20:44 -07:00
friendica	783d744f02	we don't need this any more	2013-03-25 21:39:34 -07:00
friendica	884812bcba	doco	2013-03-25 21:32:12 -07:00
friendica	d0133d6f87	uri to mid	2013-03-25 13:01:48 -07:00
friendica	fecc7bfad4	Merge pull request #43 from beardy-unixer/master ... Update build_query for mid	2013-03-25 12:59:50 -07:00
Thomas Willingham	fb8a0e06c4	Updated build_query for mid	2013-03-25 19:20:12 +00:00
friendica	23cd14329d	fix mod_display breakage.	2013-03-24 19:51:23 -07:00
friendica	5e47a8a14a	descriptive text	2013-03-23 16:18:44 -07:00
friendica	85d1300889	Merge https://github.com/friendica/red into zpull	2013-03-23 16:18:16 -07:00
friendica	0c5d7cbfae	Merge pull request #42 from beardy-unixer/master ... Use prettyPhoto for photo albums	2013-03-23 16:17:55 -07:00
friendica	ab4058eb1a	rev update	2013-03-23 16:03:08 -07:00
Thomas Willingham	43af9b1429	Merge remote-tracking branch 'upstream/master'	2013-03-23 21:19:54 +00:00
Thomas Willingham	4b6bc77977	Implement prettyPhoto (somewhat).	2013-03-23 21:17:44 +00:00
Thomas Willingham	2dafe2952d	Remove Twatter/Facebook shit.	2013-03-23 21:14:03 +00:00
Thomas Willingham	6b3fb662cb	Add prettyPhoto library.	2013-03-23 20:12:42 +00:00
Thomas Willingham	d9b51c6db5	Redbasic - get rid of max-height for images (got lost in the merge last time it was fixed)	2013-03-23 15:58:21 +00:00
friendica	0999b88a48	Merge https://github.com/friendica/red into zpull	2013-03-21 18:29:08 -07:00
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	fe87e7f972	Merge pull request #41 from unary/events ... small fixes for events	2013-03-21 18:24:41 -07:00
Michael Johnston	fea2f9ac9b	small fixes for events	2013-03-21 21:07:38 -04: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