15321 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ken restivo	e56633d5b0	Throw HTTP error and display error message when database is unavailable. #179	2015-11-19 20:58:13 -08:00
redmatrix	a44795e6c3	change action label from 'stop following' to 'unfollow thread'	2015-11-19 17:27:07 -08:00
redmatrix	5805a54097	directory search for pubforums using hubzilla directory servers using redmatrix flag value	2015-11-19 16:44:12 -08:00
redmatrix	350519d429	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-19 16:15:16 -08:00
redmatrix	8f94c721bf	new feature: 'suppress_duplicates' issue #146 triggered with less than two minutes between posts having identical content.	2015-11-19 16:05:47 -08:00
jeroenpraat	c7652fc29c	Had to switch these 2. Sorry.	2015-11-20 00:50:54 +01:00
jeroenpraat	e537d53389	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2015-11-20 00:40:32 +01:00
jeroenpraat	a890ee6864	Some bits	2015-11-20 00:39:47 +01:00
redmatrix	4f81d64517	issue #160 add blablanet to directory fallback list	2015-11-19 15:06:35 -08:00
redmatrix	b5875c3af9	Merge https://github.com/redmatrix/hubzilla into pending_merge ... Conflicts: version.inc	2015-11-19 11:47:41 -08:00
redmatrix	ed87dbc141	issue #173	2015-11-19 11:46:29 -08:00
Haakon Meland Eriksen	059886a1e4	Merge remote-tracking branch 'upstream/master'	2015-11-19 18:44:33 +01:00
Mario Vavti	ba52af786e	move today button from aside to section title	2015-11-19 11:38:34 +01:00
Mario Vavti	929f524e77	css fixes	2015-11-19 11:17:24 +01:00
Haakon Meland Eriksen	cd49ec92e3	Merge remote-tracking branch 'upstream/master'	2015-11-19 06:36:06 +01:00
ken restivo	ee39e3cf72	Bump version so migrator tool can verify that mods to account.php etc in 312cc41 and 1f2a408 were applied.	2015-11-18 19:12:22 -08:00
Mario Vavti	a17f280f7d	rename some menus	2015-11-19 00:10:32 +01:00
Haakon Meland Eriksen	7b4cfffc03	Merge remote-tracking branch 'upstream/master'	2015-11-19 00:00:35 +01:00
Mario Vavti	db9c2992e3	remove more unneeded files	2015-11-18 23:58:47 +01:00
Mario Vavti	b23284cba2	move moment.min.js and remove unneeded files	2015-11-18 23:56:25 +01:00
Mario Vavti	0c163c4d03	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2015-11-18 23:51:00 +01:00
Mario Vavti	e4145deeb7	some events refacturing	2015-11-18 23:50:42 +01:00
Haakon Meland Eriksen	33258803ea	Merge remote-tracking branch 'upstream/master'	2015-11-18 16:48:56 +01:00
redmatrix	179730e485	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-18 02:45:39 -08:00
redmatrix	106b3257e4	wsod viewing photo widget	2015-11-18 02:45:22 -08:00
ken restivo	312cc415ce	Pass in account_id. Required for bulk identity importer.	2015-11-18 00:26:18 -08:00
ken restivo	1f2a408be0	Use provided account_id instead of user's logged in account_id. Necessary for bulk importer.	2015-11-18 00:03:59 -08:00
Haakon Meland Eriksen	0d232c612b	Merge remote-tracking branch 'upstream/master'	2015-11-18 06:48:29 +01:00
redmatrix	68da4d90dc	fix admin plugin hooks	2015-11-17 20:44:57 -08:00
Haakon Meland Eriksen	545dc5cf65	Merge remote-tracking branch 'upstream/master'	2015-11-18 01:52:11 +01:00
redmatrix	a089064588	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-17 15:04:04 -08:00
redmatrix	a06f7fbe2e	photo album widget permissions issue	2015-11-17 15:03:27 -08:00
Mario Vavti	7c4d9519c8	whitespace	2015-11-17 23:08:35 +01:00
Mario Vavti	6fa0807550	more css fixes	2015-11-17 23:01:24 +01:00
Haakon Meland Eriksen	c545ada746	Merge remote-tracking branch 'upstream/master'	2015-11-17 16:49:11 +01:00
Mario Vavti	868a0d8a90	missing closing " for src attribute	2015-11-17 13:45:00 +01:00
Mario Vavti	5079dff338	update bootstrap lib 3.3.4 -> 3.3.5	2015-11-17 11:39:47 +01:00
Mario Vavti	9e3d130ad9	css fixes	2015-11-17 11:32:37 +01:00
Mario Vavti	b531486dab	show jotnets toggle button only if there are jotnets and whitespace fixes	2015-11-17 10:46:38 +01:00
redmatrix	6df98f080b	fix api/direct_messages/new at least for the json case. We seem to have a missing template for XML	2015-11-16 19:17:39 -08:00
Haakon Meland Eriksen	69487389d3	Merge remote-tracking branch 'upstream/master'	2015-11-16 06:42:08 +01:00
redmatrix	0cb5f009b4	tag_deliver of an edit to an already uplinked item wasn't resetting permissions and ownership bits before starting delivery chain on the edit.	2015-11-15 20:52:50 -08:00
redmatrix	c7b2ec8bba	allow plugins to also log to a different named logfile and also alter the log message	2015-11-15 19:40:01 -08:00
redmatrix	12b0a9f35f	add logger plugin hook	2015-11-15 19:37:26 -08:00
redmatrix	fff30b1c3d	permission issues editing wall-to-wall posts	2015-11-15 19:36:17 -08:00
redmatrix	6ad35e3d84	issue with dead hub detection	2015-11-15 18:12:53 -08:00
redmatrix	3d80073a0e	revert html in markdown for posts, but trim the input before processing the markdown	2015-11-15 18:03:37 -08:00
redmatrix	959c3ba89d	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-15 17:29:07 -08:00
redmatrix	1029939f56	issues connecting to local forum	2015-11-15 17:28:45 -08:00
Haakon Meland Eriksen	fd5d1416d9	Merge remote-tracking branch 'upstream/master'	2015-11-15 00:27:23 +01:00