3877 commits

Author	SHA1	Message	Date
friendica	ac594183c6	Merge branch 'master' into tres and add some work on the item_deleted flag refactor ... Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php	2015-01-26 18:27:03 -08:00
friendica	d73972e8e2	provide a json feed of search results	2015-01-26 17:09:33 -08:00
friendica	b428fdf66e	abstract poco into a single function in socgraph so we can provide different wrappers for it providing slightly different functionality.	2015-01-25 16:27:09 -08:00
friendica	0125e9d288	Hide all the scary decision making stuff that sends intellectually challenged beings into siezures and brain melt-downs and online freak-outs.	2015-01-25 14:06:57 -08:00
friendica	4ca2ec7638	rework the new connection stuff so we don't need a "permissions have been changed but not saved" message.	2015-01-25 13:30:40 -08:00
anaqreon	1cbfe5adf1	misspelling	2015-01-25 15:49:07 -05:00
Habeas Codice	1d80bcf2e7	standardize sql	2015-01-24 21:16:43 -08:00
Habeas Codice	0405f2bcb9	Merge branch 'master' of https://github.com/friendica/red	2015-01-23 17:26:37 -08:00
Habeas Codice	891d231bbe	rand() fixes	2015-01-23 17:25:05 -08:00
marijus	0cbe64c360	some more kiss	2015-01-24 01:13:02 +01:00
marijus	8789c96e78	some code restructure	2015-01-23 14:50:39 +01:00
friendica	4c2a1e572a	start on item_restrict conversion	2015-01-22 21:04:54 -08:00
friendica	6e0e3b2433	more expanding item flags	2015-01-22 18:41:10 -08:00
friendica	e46eba1258	heavy lifting converting item flag bits	2015-01-22 17:41:16 -08:00
marijus	e874376268	this will require more fixing in include/enotify	2015-01-23 02:09:28 +01:00
marijus	87dcc4c145	possible performance improvement for sharedwithme update query	2015-01-22 22:50:38 +01:00
Habeas Codice	c05f0ec407	Merge branch 'master' of https://github.com/friendica/red	2015-01-21 21:27:07 -08:00
Habeas Codice	6d291d880e	directory server dba sql fixes	2015-01-21 21:25:50 -08:00
marijus	cad8228db3	Merge branch 'master' of https://github.com/friendica/red	2015-01-22 04:58:34 +01:00
marijus	3731ff97ff	make $links an array of links	2015-01-22 04:57:59 +01:00
friendica	b946ac63a1	couple of hubloc manager issues	2015-01-21 19:09:12 -08:00
friendica	0010eaa411	Merge https://github.com/friendica/red into pending_merge	2015-01-21 18:34:31 -08:00
friendica	8472e706bc	hubloc manage issue	2015-01-21 18:34:15 -08:00
marijus	4ff71fc0c7	change mod/sharedwithme backend to use activity object - this is not backwards compatible	2015-01-22 02:34:38 +01:00
friendica	29436081a8	slow progress removing bitfields on item table	2015-01-21 16:06:25 -08:00
friendica	51848c6190	working through the xchan table to remove bitfields, mostly complete except for updating the updater	2015-01-20 19:33:19 -08:00
friendica	ee3eee425c	that should take care of the bitfields in hubloc	2015-01-20 16:13:18 -08:00
friendica	6f11f20992	first cut at unpacking bitfields in hubloc, fixed hubloc_error and hubloc_deleted	2015-01-20 15:35:42 -08:00
RedMatrix	39dad87adc	Merge pull request #862 from pafcu/help ... Add some database documentation + mod/help.php bugfix	2015-01-19 10:19:08 +11:00
marijus	b4faf4d90b	fix link	2015-01-18 15:31:13 +01:00
marijus	9ac0922ff2	fix goaway link	2015-01-18 15:29:05 +01:00
marijus	973398b915	fix profile tabs link	2015-01-18 15:15:48 +01:00
marijus	1c2d956d7f	basic proof of concept file activity support - will send activity via the filestorage module and via attach_delete()	2015-01-18 14:44:58 +01:00
Stefan Parviainen	319b279b3a	Don't try to open unexisting files in help	2015-01-18 10:26:05 +01:00
friendica	8f8700ddd2	mod_prep usability enhancements, doc updates	2015-01-16 00:53:04 -08:00
friendica	ec4d3a2349	fix to poco chatrooms	2015-01-15 20:56:55 -08:00
friendica	43254029ad	errors in mod_poco	2015-01-15 20:43:53 -08:00
friendica	dfe31dc3b7	more heavy lifting on poco rep	2015-01-15 19:05:42 -08:00
friendica	9c15844845	make sure mod/prep follows the poco_rating allow preference	2015-01-15 17:50:24 -08:00
friendica	597b07e8cc	poco rating - add a test module for pulling out ratings	2015-01-15 17:32:41 -08:00
friendica	e7932d97a2	editing stuff for poco reputation	2015-01-15 16:37:47 -08:00
friendica	1c9299ed42	more backend work on poco rating	2015-01-15 14:05:18 -08:00
friendica	56bc3bcdce	provide correct permissions role default for old-timers that didn't have any role configured.	2015-01-14 19:27:55 -08:00
friendica	168b67fa41	correct some activity object types (for comments), also fix a foreach warning resulting from recent tag work	2015-01-14 18:36:23 -08:00
friendica	7a24943c34	some back-end code to support location activity objects. Work in progress.	2015-01-14 14:46:01 -08:00
friendica	1005618faf	honor disable_discover_tab in mod/home - it isn't a tab here but basically block public content from showing if it's set.	2015-01-14 13:52:34 -08:00
friendica	a93f2b1b8f	now that's useful...	2015-01-13 18:41:11 -08:00
friendica	dfdef0af0d	provide a setting to control ALLOWCODE permissions at the channel level - it isn't always appropriate to apply this to all channels in an account.	2015-01-13 18:30:30 -08:00
friendica	98acefe228	revert recent 3.0 changes to mod/cloud so we can work on this completely in another branch and not destabilise core	2015-01-13 18:12:04 -08:00
friendica	111bbe65d9	Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging ... Conflicts: mod/profiles.php	2015-01-13 18:07:49 -08:00