9144 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friendica	6fcc4beac5	still not entirely happy with the text. So I'm playing with it a bit.	2013-12-22 19:19:12 -08:00
friendica	1a42580ad4	remove a couple of mysql reserved words from being used as table or row names. For this round we're getting 'group' and 'desc'. Warning: potentially destabilising as this touches a lot of code.	2013-12-22 18:37:39 -08:00
friendica	eff38538ee	more (somewhat minor) but important cleanup for mod_photos so visitors with the correct permissions to add photos can also remove them	2013-12-22 17:44:14 -08:00
friendica	a9e225b38a	issue deleting photos (attached item remained undeleted and became visible, though the photo was gone)	2013-12-22 17:30:49 -08:00
friendica	38df3f6404	make xref work	2013-12-22 16:53:26 -08:00
friendica	7d484969dd	more proof-reading	2013-12-22 16:47:14 -08:00
friendica	be19eb045c	proof-read	2013-12-22 15:53:08 -08:00
friendica	6e5173f430	let's confront this "social network" elephant in the room head on rather than try to sweep it under the rug.	2013-12-22 15:51:02 -08:00
friendica	c1a85ccbec	add ability to set created date/time from the api	2013-12-22 14:29:15 -08:00
friendica	97728543c1	clean up sys_channel creation so it will work	2013-12-22 14:08:38 -08:00
friendica	42361588e9	Merge https://github.com/friendica/red into zpull	2013-12-22 13:51:08 -08:00
friendica	77fdb4a1ee	js functions behind quick permission links were lost in comanchification process - because the js didn't get relocated to the new connedit module	2013-12-22 13:49:32 -08:00
friendica	30219b5bda	Merge pull request #249 from cvogeley/master ... New modal dialog for item expiry	2013-12-22 13:44:34 -08:00
friendica	bb623fc464	Merge pull request #250 from beardy-unixer/master ... Various bits	2013-12-22 13:44:00 -08:00
Thomas Willingham	0d5c5187f9	Style	2013-12-22 21:15:13 +00:00
Thomas Willingham	2074bd0a3b	Must have broken that in a merge - put it back	2013-12-22 21:13:24 +00:00
Thomas Willingham	569e93d6e1	Ooops, also update the DB	2013-12-22 20:54:41 +00:00
Thomas Willingham	57bf80fff0	Achievements	2013-12-22 20:54:31 +00:00
Thomas Willingham	666586f332	xref	2013-12-22 20:51:49 +00:00
Thomas Willingham	c4b4f27796	Some sys chan stuff	2013-12-22 20:47:57 +00:00
Thomas Willingham	3502a2e86b	Merge remote-tracking branch 'upstream/master'	2013-12-22 20:45:31 +00:00
Christian Vogeley	6480e14a91	Use the red matrix icons	2013-12-22 20:01:18 +01:00
Christian Vogeley	0f4b6ba371	Merge correction	2013-12-22 15:05:56 +01:00
Christian Vogeley	0f902f94f3	Correction 2	2013-12-22 14:59:47 +01:00
Christian Vogeley	1a72239af0	Correction	2013-12-22 14:58:27 +01:00
Christian Vogeley	242bae5acd	Merge	2013-12-22 14:55:28 +01:00
Christian Vogeley	031b9b7d77	Merge branch 'bootstrap'	2013-12-22 14:47:37 +01:00
Christian Vogeley	870df76463	Merge remote-tracking branch 'upstream/master' into bootstrap ... Conflicts: view/php/theme_init.php	2013-12-22 14:31:27 +01:00
Christian Vogeley	25a533bd72	New modal dialog for item expiry	2013-12-22 14:21:57 +01:00
friendica	7e7b5bfa49	last remaining files to be Comanchified with the exception of mod_admin. Though I should probably take a third look to see if anything else uses widgets. ... In fact - it appears that the flattrwidget does.	2013-12-22 02:16:45 -08:00
friendica	0366991b45	appears that I missed a few files for Comanchification. so here's mitem.	2013-12-22 02:04:55 -08:00
friendica	d32bbaf599	split private messages into two modules - "message" is just for message lists, "mail" is for reading and writing conversations. This is so we can Comanchify it cleanly.	2013-12-21 23:47:44 -08:00
friendica	aa312f72bf	comanchify mod_directory. Two modules remaining. Actually three because message needs to be split.	2013-12-20 12:43:04 -08:00
friendica	a084a3fa47	comanchify mod_search - we've got three modules left to Comanchify: admin, directory and message - each of which introduces "interesting challenges"	2013-12-20 01:39:42 -08:00
friendica	916f3e9afc	doc updates	2013-12-20 01:39:05 -08:00
friendica	2c0fbc508e	comanchify connedit, group	2013-12-19 23:56:37 -08:00
friendica	cd78f9d13d	sourced items which are then edited at the source weren't setting up the second delivery chain.	2013-12-19 20:23:19 -08:00
friendica	bccc20f38c	default photo issue, and connections page showing deleted accounts. Also show last updated on connedit page	2013-12-19 19:16:46 -08:00
friendica	648a7a5735	add bbcode reference	2013-12-19 18:33:02 -08:00
friendica	6c2ea59cde	give doc/help alternate mimetype support	2013-12-19 17:44:30 -08:00
friendica	564f431551	comanchificate mod_photos	2013-12-19 17:36:31 -08:00
friendica	7c81889b33	make default profile photo configurable - should be functional but needs admin ui	2013-12-19 16:33:36 -08:00
friendica	f8042cc467	add 'src' parameter to api photo list	2013-12-19 15:23:36 -08:00
friendica	e6dc916915	if somebody tagged you in a private post, the tag email notification contained the obscured message. Clear it.	2013-12-19 13:52:23 -08:00
friendica	825492407e	more comanche	2013-12-19 02:35:45 -08:00
friendica	b28a37c38e	more comanche	2013-12-19 02:25:44 -08:00
friendica	125543aded	more comanche migration	2013-12-19 02:16:14 -08:00
friendica	2089a1379a	provide git revision in siteinfo if possible and if not instructed otherwise	2013-12-18 18:29:53 -08:00
friendica	2297335798	remove the .wgl (widget list) file processing for ordering widgets on a page. This preceded Comanche and was never used and is now obsolete.	2013-12-18 15:53:40 -08:00
friendica	ee26587a8f	Merge https://github.com/friendica/red into zpull	2013-12-18 14:55:49 -08:00